diff options
| -rw-r--r-- | src/outputBuffer.c | 15 | ||||
| -rw-r--r-- | src/outputBuffer_audio.h | 9 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/outputBuffer.c b/src/outputBuffer.c index 92d90184d..541461746 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -173,7 +173,6 @@ static enum action_status ob_do_drop(void) return ob_finalize_action(); } -static void close_audio_devices(void); static enum action_status ob_do_pause(void) { assert(pthread_equal(pthread_self(), ob.thread)); @@ -183,7 +182,8 @@ static enum action_status ob_do_pause(void) * state where it'll just play silence instead of disconnecting * listeners */ - close_audio_devices(); + dropBufferedAudio(); + closeAudioDevice(); ob.state = OB_STATE_PAUSE; return AS_INPROGRESS; } @@ -212,13 +212,15 @@ static void ob_seq_player_set(unsigned int seq_num) cond_leave(&ob_seq_cond); } -static enum action_status ob_do_reset(void) +static enum action_status ob_do_reset(int close) { assert(pthread_equal(pthread_self(), ob.thread)); ob.elapsed_time = 0; ob.total_time = 0; reader_reset_buffer(); dropBufferedAudio(); + if (close) + closeAudioDevice(); ob.xfade_state = XFADE_DISABLED; ob_seq_player_set((unsigned int)ob.seq_decoder); return ob_finalize_action(); @@ -230,7 +232,7 @@ static enum action_status ob_do_stop(void) if (ob.state == OB_STATE_STOP) return AS_INPROGRESS; ob.state = OB_STATE_STOP; - return ob_do_reset(); + return ob_do_reset(1); } /* @@ -311,9 +313,10 @@ static enum action_status ob_take_action(void) } break; case OB_ACTION_STOP: return ob_do_stop(); - case OB_ACTION_RESET: return ob_do_reset(); + case OB_ACTION_RESET: return ob_do_reset(0); case OB_ACTION_QUIT: - close_audio_devices(); + dropBufferedAudio(); + closeAudioDevice(); ob.state = OB_STATE_QUIT; return AS_INPROGRESS; } diff --git a/src/outputBuffer_audio.h b/src/outputBuffer_audio.h index fb366f7d7..332c61d87 100644 --- a/src/outputBuffer_audio.h +++ b/src/outputBuffer_audio.h @@ -17,12 +17,3 @@ static int open_audio_devices(int reopen) return -1; } -static void close_audio_devices(void) -{ - assert(pthread_equal(pthread_self(), ob.thread)); - DEBUG(__FILE__":%s %d\n", __func__, __LINE__); - dropBufferedAudio(); - closeAudioDevice(); - /* DEBUG(__FILE__":%s %d\n", __func__, __LINE__); */ -} - |