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-09-25eliminate g_error() usageThomas Jansen1-1/+2
Replaced all occurrences of g_error() with MPD_ERROR() located in a new header file 'mpd_error.h'. This macro uses g_critical() to print the error message and then exits gracefully in contrast to g_error() which would internally call abort() to produce a core dump. The macro name is distinctive and allows to find all places with dubious error handling. The long-term goal is to get rid of MPD_ERROR() altogether. To facilitate the eventual removal of this macro it was added in a new header file rather than to an existing header file. This fixes #2995 and #3007.
2010-05-08mixramp: Adjust MixRamp threshold to account for ReplayGain.Tim Phipps1-0/+2
2010-05-02player_thread: move cross-fading to output threadMax Kellermann1-8/+4
Remove cross_fade_apply(), and call pcm_mix() in the output thread, mixing the chunk and chunk->other together.
2010-03-21Add support for MixRamp tagsTim Phipps1-2/+14
Adds mixrampdb and mixrampdelay commands. Reads MIXRAP_START and MIXRAMP_END tags from FLAC files and overlaps instead of crossfading.
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.
2010-03-10output: added option "always_on" for radio stationsMax Kellermann1-1/+1
Did you ever accidently click "stop" while feeding a radio station? This option sets the output device to "pause" to disable the "close" method. It falls back to "pause" then, which is specific to the plugin. Some plugins implement it by feeding silence.
2010-01-02output_all: reset elapsed_time at song borderMax Kellermann1-0/+2
Another quirk fixed: after the last chunk of a song has been played, the "elapsed_time" variable is set to the chunk's time stamp. When the client receives the PLAYER idle event and asks MPD for the current time stamp, MPD will return the last time stamp of the previous song when it hasn't played the first chunk of the current song yet.
2009-12-31Update copyright notices.Avuton Olrich1-1/+1
2009-12-27decoder, player: support song rangesMax Kellermann1-3/+31
Seek the decoder to the start of the range before beginning with playback. Stop the decoder when the end of the range has been reached. Add the start position to the seek position. Expose the duration of the range, not the full song file.
2009-12-26song: added function song_get_duration()Max Kellermann1-2/+1
2009-12-14fixed several gcc warnings on unused debug variablesMax Kellermann1-1/+1
2009-11-14player_thread: corrected two assertions on "queued"Max Kellermann1-2/+2
At this point, the function may be called from the SEEK handler.
2009-11-12player_thread: initialize chunk->times in silence generatorMax Kellermann1-0/+1
When waiting for the decoder to provide more data, the player thread generates silence chunks if needed. However, it forgot to initialize the chunk.times attribute, which had now an undefined value. This patch sets it to -1.0, meaning "value is undefined". Add a ">= 0.0" check to audio_output_all_check(). This fixes spurious relative seeking errors, because sometimes, the "elapsed" value falls back to 0.0.
2009-11-12include config.h in all sourcesMax Kellermann1-0/+1
After we've been hit by Large File Support problems several times in the past week (which only occur on 32 bit platforms, which I don't have), this is yet another attempt to fix the issue.
2009-11-09player_thread: drain audio outputs at the end of the playlistMax Kellermann1-1/+5
When there's no queued song, and the current one has finished playing, first make sure that the hardware outputs have really finished playing the last chunk: call the drain() method in all audio outputs. Without this patch, MPD stopped playback shortly before the ALSA sound card had finished playing.
2009-11-03player_thread: on return, reset next_song only if queuedMax Kellermann1-3/+7
If no song was queued, then player_control.next_song might contain the value for the next QUEUE command. We must not reset that.
2009-11-03player_thread: detect finished queued songMax Kellermann1-1/+2
When the decoder finishes the "queued" song very quickly (before the "current" song finishes playing), an assertion in do_play() fails because it thinks that it should start decoding the queued song, although that has in fact just finished.
2009-11-03player_thread: moved code to decoding_next_song()Max Kellermann1-4/+15
Simplify several expressions.
2009-11-03player_thread: lock player in player_check_decoder_startup()Max Kellermann1-0/+8
Don't access attributes without the lock.
2009-11-03decoder_control: pass pipe and buffer to dc_start()Max Kellermann1-10/+5
Don't access decoder_control attributes directly.
2009-11-03player_thread: lock inside player_wait_for_decoder()Max Kellermann1-7/+17
Lock the player_control object when modifying its attributes.
2009-11-03player_thread: moved code to player_dc_start()Max Kellermann1-5/+20
2009-11-03decoder_control: merge next_song and current_songMax Kellermann1-9/+3
These two variables are redundant, we need only one of them.
2009-11-03player_thread: don't set errored_song on audio errorMax Kellermann1-2/+0
It's not used if pc.error==PLAYER_ERROR_AUDIO.
2009-11-03player_thread: don't start the decoder asynchronouslyMax Kellermann1-4/+2
The START command returns without blocking; we don't need the asynchronous decoder start anymore.
2009-11-02player_thread: check command before waiting during pauseMax Kellermann1-1/+3
While paused, the player thread re-locks its mutex and waits for a signal. This is racy: when the command is set while the thread is waiting for the lock, it may wait forever. This patch adds another command check before player_wait().
2009-10-31decoder_control: removed the global variable "dc"Max Kellermann1-71/+88
Allocate a decoder_control object where needed, and pass it around. This will allow more than one decoder thread one day.
2009-10-31player_thread: simplified thread destructionMax Kellermann1-4/+2
Simply use "return" instead of g_thread_exit().
2009-10-31player_control: protect command, state, error with a mutexMax Kellermann1-27/+113
Use GMutex/GCond instead of the notify library. Manually lock the player_control object before accessing the protected attributes. Use the GCond object to notify the player thread and the main thread.
2009-10-30{player,output}_thread: fixed elapsed_time quirksMax Kellermann1-0/+16
Right after seeking and song change, the elapsed_time shows old information, because the output thread didn't finish a full chunk yet. This patch re-adds a second elapsed_time variable, and keeps track of a fallback value, in case the output thread can't provide a reliable value.
2009-10-29player_thread: set error status in play_next_chunk()Max Kellermann1-4/+3
Don't set the error in play_chunk(); do all the error handling in the caller. The errored_song attribute isn't set anymore; it doesn't make sense for PLAYER_ERROR_AUDIO.
2009-10-23output_plugin: added methods enable() and disable()Max Kellermann1-0/+10
With these methods, an output plugin can allocate some global resources only if it is actually enabled. The method enable() is called after daemonization, which allows for more sophisticated resource allocation during that method.
2009-10-15player_thread: don't call audio_output_all_check() if pausedMax Kellermann1-1/+2
When the audio output fails to open, MPD pauses playback, but doesn't reset player.play_audio_format. This leads to an assertion failure in audio_output_all_check() on the next REFRESH command, because no audio output is open.
2009-10-13song: renamed attribute "url" to "uri"Max Kellermann1-4/+4
2009-10-08player_thread: get "elapsed" from audio outputsMax Kellermann1-4/+13
Tracking the "elapsed" time from the chunks which we have sent to the output pipe is very imprecise: since we have implemented the music pipe, we're sending large number of chunks at once, giving the "elapsed" time stamp a resolution of usually more than a second. This patch changes the source of this information to the outputs. If a chunk has been played by all outputs, the "elapsed" time stamp is updated. The new command PLAYER_COMMAND_REFRESH makes the player thread update its status information: it tells the outputs to update the chunk time stamp. After that, player_control.elapsed_time is current.
2009-10-08player_thread: always clear player_control.next_song on returnMax Kellermann1-5/+3
pc.next_song might be non-NULL even if player.queued==true: when the decoder has started decoding the next song, but the result hasn't been read yet.
2009-10-08player_control: eliminate PLAYER_COMMAND_PLAYMax Kellermann1-2/+0
Sending PLAYER_COMMAND_STOP followed by PLAYER_COMMAND_QUEUE does the same. PLAYER_COMMAND_PLAY is redundant.
2009-08-13decoder_control: protect command, state with a mutexMax Kellermann1-7/+23
Replace decoder_control.notify with decoder_control.mutex and decoder_control.cond. Lock the mutex on all accesses to decoder_control.command and decoder_control.state.
2009-07-23player_thread: don't use precalculated size_to_timeMax Kellermann1-13/+4
Calculate the total play time with the audio_format object each time, using audio_format_time_to_size(). The function audioFormatSizeToTime() is not needed anymore, and will be removed with this patch.
2009-07-23player_thread: moved code to update_song_tag()Max Kellermann1-19/+27
2009-07-06player_thread: log played song in "default" log modeSébastien Houzé1-0/+6
Very few lines to log a song URI when it has been entirely played. Then mpd logs can be parsed to do statistics.
2009-07-06output: use the software mixer pluginMax Kellermann1-14/+0
Do all the software volume stuff inside each output thread, not in the player thread. This allows one software mixer per output device, and also allows the user to configure the mixer type (hardware or software) for each audio output. This moves the global "mixer_type" setting into the "audio_output" section, deprecating the "mixer_enabled" flag.
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.