aboutsummaryrefslogtreecommitdiffstats
path: root/src/playlist.c (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.
* 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.
* playlist: moved is_valid_playlist_name() to stored_playlist.cMax Kellermann2009-01-251-16/+0
|
* playlist: moved savePlaylist() and loadPlaylsit() to playlist_save.cMax Kellermann2009-01-251-61/+0
|
* playlist: removed g_rand, PLAYLIST_HASH_MULTMax Kellermann2009-01-251-10/+0
| | | | Both are unused.
* queue: added queue_shuffle_order_last()Max Kellermann2009-01-251-6/+3
| | | | | This function shuffles the last song of a range. This is used by addSongToPlaylist().
* stored_playlist: moved configuration variables from playlist.cMax Kellermann2009-01-251-14/+3
| | | | | Don't declare and export variables specific to stored playlists in playlist.c/playlist.h.
* playlist: removed locate functions to queue_print.cMax Kellermann2009-01-241-33/+0
| | | | Now playlist.c does not contain any protocol specific code anymore.
* locate: renamed LocateTagItem to "struct locate_item"Max Kellermann2009-01-241-4/+5
| | | | No CamelCase and no typedefs.
* command: use queue_print_*()Max Kellermann2009-01-241-48/+0
| | | | | Replaced several wrapper functions from playlist.c, and make command.c use the queue print functions directly.
* playlist: added playlist_get_queue()Max Kellermann2009-01-241-0/+6
| | | | | To allow code outside playlist.c to access the "queue" object, provide a function which returns a const pointer.
* playlist: renamed the Playlist typedef to "struct playlist"Max Kellermann2009-01-241-1/+1
| | | | No typedefs.
* playlist: moved stopOnError and errorCount into struct playlistMax Kellermann2009-01-241-11/+9
| | | | Moved the 2 remaining global variables into the playlist struct.
* playlist: restore random mode after playlist is loadedMax Kellermann2009-01-231-8/+6
| | | | | | | When the playlist was loaded from the state file, the order numbers were the same as the positions. In random mode, we need to shuffle the queue order. To accomplish that, call setPlaylistRandomStatus() at the end of readPlaylistState(), and do a fresh shuffle.
* playlist: removed song_id_to_position()Max Kellermann2009-01-231-12/+7
| | | | song_id_to_position() is only a wrapper for queue_id_to_position().
* playlist: fix "clear" crash in random modeMax Kellermann2009-01-231-0/+5
| | | | | | | When MPD is not playing while in random mode, and the client issues the "clear" command, MPD crashes in stopPlaylist(), or more exactly, in queue_order_to_position(-1). Exit from stopPlaylist() if MPD isn't playing.
* playlist: moved saving/loading code to queue_save.cMax Kellermann2009-01-231-26/+4
| | | | | Create a new library which saves/loads the queue to/from the state file.
* playlist: moved PlaylistInfo() to playlist_print.cMax Kellermann2009-01-231-30/+0
| | | | | | PlaylistInfo() (notice the capital 'P') sends a stored playlist to the client. Move it to a separate library, where all the code which glues the playlist and the MPD protocol together will live.
* playlist: moved some printing code to queue_print.cMax Kellermann2009-01-231-32/+9
| | | | | Moved protocol printing functions which operate on the queue to queue_print.c.
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 20:17:27 +0000