From: rossb <rossb@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Wed, 3 Feb 2010 00:28:29 +0000 (+0000)
Subject: fix for undefined DirectSoundFullDuplex8 when PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE... 
X-Git-Tag: pa_stable_v19_20110326_r1647~179
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=1aaa8dab51b1e57a2c7cc8d7f4a30ba104497e47;p=portaudio

fix for undefined DirectSoundFullDuplex8 when PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE wasn't defined. thanks Dmitry
---

diff --git a/src/hostapi/dsound/pa_win_ds.c b/src/hostapi/dsound/pa_win_ds.c
index 0d908a9..5625810 100644
--- a/src/hostapi/dsound/pa_win_ds.c
+++ b/src/hostapi/dsound/pa_win_ds.c
@@ -1648,7 +1648,7 @@ static HRESULT InitOutputBuffer( PaWinDsStream *stream, PaWinDsDeviceInfo *devic
     secondaryDesc.dwSize = sizeof(DSBUFFERDESC);
     secondaryDesc.dwFlags = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2;
     secondaryDesc.dwBufferBytes = bytesPerBuffer;
-    secondaryDesc.lpwfxFormat = (WAVEFORMATEX*)&waveFormat;
+    secondaryDesc.lpwfxFormat = (WAVEFORMATEX*)&waveFormat; /* waveFormat contains whatever format was negotiated for the primary buffer above */
     // Create the secondary buffer
     if ((result = IDirectSound_CreateSoundBuffer( stream->pDirectSound,
                   &secondaryDesc, &stream->pDirectSoundOutputBuffer, NULL)) != DS_OK)
@@ -2116,12 +2116,13 @@ error:
             stream->pDirectSound = NULL;
         }
 
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
         if( stream->pDirectSoundFullDuplex8 )
         {
             IDirectSoundFullDuplex_Release( stream->pDirectSoundFullDuplex8 );
             stream->pDirectSoundFullDuplex8 = NULL;
         }
-
+#endif
         if( bufferProcessorIsInitialized )
             PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
 
@@ -2535,11 +2536,13 @@ static PaError CloseStream( PaStream* s )
         stream->pDirectSound = NULL;
     }
 
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
     if( stream->pDirectSoundFullDuplex8 )
     {
         IDirectSoundFullDuplex_Release( stream->pDirectSoundFullDuplex8 );
         stream->pDirectSoundFullDuplex8 = NULL;
     }
+#endif
 
     PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
     PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );