Changeset 434:bb6e46319d7b in mediastreamer2

Timestamp:

Apr 24, 2009 3:29:14 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

Fix for C compilation

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@437 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/src/winsnd2.c (modified) (15 diffs)

linphone/mediastreamer2/src/winsnd2.c

@@ -17 +17 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#if !defined(_WIN32_WCE) //Allready defined for wince
+#if !defined(_WIN32_WCE) /* Allready defined for wince */
 #define UNICODE
 #endif
@@ -32 +32 @@
 
 #if defined(_WIN32_WCE)
-//#define DISABLE_SPEEX
-//#define WCE_OPTICON_WORKAROUND 1000
+/*#define DISABLE_SPEEX */
+/*#define WCE_OPTICON_WORKAROUND 1000 */
 #endif
 #ifndef DISABLE_SPEEX
@@ -58 +58 @@
         DWORD dwMixerHandle;
         MIXERLINE MixerLine;
+        MIXERLINE Line;
+        UINT uLineIndex;
 
     MMRESULT mr = MMSYSERR_NOERROR;
     DWORD dwVolume = 0xFFFF;
     dwVolume = ((0xFFFF) * percent) / 100;
-
 
         switch(e){
@@ -101 +102 @@
                         ms_message("ComponentType: %d\n", MixerLine.dwComponentType);
 
-                        MIXERLINE Line;
-                        for ( UINT uLineIndex = 0; uLineIndex < MixerLine.cConnections; uLineIndex++)
+                        for (uLineIndex = 0; uLineIndex < MixerLine.cConnections; uLineIndex++)
                         {
                                 memset( &Line, 0, sizeof(MIXERLINE) );
@@ -143 +143 @@
                                 {
                                         /* unmute */
-                                        // Find a mute control, if any, of the microphone line  
-
-                                        LPMIXERCONTROL pmxctrl = (LPMIXERCONTROL)malloc(sizeof MIXERCONTROL);  
+                                        /* Find a mute control, if any, of the microphone line  */
+
+                                        LPMIXERCONTROL pmxctrl = (LPMIXERCONTROL)malloc(sizeof(MIXERCONTROL));  
                                         MIXERLINECONTROLS mxlctrl = {sizeof mxlctrl, Line.dwLineID, MIXERCONTROL_CONTROLTYPE_MUTE, 1, sizeof(MIXERCONTROL), pmxctrl};  
                                         if(!mixerGetLineControls((HMIXEROBJ)dwMixerHandle, &mxlctrl, MIXER_GETLINECONTROLSF_ONEBYTYPE)){  
-                                                // Found, so proceed  
-                                                DWORD cChannels = Line.cChannels;  
+                                                DWORD cChannels = Line.cChannels;
+                                                LPMIXERCONTROLDETAILS_BOOLEAN pbool;
+                                                MIXERCONTROLDETAILS mxcd;
+
                                                 if (MIXERCONTROL_CONTROLF_UNIFORM & pmxctrl->fdwControl)  
                                                         cChannels = 1;  
-                                                LPMIXERCONTROLDETAILS_BOOLEAN pbool =  
-                                                        (LPMIXERCONTROLDETAILS_BOOLEAN) malloc(cChannels * sizeof  
-                                                        MIXERCONTROLDETAILS_BOOLEAN);  
-                                                MIXERCONTROLDETAILS mxcd = {sizeof(mxcd), pmxctrl->dwControlID,  
-                                                        cChannels, (HWND)0,  
-                                                        sizeof MIXERCONTROLDETAILS_BOOLEAN, (LPVOID) pbool};  
+                                                pbool = (LPMIXERCONTROLDETAILS_BOOLEAN) malloc(cChannels * sizeof(
+                                                        MIXERCONTROLDETAILS_BOOLEAN));
+
+                                                mxcd.cbStruct = sizeof(mxcd);
+                                                mxcd.dwControlID = pmxctrl->dwControlID;
+                                                mxcd.cChannels = cChannels;
+                                                mxcd.hwndOwner = (HWND)0;
+                                                mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN);
+                                                mxcd.paDetails = (LPVOID) pbool;
 
                                                 mixerGetControlDetails((HMIXEROBJ)dwMixerHandle, &mxcd,  
                                                         MIXER_SETCONTROLDETAILSF_VALUE);  
-                                                // Unmute the microphone line (for both channels)  
-                                                pbool[0].fValue = pbool[cChannels - 1].fValue = 0; //0 -> unmute;  
+                                                /* Unmute the microphone line (for both channels) */
+                                                pbool[0].fValue = pbool[cChannels - 1].fValue = 0; /* 0 -> unmute; */
                                                 mixerSetControlDetails((HMIXEROBJ)dwMixerHandle, &mxcd,  
                                                         MIXER_SETCONTROLDETAILSF_VALUE);  
@@ -178 +183 @@
                                         if(!mixerGetLineControls((HMIXEROBJ)dwMixerHandle, &mxlctrl,  
                                                 MIXER_GETLINECONTROLSF_ONEBYTYPE)){  
-                                                        // Found!  
-                                                        DWORD cChannels = Line.cChannels;  
+                                                        DWORD cChannels = Line.cChannels;
+                                                        LPMIXERCONTROLDETAILS_UNSIGNED pUnsigned;
+                                                        MIXERCONTROLDETAILS mxcd;
                                                         if (MIXERCONTROL_CONTROLF_UNIFORM & pmxctrl->fdwControl)  
                                                                 cChannels = 1;  
-                                                        LPMIXERCONTROLDETAILS_UNSIGNED pUnsigned =  
+                                                        pUnsigned =  
                                                                 (LPMIXERCONTROLDETAILS_UNSIGNED)  
-                                                                malloc(cChannels * sizeof MIXERCONTROLDETAILS_UNSIGNED);  
-                                                        MIXERCONTROLDETAILS mxcd = {sizeof(mxcd), pmxctrl->dwControlID,  
-                                                                cChannels, (HWND)0,  
-                                                                sizeof MIXERCONTROLDETAILS_UNSIGNED, (LPVOID) pUnsigned};  
+                                                                malloc(cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED));
+
+                                                        mxcd.cbStruct = sizeof(mxcd);
+                                                        mxcd.dwControlID = pmxctrl->dwControlID;
+                                                        mxcd.cChannels = cChannels;
+                                                        mxcd.hwndOwner = (HWND)0;
+                                                        mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED);
+                                                        mxcd.paDetails = (LPVOID) pUnsigned;
+
                                                         mixerGetControlDetails((HMIXEROBJ)dwMixerHandle, &mxcd,  
                                                                 MIXER_SETCONTROLDETAILSF_VALUE);  
-                                                        // Set the volume to the middle  (for both channels as needed)  
                                                         pUnsigned[0].dwValue = pUnsigned[cChannels - 1].dwValue
                                                                 =  pmxctrl->Bounds.dwMaximum*percent/100;
-                                                                // = (pmxctrl->Bounds.dwMinimum+pmxctrl->Bounds.dwMaximum)/2;  
                                                         mixerSetControlDetails((HMIXEROBJ)dwMixerHandle, &mxcd,  
                                                                 MIXER_SETCONTROLDETAILSF_VALUE);  
@@ -204 +213 @@
                         }
                         mixerClose( (HMIXER)dwMixerHandle );
-                        //mr = waveInSetVolume((HWAVEIN)d->in_devid, dwVolume);
                 if (mr != MMSYSERR_NOERROR)
                 {
@@ -213 +221 @@
                 case MS_SND_CARD_PLAYBACK:
                         {
+                                MIXERLINECONTROLS mlc = {0};
+                                MIXERCONTROL mc = {0};
+                                MIXERCONTROLDETAILS mcd = {0};
+                                MIXERCONTROLDETAILS_UNSIGNED mcdu = {0};
+
                                 mr = mixerGetID( (HMIXEROBJ)d->out_devid, &uMixerID, MIXER_OBJECTF_WAVEOUT );
                                 if ( mr != MMSYSERR_NOERROR )
@@ -240 +253 @@
                                 ms_message("ComponentType: %d\n", MixerLine.dwComponentType);
 
-                                MIXERLINECONTROLS mlc = {0};
-                                MIXERCONTROL mc = {0};
                                 mlc.cbStruct = sizeof(MIXERLINECONTROLS);
                                 mlc.dwLineID = MixerLine.dwLineID;
@@ -252 +263 @@
 
 
-                                MIXERCONTROLDETAILS mcd = {0};
-                                MIXERCONTROLDETAILS_UNSIGNED mcdu = {0};
-                                mcdu.dwValue = 65535*percent/100; // the volume is a number between 0 and 65535
+                                mcdu.dwValue = 65535*percent/100; /* the volume is a number between 0 and 65535 */
 
                                 mcd.cbStruct = sizeof(MIXERCONTROLDETAILS);
@@ -265 +274 @@
                                         &mcd, MIXER_SETCONTROLDETAILSF_VALUE);
 
-                                //mr = waveOutSetVolume((HWAVEOUT)d->out_devid, dwVolume);
                                 if (mr != MMSYSERR_NOERROR)
                                 {
@@ -396 +404 @@
                         WideCharToMultiByte(CP_UTF8,0,incaps.szPname,-1,szName,256,0,0);
                         add_or_update_card(m,szName,item,-1,MS_SND_CARD_CAP_CAPTURE);
-                        //add_or_update_card(m,incaps.szPname,item,-1,MS_SND_CARD_CAP_CAPTURE);
 #endif
                 }
@@ -411 +418 @@
                         WideCharToMultiByte(CP_UTF8,0,outcaps.szPname,-1,szName,256,0,0);
                 add_or_update_card(m,szName,-1,item,MS_SND_CARD_CAP_PLAYBACK);
-                //add_or_update_card(m,outcaps.szPname,-1,item,MS_SND_CARD_CAP_PLAYBACK);
 #endif
                 }
@@ -452 +458 @@
 
 
+//#define _TRUE_TIME
 #ifndef _TRUE_TIME
 static uint64_t winsnd_get_cur_time( void *data){
@@ -962 +969 @@
                 }
                 if (i==d->stat_minimumbuffer){
-                        //ms_error("winsnd_write_process: All buffers are busy.");
+                        /* ms_error("winsnd_write_process: All buffers are busy."); */
 #ifndef DISABLE_SPEEX
                         if (d->pst==NULL)