Merge pull request #490 from philippe44/8.1-misc

Tweaks (see comment)
LMS-Community · Dec 28, 2020 · 3828924 · 3828924
2 parents e44606e + 815d60a
commit 3828924
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Slim/Player/TranscodingHelper.pm b/Slim/Player/TranscodingHelper.pm
@@ -167,10 +167,10 @@ sub loadConversionTables {
 # %d - samplerate: samples/s
 # %D - samplerate: ksamples/s
 
-# %C, $CHANNELS$   - channel count
+# %C, $CHANNELS$   - source channel count
 # %c, $OCHANNELS$  - output channel count
-#   , $SAMPLESIZE$ - sample size (in bits)
-#   , $SAMPLERATE$ - sample rate (in Hz)
+#     $SAMPLESIZE$ - source sample size (in bits)
+#     $SAMPLERATE$ - source sample rate (in Hz)
 # %i               - clientid
 # %I, $CLIENTID$   - clientid     ( : or . replaced by - )
 # %p               - player model

diff --git a/Slim/Web/Settings/Player/Basic.pm b/Slim/Web/Settings/Player/Basic.pm
@@ -99,7 +99,7 @@ sub handler {
 			$prefs->client($client)->set($pref, \@array);
 		}
 
-		if ($client->isPlayer && $client->isa('Slim::Player::SqueezePlay') && defined $paramRef->{'defeatDestructiveTouchToPlay'}) {
+		if ($client->isPlayer && defined $paramRef->{'defeatDestructiveTouchToPlay'}) {
 			$prefs->client($client)->set('defeatDestructiveTouchToPlay', $paramRef->{'defeatDestructiveTouchToPlay'});
 		}
 	}
@@ -124,7 +124,7 @@ sub handler {
 
 	$paramRef->{'playericon'} = $class->getPlayerIcon($client,$paramRef);
 
-	if ($client->isPlayer && $client->isa('Slim::Player::SqueezePlay')) {
+	if ($client->isPlayer) {
 		$paramRef->{'defeatDestructiveTouchToPlay'} = $prefs->client($client)->get('defeatDestructiveTouchToPlay');
 		$paramRef->{'defeatDestructiveTouchToPlay'} = $prefs->get('defeatDestructiveTouchToPlay') unless defined $paramRef->{'defeatDestructiveTouchToPlay'};
 	}