Changeset 445:b1b89a2c81f8 in mediastreamer2

Timestamp:

Apr 28, 2009 6:01:44 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

Make it return a value in case it's not implemented or it failed.

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

File:

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

linphone/mediastreamer2/src/winsnd2.c

@@ -401 +401 @@
 }
 
-static void winsndcard_set_control(MSSndCard *card, MSSndCardControlElem e, int val){
+static int winsndcard_set_control(MSSndCard *card, MSSndCardControlElem e, int val){
         WinSndCard *d=(WinSndCard*)card->data;
 
@@ -419 +419 @@
                         {
                                 ms_error("winsndcard_set_control: mixerGetID failed. (0x%x)", mr);
-                                return;
+                                return -1;
                         }
                         mr = mixerOpen( (LPHMIXER)&dwMixerHandle, uMixerID, 0L, 0L, 0L );
@@ -426 +426 @@
                                 mixerClose( (HMIXER)dwMixerHandle );
                                 ms_error("winsndcard_set_control: mixerOpen failed. (0x%x)", mr);
-                                return;
+                                return -1;
                         }
                         memset( &MixerLine, 0, sizeof(MIXERLINE) );
@@ -436 +436 @@
                                 mixerClose( (HMIXER)dwMixerHandle );
                                 ms_error("winsndcard_set_control: mixerGetLineInfo failed. (0x%x)", mr);
-                                return;
+                                return -1;
                         }
                         /* ms_message("Name: %s\n", MixerLine.szName); */
@@ -453 +453 @@
                                         mixerClose( (HMIXER)dwMixerHandle );
                                         ms_error("winsndcard_set_control: mixerGetLineInfo failed. (0x%x)", mr);
-                                        return;
+                                        return -1;
                                 }
                                 
@@ -470 +470 @@
                                         mixerClose( (HMIXER)dwMixerHandle );
                                         ms_error("winsndcard_set_control: mixerGetLineInfo failed. (0x%x)", mr);
-                                        return;
+                                        return -1;
                                 }
 
@@ -519 +519 @@
                         {
                                 ms_error("winsndcard_set_control: mixerClose failed. (0x%x)", mr);
-                                return;
-                        }
-                        break;
+                                return -1;
+                        }
+                        return 0;
 
                 case MS_SND_CARD_MASTER_MUTE:
@@ -537 +537 @@
                                 {
                                         ms_error("winsndcard_set_control: mixerGetID failed. (0x%x)", mr);
-                                        return;
+                                        return -1;
                                 }
                                 mr = mixerOpen( (LPHMIXER)&dwMixerHandle, uMixerID, 0L, 0L, 0L );
@@ -544 +544 @@
                                         mixerClose( (HMIXER)dwMixerHandle );
                                         ms_error("winsndcard_set_control: mixerOpen failed. (0x%x)", mr);
-                                        return;
+                                        return -1;
                                 }
                                 memset( &MixerLine, 0, sizeof(MIXERLINE) );
@@ -554 +554 @@
                                         mixerClose( (HMIXER)dwMixerHandle );
                                         ms_error("winsndcard_set_control: mixerSetControlDetails failed. (0x%x)", mr);
-                                        return;
+                                        return -1;
                                 }
 
@@ -582 +582 @@
                                 {
                                         ms_error("winsndcard_set_control: mixerSetControlDetails failed. (0x%x)", mr);
-                                        return;
-                                }
+                                        return -1;
+                                }
+                                return 0;
                         }
                         break;
@@ -589 +590 @@
                         ms_warning("winsndcard_set_control: unsupported command.");
         }
+        return -1;
 }