aboutsummaryrefslogtreecommitdiffstats
path: root/src/playlist.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* playlist: pass const pointers to search functionsMax Kellermann2009-01-231-15/+11
| | | | The LocateTagItem objects are not modified.
* playlist: removed swapSongs()Max Kellermann2009-01-231-8/+4
| | | | swapSongs() is only a wrapper for queue_swap().
* playlist: don't unpause on deleteMax Kellermann2009-01-231-1/+3
| | | | | When you delete a song from the playlist which was paused, MPD forgot that it was paused and started playing the next song.
* playlist: added source commentsMax Kellermann2009-01-231-4/+143
| | | | | | The playlist.c source is currently quite hard to understand. I have managed to wrap my head around it, and this patch attempts to explain it to the next guy.
* playlist: assert in playPlaylistIfPlayerStopped()Max Kellermann2009-01-231-15/+15
| | | | | | The function playPlaylistIfPlayerStopped() is only called when the player thread is stopped. Converted that runtime check into an assertion, and remove one indent level.
* playlist: don't shuffle if not in random modeMax Kellermann2009-01-231-1/+1
| | | | | | One of the previous patches removed the "random" mode check from nextSongInPlaylist(), which caused a shuffle whenever MPD wrapped to the first song in "repeat" mode. Re-add that "random" check.
* playlist: removed unreachable "playing" checkMax Kellermann2009-01-231-11/+7
| | | | | | In playPlaylist(), the second "song==-1 && playing" check can never be reached, because at this point, the function has already returned (after unpausing).
* playlist: removed stopOnError flag from playPlaylist()Max Kellermann2009-01-231-6/+6
| | | | All callers pass false. Don't bother to collect that parameter.
* playlist: restart playing in deleteFromPlaylist()Max Kellermann2009-01-231-22/+9
| | | | | | When a song is deleted, start playing the next song immediately, within deleteFromPlaylist(). This allows us to remove the ugly playlist_noGoToNext flag, and the currentSongInPlaylist() function.
* playlist: calculate next song before deleting the current oneMax Kellermann2009-01-231-11/+5
| | | | | | | By calling queue_next_order() before playlist.current is invalidated (by the deletion of a song), we get more robust results, and the code becomes a little bit easier. incrPlaylistCurrent() is unused now, and can be removed.
* playlist: return early from shufflePlaylist()Max Kellermann2009-01-231-23/+24
| | | | | Remove one indent level by returning diretly after the check. This makes the function more readable.
* playlist: replaced playlist_state with flag playlist.playingMax Kellermann2009-01-231-33/+26
| | | | | | There were only two possible states: STOP and PLAY. The code looks a lot easier if we use a bool instead. Move the variable into the playlist struct.
* queue: added queue_shuffle_order()Max Kellermann2009-01-231-35/+35
| | | | | | | | | | | The function shuffles the virtual order of songs, but does not move them physically. This is used in random mode. The new function replaces playlist.c's randomizeOrder() function, which was aware of playlist.current and playlist.queued. The latter is always -1 anyway, and the former as preserved by the caller, by converting playlist.current to a position, and then back to an order number.
* playlist: check if repeat mode changesMax Kellermann2009-01-231-1/+4
| | | | | | Add a "changed" check to setPlaylistRepeatStatus(): when the new repeat mode is the same as the old one, don't do anything at all. No more checks, no "idle" event.
* playlist: recalculate the queued song after random is toggledMax Kellermann2009-01-231-0/+3
| | | | | | When the random mode is toggled, MPD did not clear the queue. Because of this, MPD continued with the next (random or non-random) song according to the previous mode. Clear the queued song to fix that.
* playlist: moved code to playlist_queue_song_order()Max Kellermann2009-01-231-23/+20
| | | | Merged duplicate code from queueNextSongInPlaylist().
* playlist: moved code to queue.cMax Kellermann2009-01-221-347/+191
| | | | | Attempt to untie the playlist.c knot: moved the playlist storage code to queue.c, struct queue.
* playlist: corrected shuffle underflow testMax Kellermann2009-01-221-2/+2
| | | | Check for current>=0, not queued>=0.
* playlist: fix buffer underflow when getting current songMax Kellermann2009-01-221-7/+10
| | | | | | The function moveSongInPlaylist() attempted to read the position of the current song, even if it was -1. Check that first. The same bug was in shufflePlaylist().
* playlist: convert assertion to check in TAG event handlerMax Kellermann2009-01-211-2/+3
| | | | | | It is possible that playlist.current is reset before the TAG event handler playlist_tag_event() is called. Convert the assertion into a run-time check.
* command: don't restart player in the "status" commandMax Kellermann2009-01-211-1/+3
| | | | | | Don't attempt to restart the player if it was stopped, but there were still songs left on the playlist. This looks like it has been a workaround for a bug which has been fixed long time ago.
* playlist: use the "enum player_error" typeMax Kellermann2009-01-211-1/+1
| | | | Don't assign the result of getPlayerError() to an integer.
* playlist: free memory with g_free()Max Kellermann2009-01-211-10/+5
| | | | | Use g_free() consistently with g_malloc(). Don't clear the pointers after freeing them.
* use config_get_positive() instead of manual parsingMax Kellermann2009-01-211-12/+3
| | | | | Simplify some code by using config_get_positive(), instead of doing manual parsing and validation each time.
* event_pipe: added "TAG" eventMax Kellermann2009-01-201-28/+18
| | | | | | The "TAG" event is emitted by the player thread when the current song's tag has changed. Split this event from "PLAYLIST" and make it a separate callback, which is more efficient.
* mapper: make the playlist directory optionalMax Kellermann2009-01-181-0/+3
|
* conf: use config_get_bool() instead of getBoolConfigParam()Max Kellermann2009-01-171-7/+3
|
* conf: no CamelCase, part IMax Kellermann2009-01-171-2/+2
| | | | Renamed functions, types, variables.
* playlist: don't store getBoolConfigParam() in a boolMax Kellermann2009-01-161-3/+5
| | | | | | getBoolConfigParam() returns an int. It is not possible to check for CONF_BOOL_UNSET after it has been assigned to a bool; use a temporary int value for that.
* playlist: safely search the playlist for deleted songMax Kellermann2009-01-141-1/+1
| | | | | | | | When a song file is deleted during database update, all pointers to it must be removed from the playlist. The "for" loop in deleteASongFromPlaylist() did not deal with multiple copies of the deleted song properly, and left instances of the (to-be-invalidated) pointer in. Fix this by reversing the loop.
* playlist: implement Fisher-Yates shuffle properlyMax Kellermann2009-01-131-2/+2
| | | | | | | | MPD's shuffling algorithm was not implemented well: it considers songs which were already swapped, making it somewhat non-random. Fix the Fisher-Yates shuffle algorithm by passing the proper bounds to the PRNG.
* playlist: pass unsigned integers to playlistInfo()Max Kellermann2009-01-101-14/+6
| | | | | A song index cannot be negative. Also require the second parameter to be valid.
* playlist: exclude end of rangeMax Kellermann2009-01-101-1/+1
| | | | | In a range "start:end", "end" itself should not be included. Use the same semantics as other languages implementing ranges, e.g. Python.
* command: playlistinfo now uses a range argument rather than just a song idThomas Jansen2009-01-101-1/+6
| | | | | | | | | | | | | Loosely based on a patch provided by lesion in bug #1766. The playlistinfo command can now retrieve ranges of the playlist. The new argument indicates which entry is the last one that will be displayed. The number of displayed entries may be smaller than expected if the end of the playlist is reached. Previous usage: playlistinfo [start] New usage: playlistinfo [start[:end]]
* song: allocate the result of song_get_url()Max Kellermann2009-01-041-24/+28
|
* playlist: log errors during loadPlaylist()Max Kellermann2009-01-041-3/+2
| | | | | | Don't call command_error() if loading a song from the playlist fails. This may result in assertion failures, since command_error() may be called more than once.
* playlist: use GLib loggingMax Kellermann2009-01-041-21/+19
|
* playlist: use uri_has_scheme() instead of isRemoteUrl()Max Kellermann2009-01-041-1/+1
| | | | | | For internal checks (i.e. not in command.c), we need to check whether an URI is in the databse, in the local file system or a remote URI with a scheme.
* state_file: errors are non-fatal in read_state_file()Max Kellermann2009-01-031-12/+20
| | | | | If the state file cannot be read, for whatever reason, don't abort MPD. The state file isn't _that_ important.
* list: removed linked list libraryMax Kellermann2009-01-021-1/+0
| | | | It's been superseded by GLib's GSList.
* playlist: use GLib instead of utils.hMax Kellermann2009-01-021-11/+15
|
* playlist: use g_file_test() instead of stat()Max Kellermann2009-01-011-2/+1
| | | | | To find out whether a file exists, use g_file_test() instead of stat(), because it is more portable and easier to use.
* mapper: allocate playlist path from heapMax Kellermann2009-01-011-4/+6
| | | | Don't pass a static buffer to map_spl_utf8_to_fs().
* command: don't allow adding local files on WIN32Max Kellermann2008-12-301-0/+2
| | | | | | There are no unix sockets on WIN32, and therefore no authentication. WIN32 might have similar capabilities, but until we implement them, disable that MPD feature.
* playlist: use GLib's random number generatorMax Kellermann2008-12-301-7/+10
| | | | srandom() and random() are not portable. Use GLib's implementation.
* removed os_compat.hMax Kellermann2008-12-291-1/+6
| | | | | Only include headers which are really needed. os_compat.h aimed to make MPD easily portable, but was never actually made portable.
* utils: removed myFgets()Max Kellermann2008-12-281-4/+9
| | | | Replaced myFgets() with fgets() + g_strchomp().
* playlist: clear pc.errored_song on deleteMax Kellermann2008-12-171-2/+8
| | | | | When a (remote) song is deleted from the playlist, there may still be a reference to it in pc.errored_song. Clear this reference.
* ls: removed isValidRemoteUtf8Url()Max Kellermann2008-12-161-1/+1
| | | | | The function didn't do anything useful, it was just several lines obfuscating that it was only forwarding isRemoteUrl()'s return value.
* playlist: call clearPlayerQueue() only if song is queued IIMax Kellermann2008-11-121-14/+10
| | | | | This patch extends commit 35a16b99, and amends several 2 missing checks. It simplifies 2 more checks by merging "if" conditions.