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

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

Revision: 1374
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1374&view=rev
Author:   jpgrayson
Date:     2008-03-18 07:00:28 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Move declarations to scope where they are used.

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:51:45 UTC (rev 1373)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 14:00:28 UTC (rev 1374)
@@ -119,19 +119,12 @@
 
 PxMixer *Px_OpenMixer( void *pa_stream, int index )
 {
-   struct PaWinMmeStream       *past;
+   struct PaWinMmeStream *past;
+   HWAVEIN hWaveIn;
+   HWAVEOUT hWaveOut;
+   PxInfo *mixer;
+   MMRESULT result;
 
-   HWAVEIN                      hWaveIn;
-   HWAVEOUT                     hWaveOut;
-   PxInfo                      *mixer;
-   MMRESULT                     result;
-   MIXERLINE                    line;
-   MIXERLINECONTROLS            controls;
-   MIXERCONTROL                 control;
-   MIXERCONTROLDETAILS          details;
-   MIXERCONTROLDETAILS_LISTTEXT mixList[32];
-   int                          j;
-
    if (!pa_stream)
       return NULL;
 
@@ -179,12 +172,16 @@
     */
 
    if (mixer->hInputMixer) {
+      MIXERLINE line;
       line.cbStruct = sizeof(MIXERLINE);
       line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN;
       result = mixerGetLineInfo(mixer->hInputMixer,
                                 &line,
                                 MIXER_GETLINEINFOF_COMPONENTTYPE);
       if (result == MMSYSERR_NOERROR) {
+         int j;
+         MIXERLINECONTROLS controls;
+         MIXERCONTROL control;
 
          controls.cbStruct = sizeof(MIXERLINECONTROLS);
          controls.dwLineID = line.dwLineID;
@@ -206,6 +203,9 @@
          }
 
          if (result == MMSYSERR_NOERROR) {
+            MIXERCONTROLDETAILS details;
+            MIXERCONTROLDETAILS_LISTTEXT mixList[32];
+
             mixer->numInputs = control.cMultipleItems;
             mixer->muxID = control.dwControlID;
 
@@ -261,12 +261,16 @@
    mixer->speakerID = 0;
 
    if (mixer->hOutputMixer) {
+      MIXERLINE line;
       line.cbStruct = sizeof(MIXERLINE);
       line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS;
       result = mixerGetLineInfo(mixer->hOutputMixer,
                                 &line,
                                 MIXER_GETLINEINFOF_COMPONENTTYPE);
       if (result == MMSYSERR_NOERROR) {
+         MIXERLINECONTROLS controls;
+         MIXERCONTROL control;
+
          controls.cbStruct = sizeof(MIXERLINECONTROLS);
          controls.dwLineID = line.dwLineID;
          controls.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;


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