Changeset 456

Timestamp:

Aug 6, 2009, 11:30:14 AM (16 years ago)

Author:

Paul Smedley

Message:

Fixes to correctly initialise SPEAKER mixer control

Location:

GPL/trunk

Files:

• include/ossidc.h (modified) (1 diff)
• lib32/sound.c (modified) (1 diff)

GPL/trunk/include/ossidc.h ¶

@@ -244 +244 @@
 #define OSS32_MIX_VOLUME_AUX            12      //Auxiliary volume
 #define OSS32_MIX_VOLUME_CAPTURE        13      //Recording volume
+#define OSS32_MIX_VOLUME_SPEAKER        14      //Speaker volume
 #define OSS32_MIX_VOLUME_MAX            OSS32_MIX_VOLUME_CAPTURE
 

GPL/trunk/lib32/sound.c ¶

@@ -335 +335 @@
     printk("Number of cards: %i",nrCardsDetected);
     printk("dev id: %i",deviceid);
-    pDevCaps->nrDevices  = 1;//nrCardsDetected;
+//    pDevCaps->nrDevices  = 1;//nrCardsDetected;
+    pDevCaps->nrDevices  = nrCardsDetected;
     pDevCaps->ulCaps     = OSS32_CAPS_WAVE_PLAYBACK | OSS32_CAPS_WAVE_CAPTURE;