mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't set the sink/source descriptions manually, use the new functions pa_{sink,source}_set_description() instead

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1205 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-11 23:58:55 +00:00
parent af1b0317f6
commit bfa6604b1d
15 changed files with 69 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-alsa-sink.c
View file

@ -366,7 +366,8 @@ int pa__init(pa_core *c, pa_module*m) {
size_t frame_size; size_t frame_size;
snd_pcm_info_t *pcm_info = NULL; snd_pcm_info_t *pcm_info = NULL;
int err; int err;
char *t;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log(__FILE__": failed to parse module arguments"); pa_log(__FILE__": failed to parse module arguments");
goto fail; goto fail;
@ -457,7 +458,8 @@ int pa__init(pa_core *c, pa_module*m) {
} }
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); 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(); u->pcm_fdl = pa_alsa_fdlist_new();
assert(u->pcm_fdl); assert(u->pcm_fdl);

4
src/modules/module-alsa-source.c
View file

@ -359,6 +359,7 @@ int pa__init(pa_core *c, pa_module*m) {
size_t frame_size; size_t frame_size;
snd_pcm_info_t *pcm_info = NULL; snd_pcm_info_t *pcm_info = NULL;
int err; int err;
char *t;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log(__FILE__": failed to parse module arguments"); pa_log(__FILE__": failed to parse module arguments");
@ -450,7 +451,8 @@ int pa__init(pa_core *c, pa_module*m) {
} }
} }
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
u->source->description = pa_sprintf_malloc("ALSA PCM on %s (%s)", dev, snd_pcm_info_get_name(pcm_info)); pa_source_set_description(u->source, 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(); u->pcm_fdl = pa_alsa_fdlist_new();
assert(u->pcm_fdl); assert(u->pcm_fdl);

2
src/modules/module-combine.c
View file

@ -381,7 +381,7 @@ int pa__init(pa_core *c, pa_module*m) {
} }
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("Combined sink"); pa_sink_set_description(u->sink, "Combined sink");
u->sink->get_latency = sink_get_latency_cb; u->sink->get_latency = sink_get_latency_cb;
u->sink->userdata = u; u->sink->userdata = u;

5
src/modules/module-esound-sink.c
View file

