aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-23 16:22:38 +0100
committerMax Kellermann <max@duempel.org>2009-01-23 16:22:38 +0100
commit3a86a6ca169e987490f94883b7d5be1a9a1f1b3d (patch)
treea29b1fbb949d20146814e8a036e86bbc858e7f00
parent276843edd5033e6dd4a708d3a8bbc29a6bfafc92 (diff)
downloadmpd-3a86a6ca169e987490f94883b7d5be1a9a1f1b3d.tar.gz
mpd-3a86a6ca169e987490f94883b7d5be1a9a1f1b3d.tar.xz
mpd-3a86a6ca169e987490f94883b7d5be1a9a1f1b3d.zip
playlist: removed swapSongs()
swapSongs() is only a wrapper for queue_swap().
-rw-r--r--src/playlist.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/playlist.c b/src/playlist.c
index 49e5cc672..0c9dfa44a 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -380,11 +380,6 @@ enum playlist_result playlistId(struct client *client, int id)
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.
*/
@@ -593,7 +588,7 @@ enum playlist_result swapSongsInPlaylist(unsigned song1, unsigned song2)
clearPlayerQueue();
}
- swapSongs(song1, song2);
+ queue_swap(&playlist.queue, song1, song2);
if (playlist.queue.random) {
/* update the queue order, so that playlist.current
@@ -1119,8 +1114,9 @@ void shufflePlaylist(void)
if (playlist.current >= 0)
/* put current playing song first */
- swapSongs(0, queue_order_to_position(&playlist.queue,
- playlist.current));
+ queue_swap(&playlist.queue, 0,
+ queue_order_to_position(&playlist.queue,
+ playlist.current));
if (playlist.queue.random) {
playlist.current =