summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-02-10 20:01:33 +0100
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-02-10 20:01:33 +0100
commit382525580be43bc0a15d4c40024a0c49018c8c7f (patch)
treed7997fcacde6217bf1f6120bf73674dffc8e8f24
parentbc5c23e5961da845671237dc1a68cbc59c9b6a73 (diff)
fixed few regressions in streamer
-rw-r--r--streamer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/streamer.c b/streamer.c
index af063e69..5c10bd54 100644
--- a/streamer.c
+++ b/streamer.c
@@ -307,9 +307,6 @@ streamer_song_removed_notify (playItem_t *it) {
return; // streamer is not running
}
plug_trigger_event (DB_EV_TRACKDELETED, (uintptr_t)it);
- if (it == playing_track) {
- playing_track = NULL;
- }
if (it == playlist_track) {
playlist_track = NULL;
// queue new next song for streaming
@@ -1171,7 +1168,10 @@ streamer_read_async (char *bytes, int size) {
bytesread = streamer_decode_src_libsamplerate (bytes, size);
}
else {
- fprintf (stderr, "invalid ratio! %d / %d = %f", p_get_rate (), samplerate, p_get_rate ()/(float)samplerate);
+ fprintf (stderr, "error: invalid ratio! %d / %d (this indicates decoder or streamer bug)\n", p_get_rate (), samplerate);
+ fprintf (stderr, "error: file: %s\n", streaming_track ? streaming_track->fname : "(null)");
+ // immediately start streaming next track
+ bytes_until_next_song = -1;
}
}
mutex_unlock (decodemutex);