From ac8610ca06450b3dd559a6b1d854690c30d8b03c Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 10 Sep 2012 12:18:19 -0400
Subject: [PATCH] CC-4385: Problem with mono streams for stream rebroadcasting

-fixed
---
 airtime_mvc/application/models/Webstream.php  | 42 ++++++++++++-------
 .../pypo/liquidsoap_scripts/ls_lib.liq        |  2 +-
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 22d51a3e8..b1d4b2b77 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -178,10 +178,9 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
                 if (is_null($mime)) {
                     throw new Exception("No MIME type found for webstream.");
                 }
-                //TODO: return url
                 $mediaUrl = self::getMediaUrl($url, $mime, $content_length_found);
 
-                if (preg_match("/(x-mpegurl)|(xspf\+xml)/", $mime)) {
+                if (preg_match("/(x-mpegurl)|(xspf\+xml)|(pls\+xml)/", $mime)) {
                      list($mime, $content_length_found) = self::discoverStreamMime($mediaUrl);
                 }
             } catch (Exception $e) {
@@ -222,7 +221,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
 
     }
 
-    private static function getXspfUrl($url)
+    private static function getUrlData($url)
     {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -233,10 +232,17 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
         //TODO: What if invalid url?
         $content = curl_exec($ch);
 
-        Logging::info($content);
+        Logging::debug($content);
 
         // close cURL resource, and free up system resources
         curl_close($ch);
+        
+        return $content;
+    }
+
+    private static function getXspfUrl($url)
+    {
+        $content = self::getUrlData($url); 
 
         $dom = new DOMDocument;
         //TODO: What if invalid xml?
@@ -252,19 +258,23 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
 
         throw new Exception("Could not parse XSPF playlist");
     }
+    
+    private static function getPlsUrl($url)
+    {
+        $content = self::getUrlData($url); 
+
+        $ini = parse_ini_string($content, true); 
+
+        if ($ini !== false && isset($ini["playlist"]) && isset($ini["playlist"]["File1"])) {
+            return $ini["playlist"]["File1"];
+        }
+
+        throw new Exception("Could not parse PLS playlist");
+    }
 
     private static function getM3uUrl($url)
     {
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-        // grab URL and pass it to the browser
-        //TODO: What if invalid url?
-        $content = curl_exec($ch);
-        Logging::info($content);
-        curl_close($ch);
+        $content = self::getUrlData($url); 
 
         //split into lines:
         $delim = "\n";
@@ -288,6 +298,8 @@ 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)) {
+            $media_url = self::getPlsUrl($url);
         } elseif (preg_match("/(mpeg|ogg)/", $mime)) {
             if ($content_length_found) {
                 throw new Exception("Invalid webstream - This appears to be a file download.");
@@ -314,8 +326,6 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             }
             if (preg_match("/^content-length:/i", $h)) {
                 $content_length_found = true;
-                //if content-length appears, this is not a web stream!!!!
-                //Aborting the save process.
             }
         }
 
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
index 328ea21ab..085d03661 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
@@ -406,7 +406,7 @@ end
 # Function to create a playlist source and output it.
 def create_dynamic_source(uri) =
     # The playlist source 
-    s = input.http(buffer=2., max=12., uri)
+    s = audio_to_stereo(input.http(buffer=2., max=12., uri))
 
     # The output
     active_dyn_out = dyn_out(s)