tizenaudio-sink: Modify description and add valid_modargs

Modify description and add valid modargs, move it to tizen directory

[Version] 0.5-12
[Profile] Common
[Issue Type] add feature

Change-Id: Ib8db498c2f8d40934cbc0cc946a2d8ee3a1c5dd0
Signed-off-by: Seonmi Jin <seonmi.jin@samsung.com>

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index e49a0da..2152dbd 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -11,7 +11,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          5.0
-Release:          11
+Release:          12
 Group:            Multimedia/Audio
 License:          GPL-2.0+ and LGPL-2.1+
 URL:              http://pulseaudio.org

diff --git a/src/Makefile.am b/src/Makefile.am
index f2a200c..bc2439b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1946,7 +1946,7 @@ module_alsa_card_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_card_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
 module_alsa_card_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
-module_tizenaudio_sink_la_SOURCES = modules/module-tizenaudio-sink.c
+module_tizenaudio_sink_la_SOURCES = modules/tizen/module-tizenaudio-sink.c
 module_tizenaudio_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_sink_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS)
 module_tizenaudio_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)

diff --git a/src/modules/module-tizenaudio-sink.c b/src/modules/tizen/module-tizenaudio-sink.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from src/modules/module-tizenaudio-sink.c
rename to src/modules/tizen/module-tizenaudio-sink.c
index f292fd8..c9d59f5
--- a/src/modules/module-tizenaudio-sink.c
+++ b/src/modules/tizen/module-tizenaudio-sink.c
@@ -54,8 +54,12 @@ PA_MODULE_DESCRIPTION("TizenAudio sink");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(false);
 PA_MODULE_USAGE(
+        "name=<name of the sink, to be prefixed> "
         "sink_name=<name of sink> "
         "sink_properties=<properties for the sink> "
+        "namereg_fail=<when false attempt to synthesise new sink_name if it is already taken> "
+        "device=<ALSA device> "
+        "device_id=<ALSA card index> "
         "format=<sample format> "
         "rate=<sample rate> "
         "channels=<number of channels> "
@@ -86,8 +90,12 @@ struct userdata {
 };
 
 static const char* const valid_modargs[] = {
+    "name",
     "sink_name",
     "sink_properties",
+    "namereg_fail",
+    "device",
+    "device_id",
     "format",
     "rate",
     "channels",
@@ -386,7 +394,7 @@ int pa__init(pa_module*m) {
     pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
     pa_sink_new_data_set_sample_spec(&data, &ss);
     pa_sink_new_data_set_channel_map(&data, &map);
-    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, _("Null Output"));
+    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, _("Tizen audio sink"));
     pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract");
 
     if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
@@ -417,7 +425,7 @@ int pa__init(pa_module*m) {
     pa_sink_set_max_rewind(u->sink, 0);
     pa_sink_set_max_request(u->sink, nbytes);
 
-    if (!(u->thread = pa_thread_new("null-sink", thread_func, u))) {
+    if (!(u->thread = pa_thread_new("tizenaudio-sink", thread_func, u))) {
         pa_log("Failed to create thread.");
         goto fail;
     }