summaryrefslogtreecommitdiff
path: root/streamer.c
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2011-01-10 20:31:54 +0100
committerGravatar waker <wakeroid@gmail.com>2011-01-10 21:02:40 +0100
commitbad68f332469178ffb81a0dd2ac74ae62301af72 (patch)
treec6b2d0387a145511d12198e9035368cb8b178f3b /streamer.c
parent822c99debf259c6648654143abc9d772ea447f73 (diff)
fixed resume in paused state;
changed output plugin setformat method to return error code changed setformat to restore state before the call
Diffstat (limited to 'streamer.c')
-rw-r--r--streamer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/streamer.c b/streamer.c
index 6cc8d973..f364dcd7 100644
--- a/streamer.c
+++ b/streamer.c
@@ -857,6 +857,12 @@ streamer_start_new_song (void) {
memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
formatchanged = 1;
}
+ // we need to start playback before we can pause it
+ if (0 != output->play ()) {
+ memset (&output_format, 0, sizeof (output_format));
+ fprintf (stderr, "streamer: failed to start playback (start track)\n");
+ streamer_set_nextsong (-2, 0);
+ }
}
output->pause ();
}