aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* player: added some more assertionsMax Kellermann2009-02-102-0/+4
| | | | Assertions on pc.command and pc.next_song.
* player_thread: reset pc.next_song only if queuedMax Kellermann2009-02-101-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.
* playlist: update queued song after seekingMax Kellermann2009-02-101-3/+7
| | | | | | | | If a new song is queued before calling playerSeek(), then the player and the playlist enter an inconsistent state, because the player discards the playlist's "queued" song in favor of the seeked song. Call playlist_update_queued_song() after playerSeek().
* player_thread: reset pc.next_songMax Kellermann2009-02-101-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.
* queue: update order array after song moveMax Kellermann2009-02-091-0/+14
| | | | | | | Commit f78cddb4 introduced a regression: after a song was moved, the order array was not updated (in random mode). This caused MPD to think the "current" song has changed when you moved something to the position of the current song.
* configure.ac: define HAVE_FFMPEG after all checksMax Kellermann2009-02-092-2/+7
| | | | | | Don't define HAVE_FFMPEG if the ffmpeg libraries were found via pkg-config, but ffmpeg support was disabled because avcodec_decode_audio2() is not available.
* playlist: fixed "next song" checkVladimir S Eremin2009-02-091-3/+2
| | | | Check if the "current+1" position is actually valid.
* output_api: include "config.h" without "../"Max Kellermann2009-02-091-1/+1
| | | | Including "../config.h" breaks on some systems.
* shout: clear buffer before calling the encoderMax Kellermann2009-02-094-18/+15
| | | | | | | Always assume the buffer is empty before calling the encoder. Always flush the buffer immediately after there has been added something. This reduces the risk of buffer overruns, because there will never be a "rest" in the current buffer.
* shout: don't postpone metadataMax Kellermann2009-02-094-34/+15
| | | | | Don't duplicate the tag received by the send_metadata() method - send it to the shout server directly.
* shout: use libshout's synchronizationMax Kellermann2009-02-093-24/+5
| | | | | Removed the manual timer synchronization from the shout plugin. libshout's shout_sync() function does it for us.
* shout: switch to blocking modeMax Kellermann2009-02-093-77/+8
| | | | | | The non-blocking mode of libshout is sparsely documented, and MPD's implementation had several bugs. Also removed connect throttling code, that is done by the MPD core since 0.14.
* shout: removed shout_data.tag_to_sendMax Kellermann2009-02-092-9/+6
| | | | | When shout_data.tag!=NULL, there is a "tag to send". The tag_to_send flag is redundant.
* shout: removed shout_data.shout_errorMax Kellermann2009-02-092-4/+0
| | | | That variable is set in handle_shout_error(), but is never read.
* playlist: provide information about "next song"Vladimir S Eremin2009-02-093-0/+27
| | | | | In random mode, this patch allows clients to see the "next song" in the queue.
* playlist: increase playlist version after loading stateMax Kellermann2009-02-041-0/+2
| | | | | | After the state file has been loaded, the playlist version is still "1", and "plchanges 1" returns the whole playlist. Fix this by increasing the playlist version after the state file has been loaded.
* update: check whether stickers are enabledMax Kellermann2009-02-041-1/+3
| | | | | If stickers are not configured at runtime, don't call sticker_song_delete().
* playlist_save: added spl_save_playlist()Max Kellermann2009-02-043-1/+13
| | | | spl_save_playlist() is a wrapper for spl_save_queue().
* playlist: added G_LOG_DOMAINMax Kellermann2009-02-042-4/+11
| | | | Removed the explicit "playlist:" prefix from all log messages.
* playlist_print: added wrappers for printing the queueMax Kellermann2009-02-043-31/+164
| | | | Hide the details of the playlist behind wrapper functions.
* playlist: pass const playlist pointersMax Kellermann2009-02-042-15/+12
| | | | Pass constant playlist objects to functions which do not modify it.
* playlist_print: added API documentationMax Kellermann2009-02-041-0/+8
|
* playlist_print: use bool instead of intMax Kellermann2009-02-043-16/+22
| | | | | Return true on success, instead of 0. Converted the "detail" parameter to bool.
* playlist_print: no CamelCaseMax Kellermann2009-02-043-5/+6
| | | | Renamed one function.
* playlist_print: include cleanupMax Kellermann2009-02-041-4/+1
|
* playlist: moved code to playlist_edit.cMax Kellermann2009-02-043-369/+394
| | | | | Moved functions for playlist editing (append, delete, shuffle, move) to playlist_edit.c.
* playlist: moved code to playlist_control.cMax Kellermann2009-02-044-241/+306
| | | | | Moved handlers for control commands (play, stop, next, prev) to playlist_control.c.
* playlist: call syncPlaylistWithQueue() only in the event handlerMax Kellermann2009-02-041-4/+0
| | | | | | Don't call syncPlaylistWithQueue() in nextSongInPlaylist() and previousSongInPlaylist(). This is a relic from the time when there was no event, and was a workaround to the timing problem.
* playlist: renamed global "playlist" variable to "g_playlist"Max Kellermann2009-02-0411-391/+494
| | | | | | | Export the "g_playlist" variable, and pass it to all playlist functions. This way, we can split playlist.c easier into separate parts. The code which initializes the singleton variable is moved to playlist_global.c.
* playlist: moved code to playlist_state.cMax Kellermann2009-02-044-134/+217
| | | | | Moved everything related to saving or loading the playlist from/to the state file to playlist_state.c.
* playlist: simplified playlist.queued updatesMax Kellermann2009-02-041-117/+111
| | | | | | | | | Before every operation which modifies the playlist, remember a pointer to the song struct. After the modification, determine the "next song" again, and if it differs, dequeue and queue the new song. This removes a lot of complexity from the playlist update code, and makes it more robust.
* configure.ac: raised protocol version to "0.15.0"Max Kellermann2009-02-041-1/+1
| | | | | The protocol has been extended since MPD 0.14: playlist ranges, stickers. About time to give the protocol a new version number!
* configure.ac: make DocBook processing optionalMax Kellermann2009-02-042-8/+13
| | | | | Disable the HTML documentation generator by default. Most users will pick it from the web site.
* ffmpeg: fixed seek integer overflowMax Kellermann2009-02-032-3/+5
| | | | | | | The "current" variable is used for calculating the seek destination, and was declared as "int". With very long song files, the 32 bit integer can overflow. ffmpeg expects an int64_t, which is very unlikely to overflow. Switch to int64_t.
* ffmpeg: check if the time stamp is validMax Kellermann2009-02-032-4/+6
| | | | | | When ffmpeg cannot estimate the elapsed time, it sets AVPacket.pts=AV_NOPTS_VALUE. Our ffmpeg decoder plugin did not check for that special value.
* ffmpeg: don't warn of empty packet outputMax Kellermann2009-02-032-3/+3
| | | | | | If avcodec_decode_audio2() returns no output for an AVPacket, libavcodec may buffer some data, and return a larger chunk of output later. This patch disables a lot of bogus warnings.
* ffmpeg: print codec nameMax Kellermann2009-02-031-0/+3
| | | | | | Output the name of the codec as a debug message. During my tests, ffmpeg never filled this struct member, but it may do so in the past, and this debug message might become helpful.
* shout_mp3: call lame_close() in clear_encoder() methodMax Kellermann2009-02-022-2/+7
| | | | | | | | | | The shout_mp3 encoder had two bugs: when no song was ever played, MPD segfaulted during cleanup. Second bug: memory leak, each time the shout device was opened, lame_init() was called again, and lame_close() is only called once during shutdown. Fix this by shutting down LAME each time the clear_encoder() method is called.
* shout_mp3: free the lame_data struct on exitMax Kellermann2009-02-021-0/+2
| | | | | Make valgrind a little bit happier: free the global lame_data struct in the finish() method.
* player_thread: set player error when output device failsMax Kellermann2009-02-022-1/+5
| | | | | | 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.
* main: don't pass argv[0] to openDB()Max Kellermann2009-02-021-6/+4
| | | | Don't mention the program name in the error message.
* main: create database after daemonizationMax Kellermann2009-02-021-8/+29
| | | | | | | When the update thread is started before MPD has forked (for daemonization), it is killed, because threads do not survive a fork(). This induces an inconsistent state where MPD won't start any update thread at all, because it thinks the thread is already running.
* output_api: moved the command check out of method pause()Max Kellermann2009-01-304-24/+18
| | | | | | Move the "while" loop which checks for commands to the caller ao_pause(). This simplifies the pause() method, and lets us remove audio_output_is_pending().
* playlist: clear playlist.playing when deleting current songMax Kellermann2009-01-301-0/+1
| | | | | This fixes an assertion failure: when the last song in the playlist was playing, and you deleted it, MPD aborted.
* output_api: removed DISABLED_AUDIO_OUTPUT_PLUGINMax Kellermann2009-01-301-2/+0
| | | | The macro is unused.
* output_api: removed audio_output_closed()Max Kellermann2009-01-303-10/+0
| | | | | The function is only used by the MVP output plugin, and this one call is wrong.
* jack: don't override output_ports in connect()Max Kellermann2009-01-301-10/+22
| | | | | | If no ports are configured, don't overwrite the (NULL) configuration with the port names of the first JACK server. If the server changes after a JACK reconnect, MPD won't attempt to auto-detect again.
* jack: removed sample_rate callbackMax Kellermann2009-01-301-20/+7
| | | | | | | | | | | Currently, the JACK plugin manipulates the audio_format struct which was passed to the open() method. This is very likely to break, because the plugin must not permanently store this pointer. After this patch, MPD ignores sample rate changes. It looks like other software is doing the same, and I guess this is a non-issue. This patch converts the audio_format pointer within jack_data into a static audio_format struct.
* configure.ac: detect jack_set_info_function()Max Kellermann2009-01-302-0/+15
| | | | | jack_set_info_function() is not provided by older libjack versions. Attempt to detect if it is available.
* mikmod: call MikMod_Exit() only in the finish() methodMatthias Drochner2009-01-302-6/+1
| | | | | | | | | | | | | | | Hi - independently of libmikmod's other problems - there seems to be a problem in mpd's wrapper: MikMod_Exit() is called after the first file is decoded, which frees some ressources within the mikmod library. An attempt to play a second file leads to a crash. The appended patch fixes this for me. (I don't know what the "dup" entry is good for - someone who knows should review that too.) best regards Matthias [mk: removed 3 more MikMod_Exit() invocations]