From f5db45ecfe8b0a124717c451e4bad34ad861da55 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 29 Mar 2011 20:52:18 -0400
Subject: [PATCH] -cleaned up liquidsoap config file

---
 python_apps/pypo/scripts/liquidsoap.cfg | 28 ++++++++-----------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/python_apps/pypo/scripts/liquidsoap.cfg b/python_apps/pypo/scripts/liquidsoap.cfg
index 20b1f4215..a7f310f1a 100644
--- a/python_apps/pypo/scripts/liquidsoap.cfg
+++ b/python_apps/pypo/scripts/liquidsoap.cfg
@@ -1,9 +1,6 @@
 ###########################################
 # liquidsoap config file                  #
 ###########################################
-# This config assumes that there are 
-# two instances of LS running
-# the "scheduler" & the "fallback" instance
 
 
 ###########################################
@@ -13,13 +10,6 @@
 log_file = "/var/log/pypo/<script>.log"
 log_level = 3
 
-# archive directory
-archive_dir = "/opt/pypo/archive/"
-
-# list pointing to the current couchcaster mountpoint 
-couchcaster_list = "http://vdeb.openbroadcast.ch/mod/ml/api/pypo/current_couchcaster"
-
-
 ###########################################
 # stream settings                         #
 ###########################################
@@ -27,22 +17,22 @@ icecast_host = "127.0.0.1"
 icecast_port = 8000
 icecast_pass = "hackme"
 
-# mountpoints
+###########################################
+# webstream mountpoint names              #
+###########################################
 mount_point_mp3 = "airtime.mp3"
 mount_point_vorbis = "airtime.ogg"
 
-# mount intra is used for scheduler >>> fallback stream
-mount_intra = "pypo_intra"
-
-# intra-LS streaming (no icecast here)
-intra_host = "127.0.0.1"
-intra_port = 9000
-intra_pass = "hackme"
-
+###########################################
+# 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 = false
 output_icecast_mp3 = true