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-solaris.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-solaris.c')
| -rw-r--r-- | src/modules/module-solaris.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c index 02ef4bc4..21a72b38 100644 --- a/src/modules/module-solaris.c +++ b/src/modules/module-solaris.c @@ -500,6 +500,7 @@ int pa__init(pa_core *c, pa_module*m) { pa_channel_map map; pa_modargs *ma = NULL; struct timeval tv; + char *t; assert(c && m); if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { @@ -554,7 +555,8 @@ int pa__init(pa_core *c, pa_module*m) { u->source->get_hw_volume = source_get_hw_volume_cb; u->source->set_hw_volume = source_set_hw_volume_cb; pa_source_set_owner(u->source, m); - u->source->description = pa_sprintf_malloc("Solaris PCM on '%s'", p); + pa_source_set_description(u->source, t = pa_sprintf_malloc("Solaris PCM on '%s'", p)); + pa_xfree(t); u->source->is_hardware = 1; } else u->source = NULL; @@ -569,7 +571,8 @@ int pa__init(pa_core *c, pa_module*m) { u->sink->set_hw_mute = sink_set_hw_mute_cb; u->sink->userdata = u; pa_sink_set_owner(u->sink, m); - u->sink->description = pa_sprintf_malloc("Solaris PCM on '%s'", p); + pa_sink_set_description(u->sink, t = pa_sprintf_malloc("Solaris PCM on '%s'", p)); + pa_xfree(t); u->sink->is_hardware = 1; } else u->sink = NULL; |