From 8c90c1a12f4048b68f066b92e4013f3478f0e38c Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 30 Oct 2012 17:19:40 -0400
Subject: [PATCH] CC-4645: Add support for x-scpls playlist types

-fixed
---
 airtime_mvc/application/models/Webstream.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 45d3caf9a..90afbe973 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -185,7 +185,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
                 }
                 $mediaUrl = self::getMediaUrl($url, $mime, $content_length_found);
 
-                if (preg_match("/(x-mpegurl)|(xspf\+xml)|(pls\+xml)/", $mime)) {
+                if (preg_match("/(x-mpegurl)|(xspf\+xml)|(pls\+xml)|(x-scpls)/", $mime)) {
                      list($mime, $content_length_found) = self::discoverStreamMime($mediaUrl);
                 }
             } catch (Exception $e) {
@@ -307,7 +307,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             $media_url = self::getM3uUrl($url);
         } elseif (preg_match("/xspf\+xml/", $mime)) {
             $media_url = self::getXspfUrl($url);
-        } elseif (preg_match("/pls\+xml/", $mime)) {
+        } elseif (preg_match("/pls\+xml/", $mime) || preg_match("/x-scpls/", $mime)) {
             $media_url = self::getPlsUrl($url);
         } elseif (preg_match("/(mpeg|ogg)/", $mime)) {
             if ($content_length_found) {