oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player_thread: use GLib logging

Browse Source
This commit is contained in:
Max Kellermann
2008-12-29 17:29:14 +01:00
parent 46bef03e5a
commit e9b96c6e56
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/player_thread.c
View File

@@ -22,7 +22,6 @@
#include "audio.h" #include "audio.h"
#include "pcm_utils.h" #include "pcm_utils.h"
#include "path.h" #include "path.h"
#include "log.h"
#include "main_notify.h" #include "main_notify.h"
#include "crossfade.h" #include "crossfade.h"
#include "song.h" #include "song.h"
@@ -31,6 +30,9 @@
#include <glib.h> #include <glib.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "player_thread"
enum xfade_state { enum xfade_state {
XFADE_DISABLED = -1, XFADE_DISABLED = -1,
XFADE_UNKNOWN = 0, XFADE_UNKNOWN = 0,
@@ -176,9 +178,9 @@ static void player_process_command(struct player *player)
assert(dc.next_song == NULL || dc.next_song->url != NULL); assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song; pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_AUDIO; pc.error = PLAYER_ERROR_AUDIO;
ERROR("problems opening audio device " g_warning("problems opening audio device "
"while playing \"%s\"\n", "while playing \"%s\"",
song_get_url(dc.next_song, tmp)); song_get_url(dc.next_song, tmp));
player->paused = true; player->paused = true;
} }
} }
@@ -329,9 +331,9 @@ static void do_play(void)
assert(dc.next_song == NULL || dc.next_song->url != NULL); assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song; pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_AUDIO; pc.error = PLAYER_ERROR_AUDIO;
ERROR("problems opening audio device " g_warning("problems opening audio device "
"while playing \"%s\"\n", "while playing \"%s\"",
song_get_url(dc.next_song, tmp)); song_get_url(dc.next_song, tmp));
break; break;
} }
@@ -539,5 +541,5 @@ void player_create(void)
GThread *t; GThread *t;
if (!(t = g_thread_create(player_task, NULL, FALSE, &e))) if (!(t = g_thread_create(player_task, NULL, FALSE, &e)))
FATAL("Failed to spawn player task: %s\n", e->message); g_error("Failed to spawn player task: %s", e->message);
} }