diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-08-11 23:58:55 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-08-11 23:58:55 +0000 |
| commit | bfa6604b1ddc5e2c0f1aaa15330363724856359b (patch) | |
| tree | d4ed459ec7ea4948285cf21a618f86bd97b65bab /src/modules/module-alsa-sink.c | |
| parent | af1b0317f653a3da092b45de3b27643359b9a85e (diff) | |
don't set the sink/source descriptions manually, use the new functions pa_{sink,source}_set_description() instead
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1205 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-alsa-sink.c')
| -rw-r--r-- | src/modules/module-alsa-sink.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index 649fe99c..efecfc21 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -366,7 +366,8 @@ int pa__init(pa_core *c, pa_module*m) { size_t frame_size; snd_pcm_info_t *pcm_info = NULL; int err; - + char *t; + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { pa_log(__FILE__": failed to parse module arguments"); goto fail; @@ -457,7 +458,8 @@ int pa__init(pa_core *c, pa_module*m) { } u->sink->userdata = u; pa_sink_set_owner(u->sink, m); - u->sink->description = pa_sprintf_malloc("ALSA PCM on %s (%s)", dev, snd_pcm_info_get_name(pcm_info)); + pa_sink_set_description(u->sink, t = pa_sprintf_malloc("ALSA PCM on %s (%s)", dev, snd_pcm_info_get_name(pcm_info))); + pa_xfree(t); u->pcm_fdl = pa_alsa_fdlist_new(); assert(u->pcm_fdl); |