@ -320,6 +320,8 @@ int pa__init(pa_core *c, pa_module*m) {
const char *p; const char *p;
pa_sample_spec ss; pa_sample_spec ss;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
char *t;
assert(c && m); assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
@ -381,7 +383,8 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->get_latency = get_latency_cb; u->sink->get_latency = get_latency_cb;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("Esound sink '%s'", p); pa_sink_set_description(u->sink, t = pa_sprintf_malloc("Esound sink '%s'", p));
pa_xfree(t);
u->memchunk.memblock = NULL; u->memchunk.memblock = NULL;
u->memchunk.length = 0; u->memchunk.length = 0;

4
src/modules/module-jack-sink.c
View file

@ -245,6 +245,7 @@ int pa__init(pa_core *c, pa_module*m) {
int do_connect = 1; int do_connect = 1;
unsigned i; unsigned i;
const char **ports = NULL, **p; const char **ports = NULL, **p;
char *t;
assert(c); assert(c);
assert(m); assert(m);
@ -328,7 +329,8 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("Jack sink (%s)", jack_get_client_name(u->client)); pa_sink_set_description(u->sink, t = pa_sprintf_malloc("Jack sink (%s)", jack_get_client_name(u->client)));
pa_xfree(t);
u->sink->get_latency = sink_get_latency_cb; u->sink->get_latency = sink_get_latency_cb;
jack_set_process_callback(u->client, jack_process, u); jack_set_process_callback(u->client, jack_process, u);

4
src/modules/module-jack-source.c
View file

@ -243,6 +243,7 @@ int pa__init(pa_core *c, pa_module*m) {
int do_connect = 1; int do_connect = 1;
unsigned i; unsigned i;
const char **ports = NULL, **p; const char **ports = NULL, **p;
char *t;
assert(c); assert(c);
assert(m); assert(m);
@ -326,7 +327,8 @@ int pa__init(pa_core *c, pa_module*m) {
u->source->userdata = u; u->source->userdata = u;
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
u->source->description = pa_sprintf_malloc("Jack source (%s)", jack_get_client_name(u->client)); pa_source_set_description(u->source, t = pa_sprintf_malloc("Jack source (%s)", jack_get_client_name(u->client)));
pa_xfree(t);
u->source->get_latency = source_get_latency_cb; u->source->get_latency = source_get_latency_cb;
jack_set_process_callback(u->client, jack_process, u); jack_set_process_callback(u->client, jack_process, u);

2
src/modules/module-null-sink.c
View file

@ -141,7 +141,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->get_latency = get_latency; u->sink->get_latency = get_latency;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_xstrdup("NULL sink"); pa_sink_set_description(u->sink, "NULL sink");
u->n_bytes = 0; u->n_bytes = 0;
pa_gettimeofday(&u->start_time); pa_gettimeofday(&u->start_time);

24
src/modules/module-oss-mmap.c
View file

@ -349,7 +349,7 @@ int pa__init(pa_core *c, pa_module*m) {
int enable_bits = 0, zero = 0; int enable_bits = 0, zero = 0;
int playback = 1, record = 1; int playback = 1, record = 1;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
char hwdesc[64]; char hwdesc[64], *t;
pa_channel_map map; pa_channel_map map;
assert(c); assert(c);
@ -439,11 +439,12 @@ int pa__init(pa_core *c, pa_module*m) {
u->source->get_hw_volume = source_get_hw_volume; u->source->get_hw_volume = source_get_hw_volume;
u->source->set_hw_volume = source_set_hw_volume; u->source->set_hw_volume = source_set_hw_volume;
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
u->source->description = pa_sprintf_malloc("OSS PCM/mmap() on %s%s%s%s", pa_source_set_description(u->source, t = pa_sprintf_malloc("OSS PCM/mmap() on %s%s%s%s",
p, p,
hwdesc[0] ? " (" : "", hwdesc[0] ? " (" : "",
hwdesc[0] ? hwdesc : "", hwdesc[0] ? hwdesc : "",
hwdesc[0] ? ")" : ""); hwdesc[0] ? ")" : ""));
pa_xfree(t);
u->source->is_hardware = 1; u->source->is_hardware = 1;
u->in_memblocks = pa_xnew0(pa_memblock*, u->in_fragments); u->in_memblocks = pa_xnew0(pa_memblock*, u->in_fragments);
@ -480,11 +481,12 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->set_hw_volume = sink_set_hw_volume; u->sink->set_hw_volume = sink_set_hw_volume;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("OSS PCM/mmap() on %s%s%s%s", pa_sink_set_description(u->sink, t = pa_sprintf_malloc("OSS PCM/mmap() on %s%s%s%s",
p, p,
hwdesc[0] ? " (" : "", hwdesc[0] ? " (" : "",
hwdesc[0] ? hwdesc : "", hwdesc[0] ? hwdesc : "",
hwdesc[0] ? ")" : ""); hwdesc[0] ? ")" : ""));
pa_xfree(t);
u->sink->is_hardware = 1; u->sink->is_hardware = 1;
u->out_memblocks = pa_xmalloc0(sizeof(struct memblock *)*u->out_fragments); u->out_memblocks = pa_xmalloc0(sizeof(struct memblock *)*u->out_fragments);

24
src/modules/module-oss.c
View file

@ -326,7 +326,7 @@ int pa__init(pa_core *c, pa_module*m) {
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
char hwdesc[64]; char hwdesc[64], *t;
assert(c); assert(c);
assert(m); assert(m);
@ -413,11 +413,12 @@ int pa__init(pa_core *c, pa_module*m) {
u->source->get_hw_volume = source_get_hw_volume; u->source->get_hw_volume = source_get_hw_volume;
u->source->set_hw_volume = source_set_hw_volume; u->source->set_hw_volume = source_set_hw_volume;
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
u->source->description = pa_sprintf_malloc("OSS PCM on %s%s%s%s", pa_source_set_description(u->source, t = pa_sprintf_malloc("OSS PCM on %s%s%s%s",
p, p,
hwdesc[0] ? " (" : "", hwdesc[0] ? " (" : "",
hwdesc[0] ? hwdesc : "", hwdesc[0] ? hwdesc : "",
hwdesc[0] ? ")" : ""); hwdesc[0] ? ")" : ""));
pa_xfree(t);
u->source->is_hardware = 1; u->source->is_hardware = 1;
} else } else
u->source = NULL; u->source = NULL;
@ -431,11 +432,12 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->set_hw_volume = sink_set_hw_volume; u->sink->set_hw_volume = sink_set_hw_volume;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("OSS PCM on %s%s%s%s", pa_sink_set_description(u->sink, pa_sprintf_malloc("OSS PCM on %s%s%s%s",
p, p,
hwdesc[0] ? " (" : "", hwdesc[0] ? " (" : "",
hwdesc[0] ? hwdesc : "", hwdesc[0] ? hwdesc : "",
hwdesc[0] ? ")" : ""); hwdesc[0] ? ")" : ""));
pa_xfree(t);
u->sink->is_hardware = 1; u->sink->is_hardware = 1;
} else } else
u->sink = NULL; u->sink = NULL;

6
src/modules/module-pipe-sink.c
View file

@ -148,6 +148,8 @@ int pa__init(pa_core *c, pa_module*m) {
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
char *t;
assert(c && m); assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
@ -194,8 +196,8 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->get_latency = get_latency_cb; u->sink->get_latency = get_latency_cb;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("Unix FIFO sink '%s'", p); pa_sink_set_description(u->sink, t = pa_sprintf_malloc("Unix FIFO sink '%s'", p));
assert(u->sink->description); pa_xfree(t);
u->io = pa_iochannel_new(c->mainloop, -1, fd); u->io = pa_iochannel_new(c->mainloop, -1, fd);
assert(u->io); assert(u->io);

6
src/modules/module-pipe-source.c
View file

@ -126,6 +126,8 @@ int pa__init(pa_core *c, pa_module*m) {
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
char *t;
assert(c && m); assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
@ -169,8 +171,8 @@ int pa__init(pa_core *c, pa_module*m) {
} }
u->source->userdata = u; u->source->userdata = u;
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
u->source->description = pa_sprintf_malloc("Unix FIFO source '%s'", p); pa_source_set_description(u->source, t = pa_sprintf_malloc("Unix FIFO source '%s'", p));
assert(u->source->description); pa_xfree(t);
u->io = pa_iochannel_new(c->mainloop, fd, -1); u->io = pa_iochannel_new(c->mainloop, fd, -1);
assert(u->io); assert(u->io);

7
src/modules/module-solaris.c
View file

@ -500,6 +500,7 @@ int pa__init(pa_core *c, pa_module*m) {
pa_channel_map map; pa_channel_map map;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
struct timeval tv; struct timeval tv;
char *t;
assert(c && m); assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { 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->get_hw_volume = source_get_hw_volume_cb;
u->source->set_hw_volume = source_set_hw_volume_cb; u->source->set_hw_volume = source_set_hw_volume_cb;
pa_source_set_owner(u->source, m); 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; u->source->is_hardware = 1;
} else } else
u->source = NULL; 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->set_hw_mute = sink_set_hw_mute_cb;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); 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; u->sink->is_hardware = 1;
} else } else
u->sink = NULL; u->sink = NULL;

9
src/modules/module-tunnel.c
View file

@ -859,6 +859,8 @@ int pa__init(pa_core *c, pa_module*m) {
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
struct timeval ntv; struct timeval ntv;
char *t;
assert(c && m); assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
@ -925,7 +927,8 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->get_hw_mute = sink_get_hw_mute; u->sink->get_hw_mute = sink_get_hw_mute;
u->sink->set_hw_mute = sink_set_hw_mute; u->sink->set_hw_mute = sink_set_hw_mute;
u->sink->userdata = u; u->sink->userdata = u;
u->sink->description = pa_sprintf_malloc("Tunnel to '%s%s%s'", u->sink_name ? u->sink_name : "", u->sink_name ? "@" : "", u->server_name); pa_sink_set_description(u->sink, t = pa_sprintf_malloc("Tunnel to '%s%s%s'", u->sink_name ? u->sink_name : "", u->sink_name ? "@" : "", u->server_name));
pa_xfree(t);
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
#else #else
@ -940,7 +943,9 @@ int pa__init(pa_core *c, pa_module*m) {
u->source->get_hw_mute = source_get_hw_mute; u->source->get_hw_mute = source_get_hw_mute;
u->source->set_hw_mute = source_set_hw_mute; u->source->set_hw_mute = source_set_hw_mute;
u->source->userdata = u; u->source->userdata = u;
u->source->description = pa_sprintf_malloc("Tunnel to '%s%s%s'", u->source_name ? u->source_name : "", u->source_name ? "@" : "", u->server_name);
pa_source_set_description(u->source, t = pa_sprintf_malloc("Tunnel to '%s%s%s'", u->source_name ? u->source_name : "", u->source_name ? "@" : "", u->server_name));
pa_xfree(t);
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
#endif #endif

4
src/modules/module-waveout.c
View file

@ -503,7 +503,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->source->notify = notify_source_cb; u->source->notify = notify_source_cb;
u->source->get_latency = source_get_latency_cb; u->source->get_latency = source_get_latency_cb;
pa_source_set_owner(u->source, m); pa_source_set_owner(u->source, m);
u->source->description = pa_sprintf_malloc("Windows waveIn PCM"); pa_source_set_description(u->source, "Windows waveIn PCM");
u->source->is_hardware = 1; u->source->is_hardware = 1;
} else } else
u->source = NULL; u->source = NULL;
@ -517,7 +517,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->set_hw_volume = sink_set_hw_volume_cb; u->sink->set_hw_volume = sink_set_hw_volume_cb;
u->sink->userdata = u; u->sink->userdata = u;
pa_sink_set_owner(u->sink, m); pa_sink_set_owner(u->sink, m);
u->sink->description = pa_sprintf_malloc("Windows waveOut PCM"); pa_sink_set_description(u->sink, "Windows waveOut PCM");
u->sink->is_hardware = 1; u->sink->is_hardware = 1;
} else } else
u->sink = NULL; u->sink = NULL;

3
src/modules/module-zeroconf-publish.c
View file

@ -185,7 +185,8 @@ static int publish_service(struct userdata *u, struct service *s) {
txt = avahi_string_list_add_printf(txt, "rate=%u", ss.rate); txt = avahi_string_list_add_printf(txt, "rate=%u", ss.rate);
txt = avahi_string_list_add_printf(txt, "channels=%u", ss.channels); txt = avahi_string_list_add_printf(txt, "channels=%u", ss.channels);
txt = avahi_string_list_add_pair(txt, "format", pa_sample_format_to_string(ss.format)); txt = avahi_string_list_add_pair(txt, "format", pa_sample_format_to_string(ss.format));
txt = avahi_string_list_add_pair(txt, "description", description); if (description)
txt = avahi_string_list_add_pair(txt, "description", description);
type = s->loaded.type; type = s->loaded.type;
} else if (s->autoload.valid) } else if (s->autoload.valid)