From 3a86a6ca169e987490f94883b7d5be1a9a1f1b3d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 23 Jan 2009 16:22:38 +0100 Subject: playlist: removed swapSongs() swapSongs() is only a wrapper for queue_swap(). --- src/playlist.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/playlist.c') 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 = -- cgit v1.2.3