[Slim-Checkins] r9369 - in /branches/6.5/server: Changelog6.html Firmware/squeezebox2.version Firmware/squeezebox2_60.bin Firmware/squeezebox2_61.bin Firmware/transporter.version Firmware/transporter_11.bin Firmware/transporter_12.bin Slim/Player/Squeezebox2.pm

[titmuss at svn.slimdevices.com]

Author: titmuss
Date: Sat Sep  2 06:58:38 2006
New Revision: 9369

URL: http://svn.slimdevices.com?rev=9369&view=rev
Log:
Merged squeezebox2/3 fw61 from trunu r9368.


Added:
    branches/6.5/server/Firmware/squeezebox2_61.bin
      - copied unchanged from r9368, trunk/server/Firmware/squeezebox2_61.bin
    branches/6.5/server/Firmware/transporter_12.bin
      - copied unchanged from r9357, trunk/server/Firmware/transporter_12.bin
Removed:
    branches/6.5/server/Firmware/squeezebox2_60.bin
    branches/6.5/server/Firmware/transporter_11.bin
Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Firmware/squeezebox2.version
    branches/6.5/server/Firmware/transporter.version
    branches/6.5/server/Slim/Player/Squeezebox2.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9369&r1=9368&r2=9369&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sat Sep  2 06:58:38 2006
@@ -3,6 +3,12 @@
 <ul>
 	<li>Firmware updates:
 	<ul>
+		<li>Update to Firmware 61 for Squeezebox2/Squeezebox v3.
+		<ul>
+			<li>Allow custom VU meter graphics to be uploaded to the firmware.</li>
+			<li>Bug fixes</li>
+		</ul>
+		</li>
 		<li>Update to Firmware 60 for Squeezebox2/Squeezebox v3.
 		<ul>
 			<li>Bug fixes</li>
@@ -536,13 +542,19 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3971">#3971</a> - New feature: Perl and mysql version info display on server settings screen.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3977">#3977</a> - CLI command "time ?" does not return the right time at the beginning of the tracks</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3980">#3980</a> - Initial WMA stream request sometimes gets truncated</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3981">#3981</a> - Firmware won't play alternate WMA streams</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3988">#3988</a> - bumpUp/Down to scroll bottom of screen only</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4000">#4000</a> - slave (spdif) clock settings are incorrect</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4003">#4003</a> - DAC mode should be called &quot;Audio Source&quot;</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4007">#4007</a> - Crash on Windows XP with -d_sql and running as a service</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4010">#4010</a> - Need option for S/DIF or AES/BEU digital output</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4011">#4011</a> - Entry of WPA key 5555... is difficult with knob</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4012">#4012</a> - WMA GUID's ignored by firmware</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4015">#4015</a> - Web setup corrupts screensaver settings in player UI</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4021">#4021</a> - build-perl-modules hangs on YAML-Syck-0.64</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4025">#4025</a> - Apple Lossless Files not playing</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4026">#4026</a> - WAV playback only works for 16 bits 44.1kHz</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4030">#4030</a> - Add voltage to status command for transporter</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4031">#4031</a> - Crash when enabling Network Health with no players</li>
 	</ul>
 </ul>

Modified: branches/6.5/server/Firmware/squeezebox2.version
URL: http://svn.slimdevices.com/branches/6.5/server/Firmware/squeezebox2.version?rev=9369&r1=9368&r2=9369&view=diff
==============================================================================
--- branches/6.5/server/Firmware/squeezebox2.version (original)
+++ branches/6.5/server/Firmware/squeezebox2.version Sat Sep  2 06:58:38 2006
@@ -3,8 +3,8 @@
 # from        to
 # from1..from2 to
 
-1..60 60
+1..61 61
 
 # future versions may be downgraded to this one
-* 60
+* 61
 

Modified: branches/6.5/server/Firmware/transporter.version
URL: http://svn.slimdevices.com/branches/6.5/server/Firmware/transporter.version?rev=9369&r1=9368&r2=9369&view=diff
==============================================================================
--- branches/6.5/server/Firmware/transporter.version (original)
+++ branches/6.5/server/Firmware/transporter.version Sat Sep  2 06:58:38 2006
@@ -3,8 +3,8 @@
 # from        to
 # from1..from2 to
 
-1..11 11 
+1..12 12
 
 # future versions may be downgraded to this one
-* 11
+* 12
 

Modified: branches/6.5/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Squeezebox2.pm?rev=9369&r1=9368&r2=9369&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Squeezebox2.pm (original)
+++ branches/6.5/server/Slim/Player/Squeezebox2.pm Sat Sep  2 06:58:38 2006
@@ -719,7 +719,11 @@
 
 		$::d_prefs && msg("playerSettingsFrame $pref = $value\n");
 
-		$client->SUPER::prefSet($pref, $value);
+		if (!defined $value) {
+			$client->setPlayerSetting($pref, $client->prefGet($pref));
+		} else {
+			$client->SUPER::prefSet($pref, $value);
+		}
 	}
 }