[Slim-Checkins] r33765 - in /7.7/trunk/server: Changelog7.html Slim/Player/Squeezebox.pm

Author: agrundman
Date: Sat Jan  7 20:07:07 2012
New Revision: 33765

URL: http://svn.slimdevices.com/slim?rev=33765&view=rev
Log:
Fixed bug 17855, only enable single output channel mode if actively synced

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/Slim/Player/Squeezebox.pm

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33765&r1=33764&r2=33765&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Sat Jan  7 20:07:07 2012
@@ -3,6 +3,7 @@
 	<li>Bug Fixes:</li>
 	<ul>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17835">#17835</a> - playlistcontrol cmd:load ... play_index:yyyy doesn't work with folders</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17855">#17855</a> - Only enable single output channel mode if actively synced</li>
 	</ul>
 	<br />
 </ul>

Modified: 7.7/trunk/server/Slim/Player/Squeezebox.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Player/Squeezebox.pm?rev=33765&r1=33764&r2=33765&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Player/Squeezebox.pm (original)
+++ 7.7/trunk/server/Slim/Player/Squeezebox.pm Sat Jan  7 20:07:07 2012
@@ -904,7 +904,15 @@
 	$flags |= 0x40 if $params->{reconnect};
 	$flags |= 0x80 if $params->{loop};
 	$flags |= 0x03 & ($prefs->client($client)->get('polarityInversion') || 0);
-	$flags |= (($prefs->client($client)->get('outputChannels') || 0) & 0x03) << 2;
+	
+	# If the output channels pref is set, and the player is synced to at least 1 other active player
+	# we tell the player to only play the desired channel. If not actively synced, the player will play
+	# in stereo.
+	if ( my $outputChannels = $prefs->client($client)->get('outputChannels') ) {
+		if ( $client->isSynced(1) ) { # use active player count
+			$flags |= ($outputChannels & 0x03) << 2;
+		}
+	}
 
 	if ($handler->can('slimprotoFlags')) {
 		$flags |= $handler->slimprotoFlags($client, $url, $isDirect);