X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Faudio%2Faudio-alsa.c;h=afbff421e308bbb418e85b39cd45ed8bb8f70a36;hb=93daafca4d0419707cdcde181180a689a7fccbfb;hp=8e56e52d20db6aefa7ebf11b8ba64b34f1e2051c;hpb=5bad34ac9278831eb65499c8aa887116aafa33b2;p=src%2Fapp-framework-binder.git

diff --git a/plugins/audio/audio-alsa.c b/plugins/audio/audio-alsa.c
index 8e56e52d..afbff421 100644
--- a/plugins/audio/audio-alsa.c
+++ b/plugins/audio/audio-alsa.c
@@ -19,6 +19,17 @@
 #include "audio-api.h"
 #include "audio-alsa.h"
 
+snd_mixer_selem_channel_id_t SCHANNELS[8] = {
+ SND_MIXER_SCHN_FRONT_LEFT,
+ SND_MIXER_SCHN_FRONT_RIGHT,
+ SND_MIXER_SCHN_FRONT_CENTER,
+ SND_MIXER_SCHN_REAR_LEFT,
+ SND_MIXER_SCHN_REAR_RIGHT,
+ SND_MIXER_SCHN_REAR_CENTER,
+ SND_MIXER_SCHN_SIDE_LEFT,
+ SND_MIXER_SCHN_SIDE_RIGHT
+};
+
 PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
 
     snd_pcm_t *dev;
@@ -26,9 +37,10 @@ PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
     snd_mixer_t *mixer;
     snd_mixer_selem_id_t *mixer_sid;
     snd_mixer_elem_t *mixer_elm;
+    snd_mixer_elem_t *mixer_elm_m;
     unsigned int rate = 22050;
     long vol, vol_min, vol_max;
-    int num;
+    int num, i;
 
     if (snd_pcm_open (&dev, name, SND_PCM_STREAM_PLAYBACK, 0) < 0)
         return 0;
@@ -58,6 +70,8 @@ PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
     snd_mixer_selem_id_set_name (mixer_sid, "Master");
 
     mixer_elm = snd_mixer_find_selem (mixer, mixer_sid);
+    mixer_elm_m = NULL;
+
     if (!mixer_elm) {
         /* no "Master" mixer ; we are probably on a board... search ! */
         for (mixer_elm = snd_mixer_first_elem (mixer); mixer_elm != NULL;
@@ -65,9 +79,15 @@ PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
             if (snd_mixer_elem_info (mixer_elm) < 0)
                 continue;
             snd_mixer_selem_get_id (mixer_elm, mixer_sid);
-            if (strstr (snd_mixer_selem_id_get_name (mixer_sid), "Master") ||
-                strstr (snd_mixer_selem_id_get_name (mixer_sid), "Playback"))
+            if (strstr (snd_mixer_selem_id_get_name (mixer_sid), "DVC Out")) {
+
+                /* this is Porter... let us found the specific mute switch */
+                snd_mixer_selem_id_set_index (mixer_sid, 0);
+                snd_mixer_selem_id_set_name (mixer_sid, "DVC Out Mute");
+                mixer_elm_m = snd_mixer_find_selem (mixer, mixer_sid);
+
                 break;
+            }
         }
     }
 
@@ -99,13 +119,15 @@ PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
     dev_ctx[num]->dev = dev;
     dev_ctx[num]->params = params;
     dev_ctx[num]->mixer_elm = mixer_elm;
+    dev_ctx[num]->mixer_elm_m = mixer_elm_m;
     dev_ctx[num]->vol_max = vol_max;
     dev_ctx[num]->vol = vol;
     dev_ctx[num]->thr_should_run = 0;
     dev_ctx[num]->thr_finished = 0;
 
     /* make the client context aware of current card state */
-    ctx->volume = _alsa_get_volume (num);
+    for (i = 0; i < 8; i++)
+        ctx->volume[i] = _alsa_get_volume (num, i);
     ctx->mute = _alsa_get_mute (num);
     ctx->idx = num;
 
@@ -155,47 +177,72 @@ PUBLIC void _alsa_stop (unsigned int num) {
     pthread_join(dev_ctx[num]->thr, NULL);
 }
 
