From 1bb2e79a787426aef39f169e1653bc05c3634335 Mon Sep 17 00:00:00 2001
From: Paul Baranowski <paul.baranowski@sourcefabric.org>
Date: Mon, 20 Jun 2011 17:34:16 -0400
Subject: [PATCH] CC-2397: Support output to Shoutcast

Simply added some config file variables and added the output type in
the liquidsoap script.
---
 .../pypo/liquidsoap_scripts/liquidsoap.cfg    | 51 ++++++++++---------
 .../pypo/liquidsoap_scripts/ls_script.liq     | 37 ++++++++++----
 2 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg b/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg
index 98436d03a..b0b13b0bc 100644
--- a/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg
+++ b/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg
@@ -1,46 +1,51 @@
 ###########################################
-# liquidsoap config file                  #
+# Liquidsoap config file                  #
 ###########################################
 
+###########################################
+# Output settings                         #
+###########################################
+output_sound_device = false
+output_icecast_vorbis = true
+output_icecast_mp3 = false
+output_shoutcast = false
 
 ###########################################
-# general settings                        #
+# Logging settings                        #
 ###########################################
-
 log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
 log_level = 3
 
 ###########################################
-# stream settings                         #
+# Icecast Stream settings                 #
 ###########################################
 icecast_host = "127.0.0.1"
 icecast_port = 8000
 icecast_pass = "hackme"
 
-###########################################
-# webstream mountpoint names              #
-###########################################
+# Icecast mountpoint names 
 mount_point_mp3 = "airtime.mp3"
 mount_point_vorbis = "airtime.ogg"
 
-###########################################
-# webstream metadata settings             #
-###########################################
+# Webstream metadata settings
 icecast_url = "http://airtime.sourcefabric.org"
 icecast_description = "Airtime Radio!"
 icecast_genre = "genre"
 
-###########################################
-#liquidsoap output settings              #
-###########################################
-output_sound_device = false
-output_icecast_vorbis = true
-output_icecast_mp3 = false
-
-
-#audio stream metadata for vorbis/ogg is disabled by default
-#due to a large number of client media players that disconnect
-#when the metadata changes to that of a new track. Some versions of
-#mplayer and VLC have this problem. Enable this option at your
-#own risk!
+# Audio stream metadata for vorbis/ogg is disabled by default
+# due to a number of client media players that disconnect
+# when the metadata changes to a new track. Some versions of
+# mplayer and VLC have this problem. Enable this option at your
+# own risk!
 output_icecast_vorbis_metadata = false
+
+###########################################
+# Shoutcast Stream settings               #
+###########################################
+shoutcast_host = "127.0.0.1"
+shoutcast_port = 9000
+shoutcast_pass = "testing"
+
+# Webstream metadata settings
+shoutcast_url = "http://airtime.sourcefabric.org"
+shoutcast_genre = "genre"
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
index ab856d903..13ef152dd 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@@ -58,8 +58,10 @@ end
 
 if output_icecast_mp3 then
     out_mp3 = output.icecast(%mp3,
-            host = icecast_host, port = icecast_port,
-            password = icecast_pass, mount = mount_point_mp3,
+            host = icecast_host,
+            port = icecast_port,
+            password = icecast_pass,
+            mount = mount_point_mp3,
             fallible = true,
             restart = true,
             restart_delay = 5,
@@ -70,11 +72,12 @@ if output_icecast_mp3 then
 end
 
 if output_icecast_vorbis then
-    
     if output_icecast_vorbis_metadata then
         out_vorbis = output.icecast(%vorbis,
-                host = icecast_host, port = icecast_port,
-                password = icecast_pass, mount = mount_point_vorbis,
+                host = icecast_host,
+                port = icecast_port,
+                password = icecast_pass,
+                mount = mount_point_vorbis,
                 fallible = true,
                 restart = true,
                 restart_delay = 5,
@@ -87,16 +90,30 @@ if output_icecast_vorbis then
         #with vlc and mplayer disconnecting at the end of every track
         s = add(normalize=false, [amplify(0.00001, noise()),s])
         out_vorbis = output.icecast(%vorbis,
-                host = icecast_host, port = icecast_port,
-                password = icecast_pass, mount = mount_point_vorbis,
+                host = icecast_host,
+                port = icecast_port,
+                password = icecast_pass,
+                mount = mount_point_vorbis,
                 fallible = true,
                 restart = true,
                 restart_delay = 5,
                 url = icecast_url,
                 description = icecast_description,
                 genre = icecast_genre,
-                s)    
+                s)
     end
-    
-
 end
+
+if output_shoutcast then
+    out_shoutcast = output.shoutcast(%mp3,
+            host = shoutcast_host,
+            port = shoutcast_port,
+            password = shoutcast_pass,
+            fallible = true,
+            restart = true,
+            restart_delay = 5,
+            url = shoutcast_url,
+            genre = shoutcast_genre,
+            s)
+end
+