X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Faudio%2Faudio-alsa.c;h=1f3c7a2e02e52e7829f9c1490cffbaa9b6afd9f0;hb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;hp=8a4caf213f6a748afdf332a8ce713eab51828cc6;hpb=07c775201fbd9477bd4a69cee3d48a95eb612bc6;p=src%2Fapp-framework-binder.git

diff --git a/plugins/audio/audio-alsa.c b/plugins/audio/audio-alsa.c
index 8a4caf21..1f3c7a2e 100644
--- a/plugins/audio/audio-alsa.c
+++ b/plugins/audio/audio-alsa.c
@@ -2,18 +2,17 @@
  * Copyright (C) 2015 "IoT.bzh"
  * Author "Manuel Bachmann"
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include "audio-api.h"
@@ -97,39 +96,42 @@ PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
     }
 
     /* allocate the global array if it hasn't been done */
-    if (!dev_ctx) {
-        dev_ctx = (dev_ctx_T**) malloc (sizeof(dev_ctx_T));
-        dev_ctx[0] = (dev_ctx_T*) malloc (sizeof(dev_ctx_T));
-        dev_ctx[0]->name = NULL;
-        dev_ctx[0]->dev = NULL;
+    if (!dev_ctx_a) {
+        dev_ctx_a = (dev_ctx_alsa_T**) malloc (sizeof(dev_ctx_alsa_T));
+        dev_ctx_a[0] = (dev_ctx_alsa_T*) malloc (sizeof(dev_ctx_alsa_T));
+        dev_ctx_a[0]->name = NULL;
+        dev_ctx_a[0]->dev = NULL;
     }
 
     /* is a card with similar name already opened ? */
-    for (num = 0; num < (sizeof(dev_ctx)/sizeof(dev_ctx_T)); num++) {
-        if (dev_ctx[num]->name &&
-           !strcmp (dev_ctx[num]->name, name))
+    for (num = 0; num < (sizeof(dev_ctx_a)/sizeof(dev_ctx_alsa_T)); num++) {
+        if (dev_ctx_a[num]->name &&
+           !strcmp (dev_ctx_a[num]->name, name))
             return 0;
     }
     num++;
 
     /* it's not... let us add it to the global array */
-    dev_ctx = (dev_ctx_T**) realloc (dev_ctx, (num+1)*sizeof(dev_ctx_T));
-    dev_ctx[num] = (dev_ctx_T*) malloc (sizeof(dev_ctx_T));
-    dev_ctx[num]->name = strdup (name);
-    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;
+    dev_ctx_a = (dev_ctx_alsa_T**) realloc (dev_ctx_a, (num+1)*sizeof(dev_ctx_alsa_T));
+    dev_ctx_a[num] = (dev_ctx_alsa_T*) malloc (sizeof(dev_ctx_alsa_T));
+    dev_ctx_a[num]->name = strdup (name);
+    dev_ctx_a[num]->dev = dev;
+    dev_ctx_a[num]->params = params;
+    dev_ctx_a[num]->mixer_elm = mixer_elm;
+    dev_ctx_a[num]->mixer_elm_m = mixer_elm_m;
+    dev_ctx_a[num]->vol_max = vol_max;
+    dev_ctx_a[num]->vol = vol;
+    dev_ctx_a[num]->thr_should_run = 0;
+    dev_ctx_a[num]->thr_finished = 0;
 
     /* make the client context aware of current card state */
     for (i = 0; i < 8; i++)
         ctx->volume[i] = _alsa_get_volume (num, i);
     ctx->mute = _alsa_get_mute (num);
     ctx->idx = num;
+    ctx->name = strdup (name);
+
+    if (verbose) fprintf (stderr, "Successfully initialized ALSA backend.\n");
 
     return 1;
 }
@@ -138,127 +140,136 @@ PUBLIC void _alsa_free (const char *name) {
 
     int num;
 
-    for (num = 0; num < (sizeof(dev_ctx)/sizeof(dev_ctx_T)); num++) {
-        if (dev_ctx[num]->name &&
-           !strcmp (dev_ctx[num]->name, name)) {
-            snd_pcm_close (dev_ctx[num]->dev);
-            snd_pcm_hw_params_free (dev_ctx[num]->params);
-            free (dev_ctx[num]->name);
-            dev_ctx[num]->name = NULL;
-            dev_ctx[num]->dev = NULL;
-            free(dev_ctx[num]);
+    for (num = 0; num < (sizeof(dev_ctx_a)/sizeof(dev_ctx_alsa_T)); num++) {
+        if (dev_ctx_a[num]->name &&
+           !strcmp (dev_ctx_a[num]->name, name)) {
+            snd_pcm_close (dev_ctx_a[num]->dev);
+            snd_pcm_hw_params_free (dev_ctx_a[num]->params);
+            free (dev_ctx_a[num]->name);
+            dev_ctx_a[num]->dev = NULL;
+            dev_ctx_a[num]->name = NULL;
+            free (dev_ctx_a[num]);
             return;
         }
     }
 }
 
-PUBLIC void _alsa_play (unsigned int num) {
+PUBLIC void _alsa_play (int num) {
 
-    if (!dev_ctx || !dev_ctx[num] || dev_ctx[num]->thr_should_run ||
+    if (!dev_ctx_a || !dev_ctx_a[num] || dev_ctx_a[num]->thr_should_run ||
         access (AUDIO_BUFFER, F_OK) == -1)
         return;
 
-    dev_ctx[num]->thr_should_run = 1;
-    dev_ctx[num]->thr_finished = 0;
-    pthread_create(&dev_ctx[num]->thr, NULL, _play_thread_fn, (void*)dev_ctx[num]);
+    dev_ctx_a[num]->thr_should_run = 1;
+    dev_ctx_a[num]->thr_finished = 0;
+    pthread_create (&dev_ctx_a[num]->thr, NULL, _alsa_play_thread_fn, (void*)dev_ctx_a[num]);
 }
 
-PUBLIC void _alsa_stop (unsigned int num) {
+PUBLIC void _alsa_stop (int num) {
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->thr_should_run)
+    if (!dev_ctx_a || !dev_ctx_a[num] || !dev_ctx_a[num]->thr_should_run)
         return;
 
     /* stop the "while" loop in thread */
-    dev_ctx[num]->thr_should_run = 0;
+    dev_ctx_a[num]->thr_should_run = 0;
 
-    while (!dev_ctx[num]->thr_finished)
+    while (!dev_ctx_a[num]->thr_finished)
         usleep(100000);
 
-    pthread_join(dev_ctx[num]->thr, NULL);
+    pthread_join (dev_ctx_a[num]->thr, NULL);
 }
 
-PUBLIC int _alsa_get_volume (unsigned int num, unsigned int channel) {
+PUBLIC unsigned int _alsa_get_volume (int num, unsigned int channel) {
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm)
-        return;
+    if (!dev_ctx_a || !dev_ctx_a[num] || !dev_ctx_a[num]->mixer_elm)
+        return 0;
 
-    snd_mixer_selem_get_playback_volume (dev_ctx[num]->mixer_elm, SCHANNELS[channel], &dev_ctx[num]->vol);
+    snd_mixer_selem_get_playback_volume (dev_ctx_a[num]->mixer_elm, SCHANNELS[channel], &dev_ctx_a[num]->vol);
 
-    return (int)(dev_ctx[num]->vol*100)/dev_ctx[num]->vol_max;
+    return (int)(dev_ctx_a[num]->vol*100)/dev_ctx_a[num]->vol_max;
 }
 
-PUBLIC void _alsa_set_volume (unsigned int num, unsigned int channel, int vol) {
+PUBLIC void _alsa_set_volume (int num, unsigned int channel, unsigned int vol) {
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm ||
-        0 > vol > 100)
+    if (!dev_ctx_a || !dev_ctx_a[num] || !dev_ctx_a[num]->mixer_elm ||
+        vol > 100)
         return;
 
-    snd_mixer_selem_set_playback_volume (dev_ctx[num]->mixer_elm, SCHANNELS[channel], (vol*dev_ctx[num]->vol_max)/100);
+    snd_mixer_selem_set_playback_volume (dev_ctx_a[num]->mixer_elm, SCHANNELS[channel], (vol*dev_ctx_a[num]->vol_max)/100);
 
 }
 
-PUBLIC void _alsa_set_volume_all (unsigned int num, int vol) {
+PUBLIC void _alsa_set_volume_all (int num, unsigned int vol) {
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm ||
-        0 > vol > 100)
+    if (!dev_ctx_a || !dev_ctx_a[num] || !dev_ctx_a[num]->mixer_elm ||
+        vol > 100)
 
-    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_all (dev_ctx_a[num]->mixer_elm, (vol*dev_ctx_a[num]->vol_max)/100);
 }
 
-PUBLIC unsigned char _alsa_get_mute (unsigned int num) {
+PUBLIC unsigned char _alsa_get_mute (int num) {
 
     int mute = 0;
     snd_mixer_elem_t *elm_m;
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm)
-        return;
+    if (!dev_ctx_a || !dev_ctx_a[num] || !dev_ctx_a[num]->mixer_elm)
+        return 0;
 
-    dev_ctx[num]->mixer_elm_m ? (elm_m = dev_ctx[num]->mixer_elm_m) :
-                                (elm_m = dev_ctx[num]->mixer_elm);
+    dev_ctx_a[num]->mixer_elm_m ? (elm_m = dev_ctx_a[num]->mixer_elm_m) :
+                                  (elm_m = dev_ctx_a[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_a[num]->mixer_elm_m)
+        return (unsigned char)mute;
+    else
+        return (unsigned char)!mute;
 }
 
-PUBLIC void _alsa_set_mute (unsigned int num, unsigned char mute) {
+PUBLIC void _alsa_set_mute (int num, unsigned char tomute) {
 
     snd_mixer_elem_t *elm_m;
+    int mute;
 
-    if (!dev_ctx || !dev_ctx[num] || !dev_ctx[num]->mixer_elm || 1 < mute < 0)
+    if (!dev_ctx_a || !dev_ctx_a[num] || !dev_ctx_a[num]->mixer_elm || 1 < tomute)
         return;
 
-    dev_ctx[num]->mixer_elm_m ? (elm_m = dev_ctx[num]->mixer_elm_m) :
-                                (elm_m = dev_ctx[num]->mixer_elm);
+    if (dev_ctx_a[num]->mixer_elm_m) {
+        elm_m = dev_ctx_a[num]->mixer_elm_m;
+        mute = (int)!tomute;
+    } else {
+        elm_m = dev_ctx_a[num]->mixer_elm;
+        mute = (int)tomute;
+    }
 
     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) {
+PUBLIC void _alsa_set_rate (int num, unsigned int rate) {
 
-    if (!dev_ctx || !dev_ctx[num])
+    if (!dev_ctx_a || !dev_ctx_a[num])
         return;
 
-    snd_pcm_hw_params_set_rate_near (dev_ctx[num]->dev, dev_ctx[num]->params, &rate, 0);
+    snd_pcm_hw_params_set_rate_near (dev_ctx_a[num]->dev, dev_ctx_a[num]->params, &rate, 0);
 }
 
-PUBLIC void _alsa_set_channels (unsigned int num, unsigned int channels) {
+PUBLIC void _alsa_set_channels (int num, unsigned int channels) {
 
-    if (!dev_ctx || !dev_ctx[num])
+    if (!dev_ctx_a || !dev_ctx_a[num])
         return;
 
-    snd_pcm_hw_params_set_channels (dev_ctx[num]->dev, dev_ctx[num]->params, channels);
+    snd_pcm_hw_params_set_channels (dev_ctx_a[num]->dev, dev_ctx_a[num]->params, channels);
 }
 
  /* ---- LOCAL THREADED FUNCTIONS ---- */
 
-STATIC void* _play_thread_fn (void *ctx) {
+STATIC void* _alsa_play_thread_fn (void *ctx) {
 
-    dev_ctx_T *dev_ctx = (dev_ctx_T *)ctx;
+    dev_ctx_alsa_T *dev_ctx_a = (dev_ctx_alsa_T *)ctx;
     FILE *file = NULL;
     char *buf = NULL;
     long size;
@@ -266,7 +277,7 @@ STATIC void* _play_thread_fn (void *ctx) {
 
     file = fopen (AUDIO_BUFFER, "rb");
 
-    while (dev_ctx->thr_should_run && file && (access (AUDIO_BUFFER, F_OK) != -1) ) {
+    while (dev_ctx_a->thr_should_run && file && (access (AUDIO_BUFFER, F_OK) != -1) ) {
         fseek (file, 0, SEEK_END);
         size = ftell (file);
         buf = (char*) realloc (buf, size * sizeof(char));
@@ -276,15 +287,15 @@ STATIC void* _play_thread_fn (void *ctx) {
         fread (buf, 1, size, file);
         fflush (file);
 
-        if ((res = snd_pcm_writei (dev_ctx->dev, buf, frames)) != frames) {
-            snd_pcm_recover (dev_ctx->dev, res, 0);
-            snd_pcm_prepare (dev_ctx->dev);
+        if ((res = snd_pcm_writei (dev_ctx_a->dev, buf, frames)) != frames) {
+            snd_pcm_recover (dev_ctx_a->dev, res, 0);
+            snd_pcm_prepare (dev_ctx_a->dev);
         }
         /* snd_pcm_drain (dev_ctx->dev); */
     }
     if (buf) free(buf);
     if (file) fclose(file);
 
-    dev_ctx->thr_finished = 1;
+    dev_ctx_a->thr_finished = 1;
     return 0;
 }