Merge branch '2.2.x' into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js

python_apps/icecast2/airtime-icecast-status.xsl

@@ -1,7 +1,7 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>

python_apps/media-monitor2/media/monitor/manager.py

@@ -202,6 +202,12 @@ class Manager(Loggable):
         organize.
         """
         store_paths = mmp.expand_storage(store)
+        # First attempt to make sure that all paths exist before adding any
+        # watches
+        for path_type, path in store_paths.iteritems():
+            try: mmp.create_dir(path)
+            except mmp.FailedToCreateDir as e: self.unexpected_exception(e)
+
         self.set_problem_files_path(store_paths['problem_files'])
         self.set_imported_path(store_paths['imported'])
         self.set_recorded_path(store_paths['recorded'])

python_apps/media-monitor2/mm2.py

@@ -105,6 +105,9 @@ def main(global_config, api_client_config, log_config,
     airtime_notifier = AirtimeNotifier(config, airtime_receiver)
 
     store = apiclient.setup_media_monitor()
+
+    log.info("Initing with the following airtime response:%s" % str(store))
+
     airtime_receiver.change_storage({ 'directory':store[u'stor'] })
 
     for watch_dir in store[u'watched_dirs']:
@@ -116,6 +119,7 @@ def main(global_config, api_client_config, log_config,
                         (given from the database)." % watch_dir)
         if os.path.exists(watch_dir):
             airtime_receiver.new_watch({ 'directory':watch_dir }, restart=True)
+        else: log.info("Failed to add watch on %s" % str(watch_dir))
 
     bs = Bootstrapper( db=sdb, watch_signal='watch' )
 

python_apps/pypo/liquidsoap_scripts/library/gstreamer.liq

@@ -0,0 +1,34 @@
+%ifdef input.gstreamer.video
+# Stream from a video4linux 2 input device, such as a webcam.
+# @category Source / Input
+# @param ~id Force the value of the source ID.
+# @param ~clock_safe Force the use of the dedicated v4l clock.
+# @param ~device V4L2 device to use.
+def input.v4l2(~id="",~clock_safe=true,~device="/dev/video0")
+  pipeline = "v4l2src device=#{device}"
+  input.gstreamer.video(id=id, clock_safe=clock_safe, pipeline=pipeline)
+end
+
+# Stream from a video4linux 2 input device, such as a webcam.
+# @category Source / Input
+# @param ~id Force the value of the source ID.
+# @param ~clock_safe Force the use of the dedicated v4l clock.
+# @param ~device V4L2 device to use.
+def input.v4l2_with_audio(~id="",~clock_safe=true,~device="/dev/video0")
+  audio_pipeline = "autoaudiosrc"
+  video_pipeline = "v4l2src device=#{device}"
+  input.gstreamer.audio_video(id=id, clock_safe=clock_safe, audio_pipeline=audio_pipeline, video_pipeline=video_pipeline)
+end
+
+def gstreamer.encode_x264_avi(fname, source)
+  output.gstreamer.video(pipeline="videoconvert ! x264enc ! avimux ! filesink location=\"#{fname}\"", source)
+end
+
+def gstreamer.encode_jpeg_avi(fname, source)
+  output.gstreamer.video(pipeline="videoconvert ! jpegenc ! avimux ! filesink location=\"#{fname}\"", source)
+end
+
+def gstreamer.encode_mp3(fname, source)
+  output.gstreamer.audio(pipeline="audioconvert ! lamemp3enc ! filesink location=\"#{fname}\"", source)
+end
+%endif

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -201,9 +201,6 @@ def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point,
         dj_live = mksafe(audio_to_stereo(input.harbor(id="live_dj_harbor", dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client,
                     max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect)))
 
-        master_dj = rewrite_metadata([("artist","Airtime"), ("title", "Master Dj")],master_dj)
-        dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live)
-
         ignore(output.dummy(master_dj, fallible=true))
         ignore(output.dummy(dj_live, fallible=true))
         switch(id="master_dj_switch", track_sensitive=false, transitions=[transition, transition, transition], [({!master_dj_enabled},master_dj), ({!live_dj_enabled},dj_live), ({true}, s)])
@@ -211,14 +208,12 @@ def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point,
         master_dj = mksafe(audio_to_stereo(input.harbor(id="master_harbor", master_harbor_input_mount_point, port=master_harbor_input_port, auth=check_master_dj_client,
                      max=40., on_connect=master_dj_connect, on_disconnect=master_dj_disconnect)))
         ignore(output.dummy(master_dj, fallible=true))
-        master_dj = rewrite_metadata([("artist","Airtime"), ("title", "Master Dj")],master_dj)
+        
         switch(id="master_dj_switch", track_sensitive=false, transitions=[transition, transition], [({!master_dj_enabled},master_dj), ({true}, s)])
     elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
         dj_live = mksafe(audio_to_stereo(input.harbor(id="live_dj_harbor", dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client,
                     max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect)))
 
-        dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live)
-
         ignore(output.dummy(dj_live, fallible=true))
         switch(id="live_dj_switch", track_sensitive=false, transitions=[transition, transition], [({!live_dj_enabled},dj_live), ({true}, s)])
     else