aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_thread.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-11-08decoder: converted dc.error to a dc.state valueMax Kellermann1-2/+2
The player did not care about the exact error value, it only checked whether an error has occured. This could fit well into decoder_control.state - introduce a new state "DECODE_STATE_ERROR".
2008-11-03player: no CamelCaseMax Kellermann1-28/+28
Renamed variables and internal functions. Most of the player_control.h API remains in CamelCase for now.
2008-11-03decoder: no CamelCaseMax Kellermann1-2/+2
Renamed variables and functions.
2008-11-02player: don't play empty chunksMax Kellermann1-0/+3
An empty chunk may happen when it only contains a tag, but no PCM data. Don't call playAudio() then.
2008-11-02player: copy stream tag to the song structMax Kellermann1-5/+19
Non-local songs used to have no tags. If the decoder sends us a tag, we should incorporate it into the song struct. This way, clients can always show the correct song name (if provided by the server).
2008-11-02player: added player.songMax Kellermann1-0/+7
Always remember which song is currently being sent to the audio device.
2008-11-02player: send chunk tag to audio deviceMax Kellermann1-0/+3
If a chunk contains a tag, send it to the audio output device. Few output plugins support this, e.g. shout has support for sending tags.
2008-11-02music_pipe: no CamelCaseMax Kellermann1-4/+4
Rename all variables and struct members.
2008-11-02music_pipe: more wrapper functionsMax Kellermann1-8/+6
Replace all direct music_pipe struct accesses with wrapper functions. The compiled machine code is the same, but this way, we can change struct internals more easily.
2008-11-02decoder: replaced music_pipe.audioFormat with dc.out_audio_formatMax Kellermann1-6/+6
.. and rename dc.audioFormat to dc.in_audio_format. The music pipe does not need to know the audio format, and its former "audioFormat" property indicated the format of the most recently added chunk, which might be confusing when you are reading the oldest chunks.
2008-11-02music_pipe: renamed ob_* functions to music_pipe_*Max Kellermann1-16/+17
Rename all functions to the new prefix.
2008-11-02music_pipe: renamed struct output_buffer to struct music_pipeMax Kellermann1-3/+5
.. and rename ob_chunk to struct music_chunk.
2008-10-30decoder: use bool for return values and flagsMax Kellermann1-4/+4
Don't return 0/-1 on success/error, but true/false. Instead of int, use bool for storing flags.
2008-10-29output: always call cancel() before stop()Max Kellermann1-4/+2
Stopping an audio output device without cancelling its buffer doesn't make sense. Combine the two operations, which saves several cancel calls.
2008-10-29output: use bool for return values and flagsMax Kellermann1-5/+4
Don't return 0/-1 on success/error, but true/false. Instead of int, use bool for storing flags.
2008-10-29player: handle songs shorter than the initial bufferMax Kellermann1-1/+2
When the decoder exited before the buffer has grown big enough ("buffer_before_play"), the player thread waited forever. Add an additional check which disables buffering as soon as the decoder exits.
2008-10-29player: added variable "play_audio_format"Max Kellermann1-2/+4
The local variable "play_audio_format" is updated every time the player starts playing a new song. This way, we always know exactly which audio format is current. The old code broke when a new song had a different format: ob.audio_format is the format of the next song, not of the current one - using this caused breakage for the software volume control.
2008-10-29player: request new song only if there is no pending commandMax Kellermann1-1/+2
Request the next song from the playlist (by clearing pc.next_song) only if the player command is empty. If it is not, the player may be clearing the song that has already been queued, leading to an assertion failure.
2008-10-27player: reset pc.command when decoder startup failsMax Kellermann1-0/+1
When the decoder failed to start, the function do_play() returned, still having pc.command==PLAY. This is because pc.command was reset only when the decoder started up successfully. Add another player_command_finished() call in the error handler.
2008-10-24player: don't clear command before do_play() returnsMax Kellermann1-1/+0
This bug caused the audio output devices to stay open, although MPD wasn't playing: quitDecode() resetted player_control.command, assuming that the command was STOP. This way, player_task() didn't see the CLOSE_AUDIO command, and the device was kept open. Don't clear player_control.command in quitDecode().
2008-10-23player: don't send partial frames of silenceMax Kellermann1-1/+7
Another partial frame fix: the silence buffer was 1020 bytes, which had room for 127.5 24 bit stereo frames. Don't send the partial last frame in this case.
2008-10-21pcm_utils: no CamelCaseMax Kellermann1-2/+2
Renamed all functions which were still in CamelCase.
2008-10-12player: replaced buffered_before_play with buffering flagMax Kellermann1-9/+10
buffered_before_play was copied to struct player because it was used to disable buffering when seeking. Instead of mainaining a copy of this number, move just the flag to the player struct.
2008-10-12player: added commands QUEUE and CANCELMax Kellermann1-29/+48
QUEUE adds a new song to the player's queue. CANCEL clears the queue. These two commands replace the old and complex queueState and queueLockState code.
2008-10-12player: added struct playerMax Kellermann1-48/+75
The player struct holds the local variables which used to be passed to all those helper functions in player_thread.c.
2008-10-11player: removed player_control.fileTimeMax Kellermann1-1/+2
This variable is superfluous, it is only used to copy its value to player_control.totalTime. Since the original source of this value (song->tag->time) will still be available at this point, we can safely remove fileTime.
2008-10-10player: don't wake up decoder after every frameMax Kellermann1-1/+7
The decoder was woken up after each chunk which had been played. That caused a lot of superfluous context switches. Wake up the decoder only when a certain amount of the buffer has been consumed. This formula is somewhat arbitrary, and has to be proven experimentally.
2008-10-10player: added player_control.audio_formatMax Kellermann1-6/+2
This replaces the attributes bits, channels, sampleRate.
2008-10-10audio_format: renamed sampleRate to sample_rateMax Kellermann1-1/+1
The last bit of CamelCase in audio_format.h. Additionally, rename a bunch of local variables.
2008-10-08song: removed CamelCaseMax Kellermann1-2/+2
CamelCase is ugly... rename all functions.
2008-10-08use the "bool" data type instead of "int"Max Kellermann1-4/+4
"bool" should be used in C99 programs for boolean values.
2008-10-08song: converted typedef Song to struct songMax Kellermann1-0/+1
Again, a data type which can be forward-declared.
2008-09-29audio_output: added method pause()Max Kellermann1-1/+1
pause() puts the audio output into pause mode: if supported, it may perform a special action, which keeps the device open, but does not play anything. Output plugins like "shout" might want to play silence during pause, so their clients won't be disconnected. Plugins which do not support pausing will simply be closed, and have to be reopened when unpaused. This pach includes an implementation for the shout plugin, which sends silence chunks.
2008-09-26notify: protect notify->pending with the mutexMax Kellermann1-2/+0
There was a known deadlocking bug in the notify library: when the other thread set notify->pending after the according check in notify_wait(), the latter thread was deadlocked. Resolve this by synchronizing all accesses to notify->pending with the notify object's mutex. Since notify_signal_sync() was never used, we can remove it. As a consequence, we don't need notify_enter() and notify_leave() anymore; eliminate them, too.
2008-09-07audio_format: converted typedef AudioFormat to struct audio_formatMax Kellermann1-1/+1
Get rid of CamelCase, and don't use a typedef, so we can forward-declare it, and unclutter the include dependencies.
2008-08-26moved player_command_finished() to player_thread.cMax Kellermann1-0/+8
2008-08-26moved code to pc_init(), dc_init()Max Kellermann1-3/+2
2008-08-26renamed player.c to player_control.cMax Kellermann1-1/+1
Give player.c a better name, meaning that the code is used to control the player thread.
2008-08-26renamed decode.h to decoder_control.hMax Kellermann1-1/+1
2008-08-26moved global variable "pc" to player.hMax Kellermann1-0/+1
This is the last of the three variables. Now we don't need playerData.h anymore in most sources.
2008-08-26moved variable "dc" to decode.hMax Kellermann1-6/+7
Now that "dc" is available here, we don't have to pass it to decoder_is_idle() and decoder_is_starting() anymore.
2008-08-26player_thread: removed decode(), renamed decodeParent()Max Kellermann1-15/+4
decode() is a trivial wrapper for decodeParent(). Merge both and rename them to do_play().
2008-08-26hide DecoderControl accesses in inline functionsMax Kellermann1-10/+6
Unfortunately, we have to pass the DecoderControl pointer to these inline functions, because the global variable "dc" may not be available here. This will be fixed later.
2008-08-26check for decoder error before state!=STARTMax Kellermann1-9/+8
When dc->error!=NOERROR, we do not need to check state!=START. Simplify the checks by moving the error check to the top.
2008-08-26don't reset dc->command in quitDecode()Max Kellermann1-1/+0
The decoder thread is responsible for resetting dc->command after a command was executed. As a consequence, we can assume that dc->command is already NONE after decoder_stop().
2008-08-26added decoder_control.cMax Kellermann1-50/+17
The source "decoder_control.c" provides an API for controlling the decoder. This replaces various direct accesses to the DecoderControl struct.
2008-08-26fix a comment regarding the player queueMax Kellermann1-1/+1
2008-08-26rewrote playerKill()Max Kellermann1-0/+8
playerKill() was marked as deprecated, but it seems like a good idea to do proper cleanup in all threads (e.g. for usable valgrind results). Introduce the command "EXIT" which makes the player thread exit cleanly.
2008-08-26player: don't call STOP before CLOSE_AUDIOMax Kellermann1-1/+2
playerWait() stops the player thread (twice!) and closes the output device. It should be well enough to just send CLOSE_AUDIO, without STOP. This requires a tiny change to the player thread code: make it break when CLOSE_AUDIO is sent.
2008-08-26assert song->url != NULLMax Kellermann1-0/+4