From 97f303a47303f3aab1bc5e7bbb1009464596a16f Mon Sep 17 00:00:00 2001 From: Michael Herger Date: Wed, 16 Oct 2019 13:42:25 +0200 Subject: [PATCH] Remove code references to Live365 --- HTML/EN/html/docs/cli-api.html | 10 +++++----- Slim/Control/XMLBrowser.pm | 1 - Slim/Music/Info.pm | 4 ---- Slim/Networking/SqueezeNetwork/Stats.pm | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/HTML/EN/html/docs/cli-api.html b/HTML/EN/html/docs/cli-api.html index 44f3657d528..f0bef8ff09f 100644 --- a/HTML/EN/html/docs/cli-api.html +++ b/HTML/EN/html/docs/cli-api.html @@ -8212,7 +8212,7 @@

apps
  • - 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
  • Favorites @@ -8297,7 +8297,7 @@

      cmd - Command, one of "lma", "live365", "mp3tunes", + Command, one of "lma", "mp3tunes", "pandora", "podcast", "radiotime", "rhapsodydirect", "shoutcast", " or "picks", or any other, additionally installed radio or music service @@ -8360,13 +8360,13 @@


    - 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

    <playerid> - <lma|live365|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss> + <lma|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss> items <start> <itemsPerResponse> @@ -8559,7 +8559,7 @@

    <playerid> - <lma|live365|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss> + <lma|mp3tunes|pandora|podcast|radiotime|rhapsodydirect|shoutcast|picks|rss> playlist <play|load|insert|add> <taggedParameters> diff --git a/Slim/Control/XMLBrowser.pm b/Slim/Control/XMLBrowser.pm index a2125627d9c..920d579c0b9 100644 --- a/Slim/Control/XMLBrowser.pm +++ b/Slim/Control/XMLBrowser.pm @@ -1421,7 +1421,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 index e2b177e8a20..1d46037b3af 100644 --- a/Slim/Music/Info.pm +++ b/Slim/Music/Info.pm @@ -1455,10 +1455,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 index 18c7e2c1a0e..66260e417ad 100644 --- 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;