Merge branch 'public/7.7' into public/7.9

LMS-Community · Oct 16, 2019 · 5368636 · 5368636
2 parents 8a9e9fb + 97f303a
commit 5368636
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/HTML/EN/html/docs/cli-api.html b/HTML/EN/html/docs/cli-api.html
@@ -8636,7 +8636,7 @@ <h3 id="PG">
 		<strong><code><a href="#radios">apps</a></code></strong>
 	</li>
 	<li>
-		<strong><a href="#XMLBrowser">Live Music Archive, Live365, MP3tunes, Pandora, Podcasts, RadioTime, Napster, Shoutcast, Staff Picks, RSS</a></strong>
+		<strong><a href="#XMLBrowser">Live Music Archive, MP3tunes, Pandora, Podcasts, RadioTime, Napster, Shoutcast, Staff Picks, RSS</a></strong>
 	</li>
 	<li>
 		<strong><a href="#Favorites">Favorites</a></strong>
@@ -8721,7 +8721,7 @@ <h3 id="PG">
 			&nbsp;&nbsp;<b>cmd</b>
 		</td>
 		<td>
-			Command, one of &quot;lma&quot;, &quot;live365&quot;, &quot;mp3tunes&quot;,
+			Command, one of &quot;lma&quot;, &quot;mp3tunes&quot;,
 			&quot;pandora&quot;, &quot;podcast&quot;, 
 			&quot;radiotime&quot;,  &quot;rhapsodydirect&quot;, &quot;shoutcast&quot;, &quot;
 			or &quot;picks&quot;, or any other, additionally installed radio or music service
@@ -8784,13 +8784,13 @@ <h3 id="PG">
 
 <br>
 <h3 id="XMLBrowser">
-	Live Music Archive, Live365, MP3tunes, Pandora, Podcasts, RadioTime, Napster, Shoutcast, Staff Picks, RSS
+	Live Music Archive, MP3tunes, Pandora, Podcasts, RadioTime, Napster, Shoutcast, Staff Picks, RSS
 </h3>
 <p>
 	<strong>
 		<code>
 			&lt;playerid&gt;
-			&lt;lma|live365|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss&gt;
+			&lt;lma|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss&gt;
 			items
 			&lt;start&gt;
 			&lt;itemsPerResponse&gt;
@@ -8983,7 +8983,7 @@ <h3 id="XMLBrowser">
 	<strong>
 		<code>
 			&lt;playerid&gt;
-			&lt;lma|live365|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss&gt;
+			&lt;lma|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss&gt;
 			playlist
 			&lt;play|load|insert|add&gt;
 			&lt;taggedParameters&gt;

diff --git a/Slim/Control/XMLBrowser.pm b/Slim/Control/XMLBrowser.pm
@@ -1435,7 +1435,6 @@ sub _cliQuery_done {
 					mp3tunes	=>	'PLUGIN_MP3TUNES_MODULE_NAME',
 					radiotime	=>	'PLUGIN_RADIOTIME_MODULE_NAME',
 					slacker		=>	'PLUGIN_SLACKER_MODULE_NAME',
-					live365		=>	'PLUGIN_LIVE365_MODULE_NAME',
 					lma		=>	'PLUGIN_LMA_MODULE_NAME',
 				};
 

diff --git a/Slim/Music/Info.pm b/Slim/Music/Info.pm
@@ -1487,10 +1487,6 @@ sub typeFromPath {
 		}
 		elsif ($fullpath =~ /^([a-z]+:)/ && defined($suffixes{$1})) {
 			$type = $suffixes{$1};
-		} 
-		elsif ( $fullpath =~ /^(?:live365)/ ) {
-			# Force mp3 for protocol handlers
-			return 'mp3';
 		}
 		else {
 

diff --git a/Slim/Networking/SqueezeNetwork/Stats.pm b/Slim/Networking/SqueezeNetwork/Stats.pm
@@ -19,7 +19,7 @@ my $log   = logger('network.squeezenetwork');
 my $prefs = preferences('server');
 
 # Regex for which URLs we want to report stats for
-my $REPORT_RE = qr{^(?:http|mms|live365|loop)://};
+my $REPORT_RE = qr{^(?:http|mms|loop)://};
 
 # Report stats to SN at this interval
 my $REPORT_INTERVAL = 1200;