mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -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

20
src/modules/module-lirc.c
View file

@ -69,7 +69,7 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
assert(u);
if (events & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) {
pa_log(__FILE__": lost connection to LIRC daemon.\n");
pa_log(__FILE__": lost connection to LIRC daemon.");
goto fail;
}
@ -77,19 +77,19 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
char *c;
if (lirc_nextcode(&code) != 0 || !code) {
pa_log(__FILE__": lirc_nextcode() failed.\n");
pa_log(__FILE__": lirc_nextcode() failed.");
goto fail;
}
c = pa_xstrdup(code);
c[strcspn(c, "\n\r")] = 0;
pa_log_debug(__FILE__": raw IR code '%s'\n", c);
pa_log_debug(__FILE__": raw IR code '%s'", c);
pa_xfree(c);
while (lirc_code2char(u->config, code, &name) == 0 && name) {
enum { INVALID, UP, DOWN, MUTE, RESET, MUTE_TOGGLE } volchange = INVALID;
pa_log_info(__FILE__": translated IR code '%s'\n", name);
pa_log_info(__FILE__": translated IR code '%s'", name);
if (strcasecmp(name, "volume-up") == 0)
volchange = UP;
@ -103,12 +103,12 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
volchange = RESET;
if (volchange == INVALID)
pa_log_warn(__FILE__": recieved unknown IR code '%s'\n", name);
pa_log_warn(__FILE__": recieved unknown IR code '%s'", name);
else {
pa_sink *s;
if (!(s = pa_namereg_get(u->module->core, u->sink_name, PA_NAMEREG_SINK, 1)))
pa_log(__FILE__": failed to get sink '%s'\n", u->sink_name);
pa_log(__FILE__": failed to get sink '%s'", u->sink_name);
else {
pa_volume_t v = pa_cvolume_avg(pa_sink_get_volume(s, PA_MIXER_HARDWARE));
pa_cvolume cv;
@ -173,12 +173,12 @@ int pa__init(pa_core *c, pa_module*m) {
assert(c && m);
if (lirc_in_use) {
pa_log(__FILE__": module-lirc may no be loaded twice.\n");
pa_log(__FILE__": module-lirc may no be loaded twice.");
return -1;
}
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;
}
@ -191,12 +191,12 @@ int pa__init(pa_core *c, pa_module*m) {
u->mute_toggle_save = 0;
if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "polypaudio"), 1)) < 0) {
pa_log(__FILE__": lirc_init() failed.\n");
pa_log(__FILE__": lirc_init() failed.");
goto fail;
}
if (lirc_readconfig((char*) pa_modargs_get_value(ma, "config", NULL), &u->config, NULL) < 0) {
pa_log(__FILE__": lirc_readconfig() failed.\n");
pa_log(__FILE__": lirc_readconfig() failed.");
goto fail;
}