-PUBLIC unsigned int _alsa_get_volume (unsigned int num) {
+PUBLIC int _alsa_get_volume (unsigned int num, unsigned int channel) {
 
     if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm)
         return;
 
-    snd_mixer_selem_get_playback_volume (dev_ctx[num]->mixer_elm, SND_MIXER_SCHN_FRONT_LEFT, &dev_ctx[num]->vol);
+    snd_mixer_selem_get_playback_volume (dev_ctx[num]->mixer_elm, SCHANNELS[channel], &dev_ctx[num]->vol);
 
-    return (unsigned int)(dev_ctx[num]->vol*100)/dev_ctx[num]->vol_max;
+    return (int)(dev_ctx[num]->vol*100)/dev_ctx[num]->vol_max;
 }
 
-PUBLIC unsigned int _alsa_set_volume (unsigned int num, unsigned int vol) {
+PUBLIC void _alsa_set_volume (unsigned int num, unsigned int channel, int vol) {
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm || vol > 100)
+    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm ||
+        0 > vol > 100)
         return;
 
-   snd_mixer_selem_set_playback_volume_all (dev_ctx[num]->mixer_elm, (vol*dev_ctx[num]->vol_max)/100);
+    snd_mixer_selem_set_playback_volume (dev_ctx[num]->mixer_elm, SCHANNELS[channel], (vol*dev_ctx[num]->vol_max)/100);
+
+}
+
+PUBLIC void _alsa_set_volume_all (unsigned int num, int vol) {
+
+    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm ||
+        0 > vol > 100)
+
+    snd_mixer_selem_set_playback_volume_all (dev_ctx[num]->mixer_elm, (vol*dev_ctx[num]->vol_max)/100);
 }
 
 PUBLIC unsigned char _alsa_get_mute (unsigned int num) {
 
     int mute = 0;
+    snd_mixer_elem_t *elm_m;
 
     if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm)
         return;
 
-    if (snd_mixer_selem_has_playback_switch (dev_ctx[num]->mixer_elm)) {
-        snd_mixer_selem_get_playback_switch (dev_ctx[num]->mixer_elm, SND_MIXER_SCHN_FRONT_LEFT, &mute); 
-        snd_mixer_selem_get_playback_switch (dev_ctx[num]->mixer_elm, SND_MIXER_SCHN_FRONT_RIGHT, &mute); 
+    dev_ctx[num]->mixer_elm_m ? (elm_m = dev_ctx[num]->mixer_elm_m) :
+                                (elm_m = dev_ctx[num]->mixer_elm);
 
+    if (snd_mixer_selem_has_playback_switch (elm_m)) {
+        snd_mixer_selem_get_playback_switch (elm_m, SND_MIXER_SCHN_FRONT_LEFT, &mute);
+        snd_mixer_selem_get_playback_switch (elm_m, SND_MIXER_SCHN_FRONT_RIGHT, &mute);
     }
 
-    return (unsigned char)!mute;
+    if (dev_ctx[num]->mixer_elm_m)
+        return (unsigned char)mute;
+    else
+        return (unsigned char)!mute;
 }
 
 PUBLIC void _alsa_set_mute (unsigned int num, unsigned char mute) {
 
+    snd_mixer_elem_t *elm_m;
+
     if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm || 1 < mute < 0)
         return;
 
-    if (snd_mixer_selem_has_playback_switch (dev_ctx[num]->mixer_elm))
-        snd_mixer_selem_set_playback_switch_all (dev_ctx[num]->mixer_elm, !mute);
+    if (dev_ctx[num]->mixer_elm_m) {
+        elm_m = dev_ctx[num]->mixer_elm_m;
+        mute = !mute;
+    } else {
+        elm_m = dev_ctx[num]->mixer_elm;
+    }
+
+    if (snd_mixer_selem_has_playback_switch (elm_m))
+        snd_mixer_selem_set_playback_switch_all (elm_m, !mute);
 }
 
 PUBLIC void _alsa_set_rate (unsigned int num, unsigned int rate) {