aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* 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.
* ffmpeg: fixed seek integer overflowMax Kellermann2009-02-031-3/+4
| | | | | | | 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-031-4/+5
| | | | | | 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-031-3/+2
| | | | | | 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-021-2/+6
| | | | | | | | | | 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-021-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.
* 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-301-0/+5
| | | | | 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-301-6/+0
| | | | | | | | | | | | | | | 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]
* wavpack: pass NULL if the .wvc file fails to openMax Kellermann2009-01-301-1/+3
| | | | | | The wavpack library seems to use the .wvc stream even if the OPEN_WVC flag is not set. In this case, pass NULL to be sure libwavpack won't use it.
* jack: print info messagesMax Kellermann2009-01-301-0/+7
| | | | | Use jack_set_info_function() to install an info callback. Don't let libjack print them to stderr.
* client: check for G_IO_ERR and G_IO_HUPMax Kellermann2009-01-301-8/+19
| | | | | | When we do not explicitly catch G_IO_ERR and G_IO_HUP, GLib can go into an infinite loop, because it won't deliver the socket error to MPD.
* mapper: ignore duplicate slashes in playlistsMax Kellermann2009-01-301-0/+3
| | | | | | | | | | | | | | When there are duplicate slashes in the song paths, eliminate them; example: /var/lib/mpd/music//foo.mp3 becomes: /var/lib/mpd/music/foo.mp3 The slash is only detected at the border between the music_directory and the local part.
* mapper: remove trailing slashes from music_directoryMax Kellermann2009-01-301-1/+15
| | | | | | When the user configures a music_directory with a trailing slash, it may break playlist loading, because MPD expects a double slash. Chop off the trailing slash.
* ffmeg: added support for the tags comment, genre, yearDavid Horn2009-01-301-0/+10
| | | | | | | | | | | | ffmpeg_tag_internal() does not look for a few tags that mpd supports. Most noteably: comment -> TAG_ITEM_COMMENT -> Description genre -> TAG_ITEM_GENRE -> WM/Genre (not WM/GenreID) year -> TAG_ITEM_DATE -> WM/Year I *think* that this is the last of the tags that AVFormatContext() in ffmpeg supports that mpd also uses.
* input_stream: make seek(), buffer() optionalMax Kellermann2009-01-305-44/+7
| | | | | | Make those two methods optional to implement, and let input_stream.c provide fallbacks. The buffer() method will be removed one day, and there is now only one implementation left (input_curl.c).
* archive: replaced setup_stream() with open_stream()Max Kellermann2009-01-307-135/+37
| | | | | | | The open_stream() method opens the input_stream. This allows the archive plugin to do its own initialization, and it also allows it to use input_stream.data. We can remove input_stream.archive now, which was unnatural to have in the first place.
* input_stream: let the implementation assign is->pluginMax Kellermann2009-01-304-1/+10
| | | | This way, plugins can manipulate the plugin pointer during open().
* input_stream: documented the APIMax Kellermann2009-01-301-9/+83
|
* jack: don't manually close on shutdownMax Kellermann2009-01-291-3/+1
| | | | Return false from mpd_jack_play(), let the MPD core close the device.
* jack: initialize output_ports if not configuredMax Kellermann2009-01-291-0/+3
| | | | Don't leave uninitialized bytes in the jack_data struct.
* jack: close JACK client on stopMax Kellermann2009-01-291-4/+4
| | | | When MPD stops playback, close the JACK client connection.
* jack: removed "bps" attributeMax Kellermann2009-01-291-5/+1
| | | | The "bps" attribute is calculated, but never used.
* jack: make mpd_jack_connect() return boolMax Kellermann2009-01-291-10/+10
| | | | Return true/false instead of 1/-1.
* jack: use loops for allocating/freeing ports/buffersMax Kellermann2009-01-291-36/+32
| | | | | | | Preparation for supporting other channel numbers than stereo: use loops instead of duplicating code for the second channel. Most likely, gcc will unroll these loops, so the binary won't be any different.
* jack: fail if jack_get_ports() returns NULLMax Kellermann2009-01-291-19/+23
| | | | | When jack_get_ports() returns NULL, we cannot have any ports to connect to, and the device cannot play anything.
* jack: use jack_port_name() instead of g_malloc()+sprintf()Max Kellermann2009-01-291-12/+2
| | | | | libjack's jack_port_name() function returns the effective port name, we don't need to do it manually.
* jack: initialize libjack's error function in mpd_jack_init()Max Kellermann2009-01-291-1/+2
| | | | | Do the global libjack initialization in the global plugin initialization function.
* mms: declare GLib log domainMax Kellermann2009-01-291-0/+3
|
* added support for the MMS protocolMax Kellermann2009-01-295-0/+164
| | | | | | | This patch implements the MMS protocol, by using libmms. It is quite experimental: it does not support seeking yet, and it is currently using synchronous I/O, which causes MPD to hang while waiting for the server.
* player_control: reset pc.error if pc.errored_song is clearedMax Kellermann2009-01-291-1/+3
| | | | | | When the playlist is cleared, pc.errored_song is also cleared. This causes pc_errored_song_uri() to crash, because it assumes that pc.errored_song is set. Reset pc.error to fix that assumption.
* jack: reduced sleep time to 1msMax Kellermann2009-01-291-1/+1
| | | | | | | | | | When waiting for free space in the ring buffer, the JACK plugin sleeped 10ms until there is enough space. This delay was too large for low-latency setups (<10ms), and created a lot of xruns. Work around that by reducing the sleep time to 1ms. A proper solution for this would be to use an event based approach, and we will do it, just not now.
* jack: clear "shutdown" flag on reconnectMax Kellermann2009-01-291-0/+2
| | | | | | | When the connection failed once, you had to restart MPD, because it never cleared the jack_data.shutdown flag. Instead, it refused to play anything "because there is no client thread" (which is wrong at that point).
* jack: allocate ring buffers before connectingMax Kellermann2009-01-291-5/+3
| | | | | If the ring buffers are allocated after jack_activate(), mpd_jack_process() might segfault because it attempts to access them.
* jack: register ports before activating clientsMax Kellermann2009-01-291-5/+5
| | | | Call jack_port_register() before jack_activate().
* zeroconf: corrected default service name usageMax Kellermann2009-01-271-2/+2
| | | | | The variable "serviceName" is initialized with SERVICE_NAME, but was overwritten with NULL when the setting is not configured.
* client: use the GIOChannel for I/OMax Kellermann2009-01-251-40/+110
| | | | | | | | | GIOChannel is more portable than raw read()/write() calls. We're using GIOChannel anyway, because we need it for plugging the client into the GLib main loop. Configure the GIOChannel to the bare minimum: no character set, no buffering.
* client: use GLib's win32 IO channel on WIN32Max Kellermann2009-01-251-0/+5
| | | | | Use g_io_channel_win32_new_socket() instead of g_io_channel_unix_new() on WIN32.
* tag: remove unused variable paramLaszlo Ashin2009-01-251-3/+2
| | | | This variable doesn't have a role since 80799fa8.
* database: eliminate "goto" usageMax Kellermann2009-01-251-7/+8
| | | | http://xkcd.com/292/
* use g_free() instead of free()Max Kellermann2009-01-2518-40/+36
| | | | | | On some platforms, g_free() must be used for memory allocated by GLib. This patch intends to correct a lot of occurrences, but is probably not complete.