[Slim-Checkins] r33924 - in /7.8/trunk/server/Slim: Control/XMLBrowser.pm Utils/Prefs.pm

Author: ayoung
Date: Fri Mar 30 03:52:08 2012
New Revision: 33924

URL: http://svn.slimdevices.com/slim?rev=33924&view=rev
Log:
Make defeat-destructive touch-to-play the default (no UI to change that) and tighten the "radio" condition to catch services like Pandora.

Modified:
    7.8/trunk/server/Slim/Control/XMLBrowser.pm
    7.8/trunk/server/Slim/Utils/Prefs.pm

Modified: 7.8/trunk/server/Slim/Control/XMLBrowser.pm
URL: http://svn.slimdevices.com/slim/7.8/trunk/server/Slim/Control/XMLBrowser.pm?rev=33924&r1=33923&r2=33924&view=diff
==============================================================================
--- 7.8/trunk/server/Slim/Control/XMLBrowser.pm (original)
+++ 7.8/trunk/server/Slim/Control/XMLBrowser.pm Fri Mar 30 03:52:08 2012
@@ -1791,6 +1791,7 @@
 		if ($action = _makePlayAction($subFeed, $item, 'add', 'parentNoRefresh', $query, $item_id)) {
 			push @contextMenu, {
 				text => $request->string('ADD_TO_END'),
+				style => 'item_add',
 				actions => {go => $action},
 			},
 		}
@@ -1805,7 +1806,7 @@
 		if ($action = _makePlayAction($subFeed, $item, 'play', 'nowPlaying', $query, $item_id)) {
 			push @contextMenu, {
 				text => $request->string($addPlayAll ? 'PLAY_THIS_SONG' : 'PLAY'),
-				style => 'itemplay',
+				style => 'item_play',
 				actions => {go => $action},
 			},
 		}
@@ -1813,7 +1814,6 @@
 		if ($addPlayAll && ($action = _makePlayAction($subFeed, $item, 'playall', 'nowPlaying', $query, $request->getParam('item_id'), $sub_id))) {
 			push @contextMenu, {
 				text => $request->string('JIVE_PLAY_ALL_SONGS'),
-				style => 'itemplay',
 				actions => {go => $action},
 			},
 		}
@@ -1914,7 +1914,7 @@
 	
 	return 0 if !$pref;
 	return 1 if $pref == 1 || !$client;
-	return ($client->isPlaying() && $client->playingSong()->duration()) if $pref == 4;
+	return ($client->isPlaying() && $client->playingSong()->duration() && !$client->playingSong()->isPlaylist()) if $pref == 4;
 	my $l = Slim::Player::Playlist::count($client);
 	return 0 if $l < 2;
 	return 0 if $pref == 3 && (!$client->isPlaying() || $l < 2);

Modified: 7.8/trunk/server/Slim/Utils/Prefs.pm
URL: http://svn.slimdevices.com/slim/7.8/trunk/server/Slim/Utils/Prefs.pm?rev=33924&r1=33923&r2=33924&view=diff
==============================================================================
--- 7.8/trunk/server/Slim/Utils/Prefs.pm (original)
+++ 7.8/trunk/server/Slim/Utils/Prefs.pm Fri Mar 30 03:52:08 2012
@@ -253,6 +253,7 @@
 		'thumbSize'             => 100,
 		# Server Settings - jive UI
 		'jivealbumsort'		=> 'album',
+		'defeatDestructiveTouchToPlay' => 4, # 4 => defeat only if playing and current item not a radio stream
 		# Server Settings - mysqueezebox.com
 		'sn_sync'               => 1,
 		'sn_disable_stats'		=> 0,