[Slim-Checkins] r11725 - in /trunk/server/Slim/Player: Squeezebox.pm Squeezebox2.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Apr  3 13:37:32 2007
New Revision: 11725

URL: http://svn.slimdevices.com?rev=11725&view=rev
Log:
Bug: N/A
Description: allow pcm sample size and rate equating to 0 to be sent

Modified:
    trunk/server/Slim/Player/Squeezebox.pm
    trunk/server/Slim/Player/Squeezebox2.pm

Modified: trunk/server/Slim/Player/Squeezebox.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox.pm?rev=11725&r1=11724&r2=11725&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox.pm (original)
+++ trunk/server/Slim/Player/Squeezebox.pm Tue Apr  3 13:37:32 2007
@@ -1048,7 +1048,9 @@
 				 32 => '4',
 				 );
 
-	return $pcm_sample_sizes{$track->samplesize()} || '1';
+	my $size = $pcm_sample_sizes{$track->samplesize()};
+
+	return defined $size ? $size : '1';
 }
 
 sub pcm_sample_rates {
@@ -1062,7 +1064,9 @@
 				 48000 => '4',
 				 );
 
-	return $pcm_sample_rates{$track->samplerate()} || '3';
+	my $rate = $pcm_sample_rates{$track->samplerate()};
+
+	return defined $rate ? $rate : '3';
 }
 
 sub sendFrame {

Modified: trunk/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox2.pm?rev=11725&r1=11724&r2=11725&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox2.pm (original)
+++ trunk/server/Slim/Player/Squeezebox2.pm Tue Apr  3 13:37:32 2007
@@ -853,7 +853,9 @@
 				 96000 => '9',
 				 );
 
-	return $pcm_sample_rates{$track->samplerate()} || '3';
+	my $rate = $pcm_sample_rates{$track->samplerate()};
+
+	return defined $rate ? $rate : '3';
 }
 
 1;