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

change pa_log() and friends to not require a trailing \n on all logged strings

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-02-23 02:27:19 +00:00
parent cb59817b4a
commit 4a64b0d116
74 changed files with 558 additions and 532 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,10 +85,10 @@ static void update_usage(struct userdata *u) {
static void xrun_recovery(struct userdata *u) {
assert(u);
pa_log(__FILE__": *** ALSA-XRUN (capture) ***\n");
pa_log(__FILE__": *** ALSA-XRUN (capture) ***");
if (snd_pcm_prepare(u->pcm_handle) < 0)
pa_log(__FILE__": snd_pcm_prepare() failed\n");
pa_log(__FILE__": snd_pcm_prepare() failed");
}
static void do_read(struct userdata *u) {
@ -117,7 +117,7 @@ static void do_read(struct userdata *u) {
continue;
}
pa_log(__FILE__": snd_pcm_readi() failed: %s\n", strerror(-frames));
pa_log(__FILE__": snd_pcm_readi() failed: %s", strerror(-frames));
return;
}
@ -157,7 +157,7 @@ static pa_usec_t source_get_latency_cb(pa_source *s) {
assert(s && u && u->source);
if (snd_pcm_delay(u->pcm_handle, &frames) < 0) {
pa_log(__FILE__": failed to get delay\n");
pa_log(__FILE__": failed to get delay");
s->get_latency = NULL;
return 0;
}
@ -177,13 +177,13 @@ int pa__init(pa_core *c, pa_module*m) {
int err;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log(__FILE__": failed to parse module arguments\n");
pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
pa_log(__FILE__": failed to parse sample specification\n");
pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
frame_size = pa_frame_size(&ss);
@ -191,7 +191,7 @@ int pa__init(pa_core *c, pa_module*m) {
periods = 12;
fragsize = 1024;
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
pa_log(__FILE__": failed to parse buffer metrics\n");
pa_log(__FILE__": failed to parse buffer metrics");
goto fail;
}
period_size = fragsize;
@ -202,12 +202,12 @@ int pa__init(pa_core *c, pa_module*m) {
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) {
pa_log(__FILE__": Error opening PCM device %s: %s\n", dev, snd_strerror(err));
pa_log(__FILE__": Error opening PCM device %s: %s", dev, snd_strerror(err));
goto fail;
}
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &period_size)) < 0) {
pa_log(__FILE__": Failed to set hardware parameters: %s\n", snd_strerror(err));
pa_log(__FILE__": Failed to set hardware parameters: %s", snd_strerror(err));
goto fail;
}
@ -220,14 +220,14 @@ int pa__init(pa_core *c, pa_module*m) {
u->source->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s'", dev);
if (pa_create_io_events(u->pcm_handle, c->mainloop, &u->io_events, &u->n_io_events, io_callback, u) < 0) {
pa_log(__FILE__": failed to obtain file descriptors\n");
pa_log(__FILE__": failed to obtain file descriptors");
goto fail;
}
u->frame_size = frame_size;
u->fragment_size = period_size;
pa_log(__FILE__": using %u fragments of size %u bytes.\n", periods, u->fragment_size);
pa_log(__FILE__": using %u fragments of size %u bytes.", periods, u->fragment_size);
u->memchunk.memblock = NULL;
u->memchunk.index = u->memchunk.length = 0;