[Slim-Checkins] r10753 - in /branches/6.5/server: Changelog6.html Plugins/Snow.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Fri Nov 24 11:42:19 2006
New Revision: 10753

URL: http://svn.slimdevices.com?rev=10753&view=rev
Log:
Bug: 4533
Description: merge -r 10751:10752 from trunk

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Plugins/Snow.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10753&r1=10752&r2=10753&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Fri Nov 24 11:42:19 2006
@@ -120,6 +120,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4489">#4489</a> - wma files with album art attached not showing up in SlimServer</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4497">#4497</a> - Error decoding some ogg vorbis files natively</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4520">#4520</a> - Ticker display mode continues to show same text on Transporter</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4533">#4533</a> - snow screensaver overlapped by VU meter, briefly</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Plugins/Snow.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/Snow.pm?rev=10753&r1=10752&r2=10753&view=diff
==============================================================================
--- branches/6.5/server/Plugins/Snow.pm (original)
+++ branches/6.5/server/Plugins/Snow.pm Fri Nov 24 11:42:19 2006
@@ -20,6 +20,7 @@
 use Slim::Control::Request;
 use Slim::Utils::Timers;
 use File::Spec::Functions qw(:ALL);
+use Scalar::Util qw(blessed);
 
 use vars qw($VERSION);
 $VERSION = substr(q$Revision$,10);
@@ -470,6 +471,11 @@
 			$loadedTextCustomChars = 1;
 		}
 	}
+
+	# Turn off visualizer on SB2/3 in text mode
+	if (blessed $client->display eq 'Slim::Display::Squeezebox2' && $snow{$client}->{snowStyle} == 6) {
+		$client->modeParam('visu', [0]);
+	}
 }
 
 sub leaveScreensaverSnowMode {