[Slim-Checkins] r10253 - in /branches/6.5/server: Changelog6.html Slim/Control/Commands.pm Slim/Player/Source.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Fri Oct  6 14:47:58 2006
New Revision: 10253

URL: http://svn.slimdevices.com?rev=10253&view=rev
Log:
Bug: 2314
Description: merge -r 10251:10252 from trunk

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Control/Commands.pm
    branches/6.5/server/Slim/Player/Source.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10253&r1=10252&r2=10253&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Fri Oct  6 14:47:58 2006
@@ -17,6 +17,7 @@
 	<li>Bug Fixes:
 	<ul>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=1026">#1026</a> - Implement gapless playback for MP3</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2314">#2314</a> - Volume zero when player paused</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2985">#2985</a> - WMA transcoded to WAV truncated (not gapless)</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3044">#3044</a> - Lyrics do not display with line spacing correctly (again)</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3318">#3318</a> - MusicMagic: Songs with national chars get duplicated</li>
@@ -294,7 +295,6 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2151">#2151</a> - Sleep after current song</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2173">#2173</a> - Need a way to delete saved playlists through command line...</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2289">#2289</a> - Replaygain volume adjustment fails during ffwd/rew</li>
-		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2314">#2314</a> - Volume zero when player paused</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2323">#2323</a> - playlist files still causing scanning issues</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2331">#2331</a> - FAQ questions in Default skin are tiny in Firefox</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2436">#2436</a> - Ad-hoc uses b only?</li>

Modified: branches/6.5/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Control/Commands.pm?rev=10253&r1=10252&r2=10253&view=diff
==============================================================================
--- branches/6.5/server/Slim/Control/Commands.pm (original)
+++ branches/6.5/server/Slim/Control/Commands.pm Fri Oct  6 14:47:58 2006
@@ -324,7 +324,7 @@
 		}
 	} else {
 		my $newval;
-		my $oldval = $client->$entity();
+		my $oldval = $client->prefGet($entity);
 
 		if ($newvalue =~ /^[\+\-]/) {
 			$newval = $oldval + $newvalue;
@@ -332,7 +332,13 @@
 			$newval = $newvalue;
 		}
 
-		$newval = $client->$entity($newval);
+		if ($entity eq 'volume' && defined $client->tempVolume && $client->tempVolume == 0 && $oldval > 0) {
+			# only set pref as volume is temporarily set to 0
+			$client->prefSet('volume', $newval) if ($newval <= $client->maxVolume);
+		} else {
+			# change current setting - this will also set the pref
+			$newval = $client->$entity($newval);
+		}
 
 		for my $eachclient (@buddies) {
 			if ($eachclient->prefGet('syncVolume')) {

Modified: branches/6.5/server/Slim/Player/Source.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Source.pm?rev=10253&r1=10252&r2=10253&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Source.pm (original)
+++ branches/6.5/server/Slim/Player/Source.pm Fri Oct  6 14:47:58 2006
@@ -1900,9 +1900,6 @@
 
 		$everyclient->pause();
 
-		# Bug 2314 - restore the volume
-		# Bug 3904 - revert this change until a better solution can be found.
-		# $everyclient->volume($everyclient->prefGet("volume"));
 	}
 }