diff options
| author | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
| commit | 1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788 (patch) | |
| tree | 8a13ed86728b59caebd86dc7a1287c234b4985f1 /src/output_thread.c | |
| parent | a800afcbf8845df0edc6aee3bb48036bba34e255 (diff) | |
| parent | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (diff) | |
| download | mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.gz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.xz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.zip | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/output_thread.c')
| -rw-r--r-- | src/output_thread.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/output_thread.c b/src/output_thread.c index 380956fac..a5244c693 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -303,7 +303,7 @@ ao_wait(struct audio_output *ao) GTimeVal tv; g_get_current_time(&tv); g_time_val_add(&tv, delay * 1000); - g_cond_timed_wait(ao->cond, ao->mutex, &tv); + (void)g_cond_timed_wait(ao->cond, ao->mutex, &tv); if (ao->command != AO_COMMAND_NONE) return false; @@ -463,12 +463,9 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk) /* don't automatically reopen this device for 10 seconds */ - g_mutex_lock(ao->mutex); - assert(ao->fail_timer == NULL); ao->fail_timer = g_timer_new(); - g_mutex_unlock(ao->mutex); return false; } |