Skip to content

M
mpd
Commit 3a86a6ca authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

playlist: removed swapSongs()

swapSongs() is only a wrapper for queue_swap().
parent 276843ed
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
src/playlist.c
View file @ 3a86a6ca
...@@ -380,11 +380,6 @@ enum playlist_result playlistId(struct client *client, int id) ...@@ -380,11 +380,6 @@ enum playlist_result playlistId(struct client *client, int id)
return PLAYLIST_RESULT_SUCCESS; return PLAYLIST_RESULT_SUCCESS;
} }
static void swapSongs(unsigned song1, unsigned song2)
{
queue_swap(&playlist.queue, song1, song2);
}
/** /**
* Queue a song, addressed by its order number. * Queue a song, addressed by its order number.
*/ */
...@@ -593,7 +588,7 @@ enum playlist_result swapSongsInPlaylist(unsigned song1, unsigned song2) ...@@ -593,7 +588,7 @@ enum playlist_result swapSongsInPlaylist(unsigned song1, unsigned song2)
clearPlayerQueue(); clearPlayerQueue();
} }
swapSongs(song1, song2); queue_swap(&playlist.queue, song1, song2);
if (playlist.queue.random) { if (playlist.queue.random) {
/* update the queue order, so that playlist.current /* update the queue order, so that playlist.current
...@@ -1119,8 +1114,9 @@ void shufflePlaylist(void) ...@@ -1119,8 +1114,9 @@ void shufflePlaylist(void)
if (playlist.current >= 0) if (playlist.current >= 0)
/* put current playing song first */ /* put current playing song first */
swapSongs(0, queue_order_to_position(&playlist.queue, queue_swap(&playlist.queue, 0,
playlist.current)); queue_order_to_position(&playlist.queue,
playlist.current));
if (playlist.queue.random) { if (playlist.queue.random) {
playlist.current = playlist.current =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment