Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg

@@ -10,6 +10,10 @@ output_icecast_vorbis = true
 output_icecast_mp3 = false
 output_shoutcast = false
 
+#output_bitrate = 128
+#output_samplerate = 44100
+#output_stereo = true
+
 ###########################################
 # Logging settings                        #
 ###########################################

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -57,6 +57,8 @@ if output_sound_device then
 end
 
 if output_icecast_mp3 then
+
+    #format = %mp3(bitrate=192, samplerate=44100, stereo=false)
     ignore(output.icecast(%mp3,
             host = icecast_host,
             port = icecast_port,

python_apps/show-recorder/recorder.cfg

@@ -16,3 +16,11 @@ rabbitmq_host = 'localhost'
 rabbitmq_user = 'guest'
 rabbitmq_password = 'guest'
 
+############################################
+# Recorded Audio settings                  #
+############################################
+record_bitrate = 256
+record_samplerate = 44100
+record_channels = 2
+record_sample_size = 16
+

python_apps/show-recorder/recorder.py

@@ -68,8 +68,14 @@ class ShowRecorder(Thread):
         filename = filename.replace(" ", "-")
         filepath = "%s%s.%s" % (config["base_recorded_files"], filename, self.filetype)
 
-        command = "ecasound -i alsa -o %s -t:%s" % (filepath, length)
-        #-ge:0.1,0.1,0,-1
+        br = config["record_bitrate"]
+        sr = config["record_samplerate"]
+        c = config["record_channels"]
+        ss = config["record_sample_size"]
+
+        #-f:16,2,44100
+        #-b:256
+        command = "ecasound -f:%s,%s,%s -i alsa -o %s,%s000 -t:%s" % (ss, c, sr, filepath, br, length)
         args = command.split(" ")
 
         self.logger.info("starting record")