Minor updates for XAudio2Sound3D

walbourn · Aug 20, 2022 · 8e66574 · 8e66574
1 parent 9eb639b
commit 8e66574
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/XAudio2/XAudio2Sound3D/audio.cpp b/XAudio2/XAudio2Sound3D/audio.cpp
@@ -314,7 +314,11 @@ HRESULT InitAudio()
 
     g_audioState.emitter.ChannelCount = INPUTCHANNELS;
     g_audioState.emitter.ChannelRadius = 1.0f;
-    g_audioState.emitter.pChannelAzimuths = g_audioState.emitterAzimuths;
+
+    static_assert(INPUTCHANNELS == 1 || g_audioState.emitter.pChannelAzimuths != nullptr, "Multi-channel sources require emitter azimuths");
+    // For examples of how to configure emitter azimuths for multi-channel sources, see DirectX Tool Kit for Audio
+    // helper method AudioEmitter::EnableDefaultMultiChannel
+    // http://go.microsoft.com/fwlink/?LinkId=248929
 
     // Use of Inner radius allows for smoother transitions as
     // a sound travels directly through, above, or below the listener.
@@ -380,6 +384,8 @@ HRESULT PrepareAudio( _In_z_ const LPCWSTR wavname )
     uint32_t waveSize;
     V_RETURN( LoadWAVAudioFromFile( strFilePath, g_audioState.waveData, &pwfx, &sampleData, &waveSize ) );
 
+    assert(pwfx->nChannels == INPUTCHANNELS);
+
     //
     // Play the wave using a source voice that sends to both the submix and mastering voices
     //

diff --git a/XAudio2/XAudio2Sound3D/audio.h b/XAudio2/XAudio2Sound3D/audio.h
@@ -61,7 +61,6 @@ struct AUDIO_STATE
     bool  fUseInnerRadius;
     bool  fUseRedirectToLFE;
 
-    FLOAT32 emitterAzimuths[INPUTCHANNELS];
     FLOAT32 matrixCoefficients[INPUTCHANNELS * OUTPUTCHANNELS];
 };