Changeset 449

Timestamp:

Jun 17, 2009, 11:33:28 AM (16 years ago)

Author:

Paul Smedley

Message:

Add support for Headphone mixer control

Location:

GPL/trunk

Files:

• include/ossdefos2.h (modified) (1 diff)
• lib32/soundmixer.c (modified) (4 diffs)

GPL/trunk/include/ossdefos2.h

@@ -87 +87 @@
 #define OSS_MIXER_3DCENTER      26
 #define OSS_MIXER_FRONT         27
-#define OSS_MIXER_NRDEVICES     28
+#define OSS_MIXER_SPEAKER2      28
+#define OSS_MIXER_HEADPHONE     29
+#define OSS_MIXER_NRDEVICES     30
 
 #endif

GPL/trunk/lib32/soundmixer.c

@@ -73 +73 @@
         /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
         /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
+        /* OSS_MIXER_SPEAKER2 */ { "Speaker", 0 , -1},
+        /* OSS_MIXER_HEADPHONE */ { "Headphone", 0 , -1},
 };
 char *szRecSources[OSS32_MIX_RECSRC_MAX] = {
@@ -441 +443 @@
         idx = pHandle->controls[OSS_MIXER_SPEAKER].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_SPEAKER].idxMute;
+        if (idx == -1)
+        {
+            /* if OSS_MIXER_SPEAKER isn't a valid control, try OSS_MIXER_SPEAKER2 */
+            idx = pHandle->controls[OSS_MIXER_SPEAKER2].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_SPEAKER2].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_PHONE:
@@ -446 +454 @@
         idxMute = pHandle->controls[OSS_MIXER_PHONEOUT].idxMute;
         break;
-    case OSS32_MIX_VOLUME_HEADPHONE: //TODO:
-        idx = pHandle->controls[OSS_MIXER_PHONEOUT].idxVolume;
-        idxMute = pHandle->controls[OSS_MIXER_PHONEOUT].idxMute;
+    case OSS32_MIX_VOLUME_HEADPHONE: 
+        idx = pHandle->controls[OSS_MIXER_HEADPHONE].idxVolume;
+        idxMute = pHandle->controls[OSS_MIXER_HEADPHONE].idxMute;
         break;
     case OSS32_MIX_VOLUME_AUX:
@@ -760 +768 @@
     case OSS_MIXER_BASS:
         return OSS32_MIX_LEVEL_BASS;
-#if 0
-    case OSS_MIXER_PHONEOUT: //TODO:
+    case OSS_MIXER_HEADPHONE: 
         return OSS32_MIX_VOLUME_HEADPHONE;
-#endif
     case OSS_MIXER_LINE1:
         return OSS32_MIX_VOLUME_AUX;