make implementation of module-alsa-card complete

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index e890ef762ac7ed09919a1e15f9441d9d0fffb4bf..e6b3e0e571d7f28009e495d7d3a8884f324a64f3 100644 (file)
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1201,7 +1201,7 @@ finish:
     pa_log_debug("Thread shutting down");
 }
 
-pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
+pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile) {
 
     struct userdata *u = NULL;
     const char *dev_id = NULL;
@@ -1372,11 +1372,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
 
             if (snd_pcm_info(u->pcm_handle, info) >= 0) {
                 char *md;
-                int card;
+                int card_idx;
 
-                if ((card = snd_pcm_info_get_card(info)) >= 0) {
+                if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
 
-                    md = pa_sprintf_malloc("hw:%i", card);
+                    md = pa_sprintf_malloc("hw:%i", card_idx);
 
                     if (strcmp(u->device_name, md))
                         if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
@@ -1407,8 +1407,9 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
     }
 
     pa_sink_new_data_init(&data);
-    data.driver = __FILE__;
+    data.driver = driver;
     data.module = m;
+    data.card = card;
     pa_sink_new_data_set_name(&data, name);
     data.namereg_fail = namereg_fail;
     pa_sink_new_data_set_sample_spec(&data, &ss);

diff --git a/src/modules/alsa/alsa-sink.h b/src/modules/alsa/alsa-sink.h
index e5032018ae7435f4e29f0d7bb44d667b3dc8a51d..47ece9e0969840d47c99f5f6d7109a79f1c1bfec 100644 (file)
--- a/src/modules/alsa/alsa-sink.h
+++ b/src/modules/alsa/alsa-sink.h
@@ -29,7 +29,7 @@
 
 #include "alsa-util.h"
 
-pa_sink* pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile);
+pa_sink* pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile);
 
 void pa_alsa_sink_free(pa_sink *s);
 

diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index f4d973860cd71a5119d58c568151ca6e20d01d7d..29145f6aefc48a283a2f3430c7a85666a2f1ab59 100644 (file)
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1036,7 +1036,7 @@ finish:
     pa_log_debug("Thread shutting down");
 }
 
-pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
+pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile) {
 
     struct userdata *u = NULL;
     const char *dev_id = NULL;
@@ -1197,11 +1197,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profil
 
             if (snd_pcm_info(u->pcm_handle, info) >= 0) {
                 char *md;
-                int card;
+                int card_idx;
 
-                if ((card = snd_pcm_info_get_card(info)) >= 0) {
+                if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
 
-                    md = pa_sprintf_malloc("hw:%i", card);
+                    md = pa_sprintf_malloc("hw:%i", card_idx);
 
                     if (strcmp(u->device_name, md))
                         if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
@@ -1223,14 +1223,18 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profil
 
     if ((name = pa_modargs_get_value(ma, "source_name", NULL)))
         namereg_fail = TRUE;
-    else {
+    else if ((name = pa_modargs_get_value(ma, "name", NULL))) {
+        name = name_buf = pa_sprintf_malloc("alsa_input.%s", name);
+        namereg_fail = TRUE;
+    } else {
         name = name_buf = pa_sprintf_malloc("alsa_input.%s", u->device_name);
         namereg_fail = FALSE;
     }
 
     pa_source_new_data_init(&data);
-    data.driver = __FILE__;
+    data.driver = driver;
     data.module = m;
+    data.card = card;
     pa_source_new_data_set_name(&data, name);
     data.namereg_fail = namereg_fail;
     pa_source_new_data_set_sample_spec(&data, &ss);

diff --git a/src/modules/alsa/alsa-source.h b/src/modules/alsa/alsa-source.h
index bdb24d10facf6a9abc40ffda8f04ff9e2e78d661..5fed6cc897258680456057dec5a5d20d0a622ebf 100644 (file)
--- a/src/modules/alsa/alsa-source.h
+++ b/src/modules/alsa/alsa-source.h
@@ -29,7 +29,7 @@
 
 #include "alsa-util.h"
 
-pa_source* pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile);
+pa_source* pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile);
 
 void pa_alsa_source_free(pa_source *s);
 

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index 6c947c0667105e415d6eb58ed8acd14d0eb68f07..f2506024a1f5c641b00a87986e98eb07468ed6b0 100644 (file)
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -28,6 +28,8 @@
 #include <pulsecore/modargs.h>
 
 #include "alsa-util.h"
+#include "alsa-sink.h"
+#include "alsa-source.h"
 #include "module-alsa-card-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");
@@ -48,19 +50,17 @@ PA_MODULE_USAGE(
         "profile=<profile name>");
 
 static const char* const valid_modargs[] = {
-    "sink_name",
-    "device",
+    "name",
     "device_id",
     "format",
     "rate",
-    "channels",
-    "channel_map",
     "fragments",
     "fragment_size",
     "mmap",
     "tsched",
     "tsched_buffer_size",
     "tsched_buffer_watermark",
+    "profile",
     NULL
 };
 
@@ -73,10 +73,14 @@ struct userdata {
     char *device_id;
 
     pa_card *card;
+    pa_sink *sink;
+    pa_source *source;
+
+    pa_modargs *modargs;
 };
 
 struct profile_data {
-    const pa_alsa_profile_info *sink, *source;
+    const pa_alsa_profile_info *sink_profile, *source_profile;
 };
 
 static void enumerate_cb(
@@ -119,8 +123,8 @@ static void enumerate_cb(
 
     d = PA_CARD_PROFILE_DATA(p);
 
-    d->sink = sink;
-    d->source = source;
+    d->sink_profile = sink;
+    d->source_profile = source;
 
     pa_hashmap_put(profiles, p->name, p);
 }
@@ -132,11 +136,59 @@ static void add_disabled_profile(pa_hashmap *profiles) {
     p = pa_card_profile_new("off", "Off", sizeof(struct profile_data));
 
     d = PA_CARD_PROFILE_DATA(p);
-    d->sink = d->source = NULL;
+    d->sink_profile = d->source_profile = NULL;
 
     pa_hashmap_put(profiles, p->name, p);
 }
 
+static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
+    struct userdata *u;
+    struct profile_data *nd, *od;
+
+    pa_assert(c);
+    pa_assert(new_profile);
+    pa_assert_se(u = c->userdata);
+
+    nd = PA_CARD_PROFILE_DATA(new_profile);
+    od = PA_CARD_PROFILE_DATA(c->active_profile);
+
+    if (od->sink_profile != nd->sink_profile) {
+        if (u->sink) {
+            pa_alsa_sink_free(u->sink);
+            u->sink = NULL;
+        }
+
+        if (nd->sink_profile)
+            u->sink = pa_alsa_sink_new(c->module, u->modargs, __FILE__, c, nd->sink_profile);
+    }
+
+    if (od->source_profile != nd->source_profile) {
+        if (u->source) {
+            pa_alsa_source_free(u->source);
+            u->source = NULL;
+        }
+
+        if (nd->source_profile)
+            u->source = pa_alsa_source_new(c->module, u->modargs, __FILE__, c, nd->source_profile);
+    }
+
+    return 0;
+}
+
+static void init_profile(struct userdata *u) {
+    struct profile_data *d;
+
+    pa_assert(u);
+
+    d = PA_CARD_PROFILE_DATA(u->card->active_profile);
+
+    if (d->sink_profile)
+        u->sink = pa_alsa_sink_new(u->module, u->modargs, __FILE__, u->card, d->sink_profile);
+
+    if (d->source_profile)
+        u->source = pa_alsa_source_new(u->module, u->modargs, __FILE__, u->card, d->source_profile);
+}
+
 int pa__init(pa_module*m) {
     pa_card_new_data data;
     pa_modargs *ma;
@@ -144,6 +196,7 @@ int pa__init(pa_module*m) {
     struct userdata *u;
 
     pa_alsa_redirect_errors_inc();
+    snd_config_update_free_global();
 
     pa_assert(m);
 
@@ -152,10 +205,14 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    m->userdata = u = pa_xnew0(struct userdata, 1);
+    m->userdata = u = pa_xnew(struct userdata, 1);
     u->core = m->core;
     u->module = m;
     u->device_id = pa_xstrdup(pa_modargs_get_value(ma, "device_id", DEFAULT_DEVICE_ID));
+    u->card = NULL;
+    u->sink = NULL;
+    u->source = NULL;
+    u->modargs = ma;
 
     if ((alsa_card_index = snd_card_get_index(u->device_id)) < 0) {
         pa_log("Card '%s' doesn't exist: %s", u->device_id, snd_strerror(alsa_card_index));
@@ -186,17 +243,33 @@ int pa__init(pa_module*m) {
     u->card = pa_card_new(m->core, &data);
     pa_card_new_data_done(&data);
 
+    if (!u->card)
+        goto fail;
+
+    u->card->userdata = u;
+    u->card->set_profile = card_set_profile;
+
+    init_profile(u);
+
     return 0;
 
 fail:
 
-    if (ma)
-        pa_modargs_free(ma);
-
     pa__done(m);
     return -1;
 }
 
+int pa__get_n_used(pa_module *m) {
+    struct userdata *u;
+
+    pa_assert(m);
+    pa_assert_se(u = m->userdata);
+
+    return
+        (u->sink ? pa_sink_linked_by(u->sink) : 0) +
+        (u->source ? pa_source_linked_by(u->source) : 0);
+}
+
 void pa__done(pa_module*m) {
     struct userdata *u;
 
@@ -205,9 +278,18 @@ void pa__done(pa_module*m) {
     if (!(u = m->userdata))
         goto finish;
 
+    if (u->sink)
+        pa_alsa_sink_free(u->sink);
+
+    if (u->source)
+        pa_alsa_source_free(u->source);
+
     if (u->card)
         pa_card_free(u->card);
 
+    if (u->modargs)
+        pa_modargs_free(u->modargs);
+
     pa_xfree(u->device_id);
     pa_xfree(u);
 

diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
index f8303a5e32bfda459915e6f939003cecdda46ebe..6a66ad32f4d859a2af27ae9e61e4cc8930e4bf51 100644 (file)
--- a/src/modules/alsa/module-alsa-sink.c
+++ b/src/modules/alsa/module-alsa-sink.c
@@ -82,7 +82,7 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    if (!(m->userdata = pa_alsa_sink_new(m, ma, NULL)))
+    if (!(m->userdata = pa_alsa_sink_new(m, ma, __FILE__, NULL, NULL)))
         goto fail;
 
     pa_modargs_free(ma);

diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index 468a12621c5cbf4fb3116c30b511a3e78c01d52c..7dc22fea29e7a4db0268afc3d5e84bc984f8c291 100644 (file)
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -106,7 +106,7 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    if (!(m->userdata = pa_alsa_source_new(m, ma, NULL)))
+    if (!(m->userdata = pa_alsa_source_new(m, ma, __FILE__, NULL, NULL)))
         goto fail;
 
     pa_modargs_free(ma);