diff options
author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-05-31 22:27:19 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-06-28 09:57:05 +0300 |
commit | 491c6a3a0b0ebf66b8f10097ca35ec4e58ab5fa4 (patch) | |
tree | 4f46df015dfbedba4200fae1f5f54ded939631c8 | |
parent | 2613e4c74733e67d56af165df4637bf902b08508 (diff) |
waveout: Simplify setting the device description
-rw-r--r-- | src/modules/module-waveout.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c index 39c2ab4b0..38d0a2014 100644 --- a/src/modules/module-waveout.c +++ b/src/modules/module-waveout.c @@ -608,7 +608,6 @@ int pa__init(pa_module *m) { InitializeCriticalSection(&u->crit); if (hwi != INVALID_HANDLE_VALUE) { - char *description = pa_sprintf_malloc("WaveIn on %s", device_name); pa_source_new_data data; pa_source_new_data_init(&data); data.driver = __FILE__; @@ -616,19 +615,17 @@ int pa__init(pa_module *m) { pa_source_new_data_set_sample_spec(&data, &ss); pa_source_new_data_set_channel_map(&data, &map); pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "WaveIn on %s", device_name); u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY); pa_source_new_data_done(&data); pa_assert(u->source); u->source->userdata = u; - pa_source_set_description(u->source, description); u->source->parent.process_msg = process_msg; - pa_xfree(description); } else u->source = NULL; if (hwo != INVALID_HANDLE_VALUE) { - char *description = pa_sprintf_malloc("WaveOut on %s", device_name); pa_sink_new_data data; pa_sink_new_data_init(&data); data.driver = __FILE__; @@ -636,6 +633,7 @@ int pa__init(pa_module *m) { pa_sink_new_data_set_sample_spec(&data, &ss); pa_sink_new_data_set_channel_map(&data, &map); pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME)); + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "WaveOut on %s", device_name); u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE|PA_SINK_LATENCY); pa_sink_new_data_done(&data); @@ -643,9 +641,7 @@ int pa__init(pa_module *m) { pa_sink_set_get_volume_callback(u->sink, sink_get_volume_cb); pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb); u->sink->userdata = u; - pa_sink_set_description(u->sink, description); u->sink->parent.process_msg = process_msg; - pa_xfree(description); } else u->sink = NULL; |