[Iaxclient-cvs] SF.net SVN: iaxclient: [1373] trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

[<jpg...@us...>]

Revision: 1373
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1373&view=rev
Author:   jpgrayson
Date:     2008-03-18 06:51:45 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Remove portaudio V18 support, now only support portaudio V19.
This had already been done for the rest of portmixer.

Modified Paths:
--------------
    trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:48:08 UTC (rev 1372)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:51:45 UTC (rev 1373)
@@ -40,29 +40,6 @@
 #include "portaudio.h"
 #include "portmixer.h"
 
-#if defined(PaStream)
-#define PA_V18
-#else
-#define PA_V19
-#endif
-
-#if defined(PA_V18)
-#include "pa_host.h"
-
-typedef struct PaWMMEStreamData
-{
-    /* Input -------------- */
-    HWAVEIN            hWaveIn;
-    WAVEHDR           *inputBuffers;
-    int                currentInputBuffer;
-    int                bytesPerHostInputBuffer;
-    int                bytesPerUserInputBuffer;    /* native buffer size in bytes */
-    /* Output -------------- */
-    HWAVEOUT           hWaveOut;
-} PaWMMEStreamData;
-#endif
-
-#if defined(PA_V19)
 #include "pa_cpuload.h"
 #include "pa_process.h"
 #include "pa_stream.h"
@@ -111,7 +88,6 @@
 
     DWORD allBuffersDurationMs; /* used to calculate timeouts */
 };
-#endif
 
 typedef struct PxSrcInfo
 {
@@ -143,14 +119,7 @@
 
 PxMixer *Px_OpenMixer( void *pa_stream, int index )
 {
-#if defined(PA_V18)
-   internalPortAudioStream     *past;
-   PaWMMEStreamData            *wmmeStreamData;
-#endif
-
-#if defined(PA_V19)
    struct PaWinMmeStream       *past;
-#endif
 
    HWAVEIN                      hWaveIn;
    HWAVEOUT                     hWaveOut;
@@ -170,15 +139,6 @@
    mixer->hInputMixer = NULL;
    mixer->hOutputMixer = NULL;
 
-#if defined(PA_V18)
-   past = (internalPortAudioStream *) pa_stream;
-   wmmeStreamData = (PaWMMEStreamData *) past->past_DeviceData;
-
-   hWaveIn = wmmeStreamData->hWaveIn;
-   hWaveOut = wmmeStreamData->hWaveOut;
-#endif
-
-#if defined(PA_V19)
    past = (struct PaWinMmeStream *) pa_stream;
 
    hWaveIn = 0;
@@ -190,7 +150,6 @@
    if (past->output.waveHandles) {
       hWaveOut = ((HWAVEOUT *)past->output.waveHandles)[0];
    }
-#endif
 
    if (hWaveIn) {
       result = mixerOpen((HMIXER *)&mixer->hInputMixer, (UINT)hWaveIn, 0, 0, MIXER_OBJECTF_HWAVEIN);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.