[Slim-Checkins] r11718 - in /branches/6.5/server: Changelog6.html Firmware/squeezebox2.version Firmware/squeezebox2_80.bin Firmware/squeezebox2_81.bin Firmware/transporter.version Firmware/transporter_29.bin Firmware/transporter_31.bin Slim/Player/Squeezebox2.pm

[titmuss at svn.slimdevices.com]

Author: titmuss
Date: Tue Apr  3 01:51:15 2007
New Revision: 11718

URL: http://svn.slimdevices.com?rev=11718&view=rev
Log:
Merged new firmware from trunk r11717.

Added:
    branches/6.5/server/Firmware/squeezebox2_81.bin
      - copied unchanged from r11717, trunk/server/Firmware/squeezebox2_81.bin
    branches/6.5/server/Firmware/transporter_31.bin
      - copied unchanged from r11717, trunk/server/Firmware/transporter_31.bin
Removed:
    branches/6.5/server/Firmware/squeezebox2_80.bin
    branches/6.5/server/Firmware/transporter_29.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=11718&r1=11717&r2=11718&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Tue Apr  3 01:51:15 2007
@@ -1,7 +1,7 @@
 <h2><a name="v6.5.2" id="v6.5.2"></a>Version 6.5.2 - 2007-MM-DD</h2>
 
 <ul>
-	<li>Firmware 80 for Squeezebox2/3 and Firmware 29 for Transporter:</li>
+	<li>Firmware 81 for Squeezebox2/3 and Firmware 31 for Transporter:</li>
 	<ul>
 		<li>Added Logitech branding</li>
 		<li>Localized network setup (in English, German, French, Dutch, Italian and Spanish)</li>

Modified: branches/6.5/server/Firmware/squeezebox2.version
URL: http://svn.slimdevices.com/branches/6.5/server/Firmware/squeezebox2.version?rev=11718&r1=11717&r2=11718&view=diff
==============================================================================
--- branches/6.5/server/Firmware/squeezebox2.version (original)
+++ branches/6.5/server/Firmware/squeezebox2.version Tue Apr  3 01:51:15 2007
@@ -3,8 +3,8 @@
 # from        to
 # from1..from2 to
 
-1..80 80
+1..81 81
 
 # future versions may be downgraded to this one
-* 80
+* 81
 

Modified: branches/6.5/server/Firmware/transporter.version
URL: http://svn.slimdevices.com/branches/6.5/server/Firmware/transporter.version?rev=11718&r1=11717&r2=11718&view=diff
==============================================================================
--- branches/6.5/server/Firmware/transporter.version (original)
+++ branches/6.5/server/Firmware/transporter.version Tue Apr  3 01:51:15 2007
@@ -3,8 +3,8 @@
 # from        to
 # from1..from2 to
 
-1..29 29
+1..31 31
 
 # future versions may be downgraded to this one
-* 29
+* 31
 

Modified: branches/6.5/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Squeezebox2.pm?rev=11718&r1=11717&r2=11718&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Squeezebox2.pm (original)
+++ branches/6.5/server/Slim/Player/Squeezebox2.pm Tue Apr  3 01:51:15 2007
@@ -783,15 +783,16 @@
 	my $track = shift;
 
     	my %pcm_sample_rates = ( 8000 => '5',
-				 11000 => '0',
+				 11025 => '0',
 				 12000 => '6',
-				 22000 => '1',
+				 22050 => '1',
 				 24000 => '8',
 				 32000 => '2',
 				 44100 => '3',
 				 48000 => '4',
-				 70000 => '7',
-				 96000 => '9',			 
+				 16000 => '7',
+				 88200 => '10',
+				 96000 => '9',
 				 );
 
 	return $pcm_sample_rates{$track->samplerate()} || '3';