aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_thread.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v0.17.x'Max Kellermann2012-08-151-1/+3
|\ | | | | | | | | Conflicts: src/player_thread.c
| * player_thread: add local variable "start_ms"Max Kellermann2012-08-151-1/+3
| | | | | | | | Just in case "song" becomes invalid at some point.
* | decoder_control: add function _is_current_song()Max Kellermann2012-08-151-1/+1
| | | | | | | | Replaces _current_song().
* | player_control: add GError attributeMax Kellermann2012-08-081-10/+8
| | | | | | | | | | Rewrite of the pc_get_error_message() function, now using a GError object instead of the complicated "errored_song" attribute.
* | output_all: add basic GError supportMax Kellermann2012-08-081-5/+19
| |
* | player_control: rename attribute "error" to "error_type"Max Kellermann2012-08-081-4/+4
| |
* | player_control: rename player_error enum valuesMax Kellermann2012-08-081-4/+4
|/
* Merge branch 'v0.16.x'Max Kellermann2011-10-061-29/+68
|\ | | | | | | | | | | | | | | Conflicts: configure.ac src/player_control.c src/player_thread.c src/playlist_song.c
| * player_thread: add flag "output_open", fixes assertion failureMax Kellermann2011-10-061-5/+17
| | | | | | | | | | | | | | Previously, the condition "defined(play_audio_format)" was used to see if an output device has been opened, but if the device had failed on startup, an assertion failure could occur. This patch adds a separate flag.
| * player_thread: move code to player_open_output()Max Kellermann2011-10-061-22/+37
| | | | | | | | | | Common function that manages "player" attributes after audio_output_all_open() has returned.
| * player_thread: handle SEEK while not playingMax Kellermann2011-10-061-2/+10
| |
| * decoder_control: add attributes start_ms, end_msMax Kellermann2011-10-051-1/+3
| | | | | | | | | | Don't read song.start_ms and song.end_ms, let the player thread manage this logic instead.
* | Merge branch 'v0.16.x'Max Kellermann2011-09-221-10/+0
|\| | | | | | | | | Conflicts: src/player_thread.c
| * decoder_api: emulate SEEK command for initial seek to CUE trackMax Kellermann2011-09-221-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | When playing a CUE track, the player thread waited for the decoder to become ready, and then sent a SEEK command to the beginning of the CUE track. If that is near the start of the song file, and the track is short enough, the decoder could have finished decoding already at that point, and seeking fails. This commit makes this initial seek more robust: instead of letting the player thread deal with the difficult timings, let the decoder API emulate a SEEK command, and return it to the decoder plugin, as soon as the plugin finishes its initialization.
* | Merge branch 'v0.16.x'Max Kellermann2011-07-201-0/+2
|\| | | | | | | | | | | Conflicts: src/player_thread.c src/playlist_control.c
| * player_thread: lock the player while setting the bite_rateMax Kellermann2011-07-201-0/+2
| |
* | fix common misspellingsJonathan Neuschäfer2011-03-311-1/+1
| | | | | | | | | | | | | | These fixes were mostly generated with `codespell' [0] and manually reviewed. [0] http://git.profusion.mobi/cgit.cgi/lucas/codespell/
* | copyright year 2011Max Kellermann2011-01-291-1/+1
| |
* | decoder_control: store GCond object, not a player_controlMax Kellermann2011-01-101-1/+1
| | | | | | | | | | | | Remove the decoder dependency on player_control. All player_control was needed for is to signal the player thread, and we can do that with a simple GCond as well.
* | decoder_control: replace dc_init() with dc_new()Max Kellermann2011-01-101-6/+5
| | | | | | | | | | dc_new() allocates the object and returns it. dc_free() frees it (replaces dc_deinit()).
* | player_control: removed the global variable "pc"Max Kellermann2011-01-101-148/+164
|/ | | | | | | Allocate a player_control object where needed, and pass it around. Each "client" object is associated with a "player_control" instance. This prepares multi-player support.
* player_thread: discard empty chunks while cross-fadingMax Kellermann2011-01-071-0/+13
| | | | | | When a music_chunk to be crossfaded consists only of a tag, cross-fading is not possible, and led to an assertion failure. This patch just discards those, as if cross-fading was not enabled.
* player_thread: fix assertion failure due to early seekMax Kellermann2011-01-071-0/+4
| | | | | | | Until the decoder plugin has called decoder_initialized(), the player may not submit seek commands. This however could occur with a slow decoder and a CUE file with a virtual song offset. This patch adds another check.
* player_thread: make variables more localMax Kellermann2011-01-071-36/+19
|
* Merge release 0.15.14 from branch 'v0.15.x'Max Kellermann2010-11-071-18/+42
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: NEWS configure.ac src/decoder_control.c src/decoder_control.h src/input/rewind_input_plugin.c src/output_control.c src/output_thread.c src/player_thread.c
| * player_thread: fix assertion failure due to wrong music pipe on seekMax Kellermann2010-11-051-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.
| * decoder_control: pass music_pipe to dc_start()Max Kellermann2010-11-051-6/+5
| | | | | | | | More abstraction for decoder_control.pipe.
| * player_thread: add helper function player_dc_at_next_song()Max Kellermann2010-11-051-6/+33
| | | | | | | | Some abstraction for decoder_control.pipe access.
| * pipe: add helper function music_pipe_empty()Max Kellermann2010-11-051-2/+2
| |
* | eliminate g_error() usageThomas Jansen2010-09-251-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.
* | mixramp: Adjust MixRamp threshold to account for ReplayGain.Tim Phipps2010-05-081-0/+2
| |
* | player_thread: move cross-fading to output threadMax Kellermann2010-05-021-8/+4
| | | | | | | | | | Remove cross_fade_apply(), and call pcm_mix() in the output thread, mixing the chunk and chunk->other together.
* | Merge release 0.15.9 from branch 'v0.15.x'Max Kellermann2010-03-281-0/+27
|\| | | | | | | | | | | | | | | | | Conflicts: NEWS configure.ac src/cue/cue_tag.c src/decoder/mpcdec_decoder_plugin.c src/player_thread.c
| * player_thread: postpone song tags during cross-fadeMax Kellermann2010-03-171-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.
* | Add support for MixRamp tagsTim Phipps2010-03-211-2/+14
| | | | | | | | | | Adds mixrampdb and mixrampdelay commands. Reads MIXRAP_START and MIXRAMP_END tags from FLAC files and overlaps instead of crossfading.
* | output: added option "always_on" for radio stationsMax Kellermann2010-03-101-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.
* | output_all: reset elapsed_time at song borderMax Kellermann2010-01-021-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.
* | Update copyright notices.Avuton Olrich2009-12-311-1/+1
| |
* | decoder, player: support song rangesMax Kellermann2009-12-271-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.
* | song: added function song_get_duration()Max Kellermann2009-12-261-2/+1
| |
* | fixed several gcc warnings on unused debug variablesMax Kellermann2009-12-141-1/+1
| |
* | player_thread: corrected two assertions on "queued"Max Kellermann2009-11-141-2/+2
| | | | | | | | At this point, the function may be called from the SEEK handler.
* | player_thread: initialize chunk->times in silence generatorMax Kellermann2009-11-121-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.
* | include config.h in all sourcesMax Kellermann2009-11-121-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.
* | player_thread: drain audio outputs at the end of the playlistMax Kellermann2009-11-091-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.
* | player_thread: on return, reset next_song only if queuedMax Kellermann2009-11-031-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.
* | player_thread: detect finished queued songMax Kellermann2009-11-031-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.
* | player_thread: moved code to decoding_next_song()Max Kellermann2009-11-031-4/+15
| | | | | | | | Simplify several expressions.
* | player_thread: lock player in player_check_decoder_startup()Max Kellermann2009-11-031-0/+8
| | | | | | | | Don't access attributes without the lock.
* | decoder_control: pass pipe and buffer to dc_start()Max Kellermann2009-11-031-10/+5
| | | | | | | | Don't access decoder_control attributes directly.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 21:42:06 +0000