aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_thread.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2010-11-05player_thread: fix assertion failure due to wrong music pipe on seekMax Kellermann1-0/+8
When one song is played twice, and the decoder is working on the second "instance", but the first should be seeked, the check in player_seek_decoder() may assume that it can reuse the decoder without exchanging pipes. The last thing was the mistake: the pipe pointer was different, which led to an assertion failure. This patch adds another check which exchanges the player pipe.
2010-11-05decoder_control: pass music_pipe to dc_start()Max Kellermann1-6/+5
More abstraction for decoder_control.pipe.
2010-11-05player_thread: add helper function player_dc_at_next_song()Max Kellermann1-6/+33
Some abstraction for decoder_control.pipe access.
2010-11-05pipe: add helper function music_pipe_empty()Max Kellermann1-2/+2
2010-03-17player_thread: postpone song tags during cross-fadeMax Kellermann1-0/+27
Previously, tags of the new song being cross-faded in were sent immediately. That can cause wrong information being displayed, because the "previous" song might send its tag at the end again, overriding the "next" song's tag. This patch saves & merges the tag of the next song, and sends it when cross-fading is finished, and the next song really starts.
2009-06-02player_thread: check pipe size again before exitingMax Kellermann1-1/+5
When the decoder is finished, break out of the player loop only after another player.pipe check. We did check the pipe size a few lines above, but that check was kind of racy.
2009-06-02player_thread: don't leak empty music_chunksMax Kellermann1-1/+3
When a music_chunk only contains a tag but no PCM data, play_chunk() returns true without freeing the chunk. The caller now assumes that the chunk is moved into some music_pipe and does not bother to free it either.
2009-05-29player_thread: reinitialize music_buffer in !NDEBUGMax Kellermann1-0/+9
To check for leaked music_chunk objects, free the music buffer on CLOSE_AUDIO. This invokes an assertion check which ensures that all chunks have been returned to the buffer.
2009-04-25player_thread: pause when all audio outputs fail to playMax Kellermann1-2/+7
When all audio outputs have been closed due to failures, pause the playback instead of stopping it. This way, the user may resume at the current position after the problem has been dealt with.
2009-04-25player_thread: pause when output fails while seekingMax Kellermann1-7/+11
When no audio outputs could be opened while seeking, leave MPD seeked at that position and pause playback. The user may continue from this point at any time, as soon as the audio outputs are fixed. The old behaviour triggered an assertion failure: the failure wasn't passed properly to the do_play() function, which attempted to play audio chunks.
2009-03-25player_thread: wait for decoder before seekingMax Kellermann1-0/+11
When the decoder initialization has not been completed yet, all calls to dc_seek() will fail, because dc.seekable is not initialized yet. Wait for the decoder to complete its initialization, i.e. until it has called decoder_initialized().
2009-03-25output_all: moved code to audio_output_all_wait()Max Kellermann1-10/+2
Synchronization with the output thread will be implemented in output_all.c, not in player_thread.c. Currently, that's just a simple g_usleep(1ms).
2009-03-17player_thread: ignore time stamp on empty chunksMax Kellermann1-3/+6
If a music_chunk does not contain any PCM data, then the "times" and "bit_rate" attributes are undefined.
2009-03-13all: Update copyright header.Avuton Olrich1-3/+4
This updates the copyright header to all be the same, which is pretty much an update of where to mail request for a copy of the GPL and the years of the MPD project. This also puts all committers under 'The Music Player Project' umbrella. These entries should go individually in the AUTHORS file, for consistancy.
2009-03-11player_thread: added commentsMax Kellermann1-21/+69
2009-03-11player_thread: removed player_stop_decoder()Max Kellermann1-14/+6
Replaced both player_stop_decoder() invocations with player_dc_stop(), which also cleans up the pipe.
2009-03-11player_thread: don't call dc_stop() twiceMax Kellermann1-3/+1
In the "CANCEL" command handler, the decoder is stopped twice: first by player_dc_stop(), then by dc_stop(). Remove the latter.
2009-03-10player_thread: fill buffer after seekingMax Kellermann1-3/+9
After a seek, wait until enough new chunks are decoded before starting playback. If this takes too long, send silence chunks to the audio outputs meanwhile.
2009-03-10player_thread: pass format to audio_output_all_open() after resumeMax Kellermann1-8/+12
When playback is unpaused, pass the audio_format to audio_output_all_open(). Don't assume that output_all.c remembers the previous audio format. Also check if there has been an audio format yet.
2009-03-10player_thread: moved code to player_send_silence()Max Kellermann1-22/+39
2009-03-10player_thread: finish failed seek commandMax Kellermann1-1/+5
When seeking into a new song, and the decoder for the new song fails to start up, MPD forgot to send the "command_finished" signal to the main thread.
2009-03-10player_thread: clear player.queued after failureMax Kellermann1-0/+1
When pc.next_song is reset due to a decoder failure, also reset the player.queued flag. player.queued must not be true when there is no pc.next_song.
2009-03-10player_thread: moved code to player_seek_decoder()Max Kellermann1-12/+15
Reset player.xfade and player.buffering from within player_seek_decoder(), not in the player_process_command() switch statement.
2009-03-10player_thread: don't free music buffer after decoder failureMax Kellermann1-1/+0
The music_buffer is a global variable, and must not be freed until the player thread exits.
2009-03-09output: play from a music_pipe objectMax Kellermann1-13/+59
Instead of passing individual buffers to audio_output_all_play(), pass music_chunk objects. Append all those chunks asynchronously to a music_pipe instance. All output threads may then read chunks from this pipe. This reduces MPD's internal latency by an order of magnitude.
2009-03-09player_thread: don't open audio device when pausedMax Kellermann1-4/+2
When a PAUSE command is received while the decoder starts, don't open the audio device when the decoder becomes ready. It's pointless, because MPD will close if after that.
2009-03-09player_thread: moved code to player_song_border()Max Kellermann1-6/+19
Moved some more cruft out of do_play().
2009-03-09player_thread: moved code to play_next_chunk()Max Kellermann1-73/+103
Moved some cruft out of do_play().
2009-03-09player_thread: make the music_buffer instance globalMax Kellermann1-14/+15
Preparation for the next patch: since the output devices stay open even when the player thread stops playing, we will need a persistent music buffer.
2009-03-08music_chunk: added assertions on the audio formatMax Kellermann1-0/+2
In !NDEBUG, remember which audio_format is stored in every chunk and every pipe. Check the audio_format of every new data block appended to the music_chunk, and the format of every new chunk appended to the music_pipe.
2009-03-07player_thread: moved code to player_check_decoder_startup()Max Kellermann1-40/+69
2009-03-06pipe: added music_buffer, rewrite music_pipeMax Kellermann1-58/+83
Turn the music_pipe into a simple music_chunk queue. The music_chunk allocation code is moved to music_buffer, and is now managed with a linked list instead of a ring buffer. Two separate music_pipe objects are used by the decoder for the "current" and the "next" song, which greatly simplifies the cross-fading code.
2009-03-03music_pipe: moved struct music_chunk to chunk.hMax Kellermann1-0/+1
2009-03-02pcm_volume: return boolMax Kellermann1-2/+11
Don't abort MPD when a sample format is not supported by pcm_volume().
2009-02-26player_thread: removed meaningless warning on output failureMax Kellermann1-5/+0
The warning message "problems opening audio device while playing ..." does not help at all, and should be removed. At this point, the real error message has already been logged by the output thread.
2009-02-17player_thread: don't drop audio buffers when not seekableMax Kellermann1-1/+2
When a file is not seekable, MPD dropped the audio buffers before even attempting to seek. This caused noticable sound corruption. Fix: first attempt to seek, and only if that succeeds, call audio_output_all_cancel().
2009-02-15decoder_api: moved enum decoder_command to decoder_command.hMax Kellermann1-0/+1
Minimize header dependencies, again.
2009-02-10output_all: no CamelCaseMax Kellermann1-11/+11
Renamed functions and variables.
2009-02-10audio: moved code to output_all.cMax Kellermann1-1/+1
Moved code which deals with all audio outputs at once into a separate library.
2009-02-10crossfade: don't use isCurrentAudioFormat()Max Kellermann1-0/+1
The crossfading code shouldn't depend on the audio output code. Pass the current audio format to cross_fade_calc() and let it compare directly, instead of using isCurrentAudioFormat().
2009-02-10player: added some more assertionsMax Kellermann1-0/+2
Assertions on pc.command and pc.next_song.
2009-02-10player_thread: reset pc.next_song only if queuedMax Kellermann1-1/+5
When we reset pc.next_song if there is no song queued, this might cause a race condition: the next song to be played is cleared, while pc.command was already set. Clear the "next_song" only if there is a song queued for the current do_play() invocation.
2009-02-10player_thread: reset pc.next_songMax Kellermann1-0/+6
After a player command (successful or not), reset pc.next_song, because the queue is supposed to be empty then. Otherwise, playlist.queued and pc.next_song may disagree, which triggers an assertion failure.
2009-02-02player_thread: set player error when output device failsMax Kellermann1-1/+4
When the output device fails to play a chunk, set pc.error to PLAYER_ERROR_AUDIO. This way, the playlist knows that it should not queue the next song.
2009-01-25player_thread: start decoder thread in player threadMax Kellermann1-0/+3
Start the decoder thread when the player thread starts. The decoder thread is already stopped by the player thread.
2009-01-25player_control: added player_control.threadMax Kellermann1-2/+4
player_control.thread contains the handle of the player thread, or NULL if the player thread isn't running.
2009-01-25decoder_control: added decoder_control.threadMax Kellermann1-1/+1
decoder_control.thread contains the handle of the decoder thread, or NULL if the decoder thread isn't running.
2009-01-21player_thread: emit PLAYLIST event when new song failsMax Kellermann1-1/+1
Break from the loop instead of returning the function. This calls player_stop_decoder(), which in turn emits the PLAYLIST event. This allows the playlist to re-start the player.
2009-01-21player_thread: check for decoder failure before seekingMax Kellermann1-1/+4
The function player_seek_decoder() starts the decoder, but does not check the return value of player_wait_for_decoder().
2009-01-21player_thread: use bool instead of intMax Kellermann1-12/+13
Make player_wait_for_decoder() and play_chunk() return a bool instead of 0/-1.