? Slim/Buttons/Input/Time.pm
Index: Slim/Music/MoodLogic.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Music/MoodLogic.pm,v
retrieving revision 1.19
diff -u -p -B -r1.19 MoodLogic.pm
--- Slim/Music/MoodLogic.pm	20 May 2004 04:14:00 -0000	1.19
+++ Slim/Music/MoodLogic.pm	30 Jun 2004 04:56:20 -0000
@@ -445,7 +445,7 @@ sub getMix {
 	$count = $mixer->Mix_PlaylistSongCount();
 
 	for (my $i=1; $i<=$count; $i++) {
-		push @instant_mix, $mixer->Mix_SongFile($i);
+		push @instant_mix, Slim::Utils::Misc::fileURLFromPath($mixer->Mix_SongFile($i));
 	}
 
 	return @instant_mix;
Index: Slim/Buttons/MoodWheel.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Buttons/MoodWheel.pm,v
retrieving revision 1.4
diff -u -p -B -r1.4 MoodWheel.pm
--- Slim/Buttons/MoodWheel.pm	22 Apr 2004 05:47:10 -0000	1.4
+++ Slim/Buttons/MoodWheel.pm	30 Jun 2004 04:56:20 -0000
@@ -55,11 +55,7 @@ my %functions = (
 		my @oldlines = Slim::Display::Display::curLines($client);
 		Slim::Buttons::Common::pushMode($client, 'moodlogic_variety_combo', {'genre' => Slim::Buttons::Common::param($client, 'genre'), 'artist' => Slim::Buttons::Common::param($client, 'artist'), 'mood' => $browseMoodChoices[selection($client, 'mood_wheel_index')]});
 		
-		if (Slim::Utils::Prefs::get('animationLevel') == 3) {
-			Slim::Buttons::InstantMix::specialPushLeft($client, 0, @oldlines);
-		} else {
-			Slim::Display::Animation::pushLeft($client, @oldlines, Slim::Display::Display::curLines($client));
-		}
+		Slim::Display::Animation::pushLeft($client, @oldlines, Slim::Display::Display::curLines($client));
 	}
 );
 
Index: Slim/Buttons/VarietyCombo.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Buttons/VarietyCombo.pm,v
retrieving revision 1.1
diff -u -p -B -r1.1 VarietyCombo.pm
--- Slim/Buttons/VarietyCombo.pm	22 Apr 2004 05:47:11 -0000	1.1
+++ Slim/Buttons/VarietyCombo.pm	30 Jun 2004 04:56:20 -0000
@@ -67,11 +67,13 @@ my %functions = (
 			my @oldlines = Slim::Display::Display::curLines($client);
 			$currentItem = Slim::Buttons::Common::param($client, 'song');
 			Slim::Buttons::Common::pushMode($client, 'moodlogic_instant_mix', {'song' => Slim::Buttons::Common::param($client, 'song')});
-			if (Slim::Utils::Prefs::get('animationLevel') == 3) {
-				specialPushLeft($client, 0, @oldlines);
-			} else {
-				Slim::Display::Animation::pushLeft($client, @oldlines, Slim::Display::Display::curLines($client));
-			}
+			specialPushLeft($client, 0, @oldlines);
+		} elsif (defined Slim::Buttons::Common::param($client,'mood')) {
+			my @oldlines = Slim::Display::Display::curLines($client);
+			Slim::Buttons::Common::pushMode($client, 'moodlogic_instant_mix', {'genre' => Slim::Buttons::Common::param($client, 'mood'),
+					'artist' => Slim::Buttons::Common::param($client, 'artist'),
+					'mood' => Slim::Buttons::Common::param($client, 'mood')});
+			specialPushLeft($client, 0, @oldlines);
 		} else {
 			Slim::Display::Animation::bumpRight($client)
 		}