playlist: simplified setPlaylistRandomStatus()

Check the old status before assigning. This saves a temporary variable.

playlist: simplified setPlaylistRandomStatus()
4a510a26 · Max Kellermann · b084bc28 · 4a510a26
Commit 4a510a26 authored Oct 08, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 16 deletions

playlist.c src/playlist.c +15 -16

No files found.
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1152,25 +1152,24 @@ static void randomizeOrder(int start, int end)
 void setPlaylistRandomStatus(bool status)
 {
-	bool statusWas = playlist.random;
+	if (status == playlist.random)
+		return;
 	playlist.random = status;
-	if (status != statusWas) {
+	if (playlist.random) {
-		if (playlist.random) {
+		/*if(playlist_state==PLAYLIST_STATE_PLAY) {
-			/*if(playlist_state==PLAYLIST_STATE_PLAY) {
+		  randomizeOrder(playlist.current+1,
-			   randomizeOrder(playlist.current+1,
+		  playlist.length-1);
-			   playlist.length-1);
+		  }
-			   }
+		  else */ randomizeOrder(0, playlist.length - 1);
-			   else */ randomizeOrder(0, playlist.length - 1);
+		if (playlist.current >= 0 &&
-			if (playlist.current >= 0 &&
+		    playlist.current < playlist.length) {
-			    playlist.current < playlist.length) {
+			swapOrder(playlist.current, 0);
-				swapOrder(playlist.current, 0);
+			playlist.current = 0;
-				playlist.current = 0;
+		}
-			}
+	} else
-		} else
+		orderPlaylist();
-			orderPlaylist();
-	}
 }
 void previousSongInPlaylist(void)