Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

airtime_mvc/application/models/Show.php

@@ -1792,7 +1792,7 @@ SQL;
                 $show["instance_id"]);
 
             $options["show_empty"] = (array_key_exists($show['instance_id'],
-                $content_count)) ? 1 : 0;
+                $content_count)) ? 0 : 1;
 
             $events[] = &self::makeFullCalendarEvent($show, $options,
                 $startsDT, $endsDT, $startsEpochStr, $endsEpochStr);

airtime_mvc/application/models/ShowInstance.php

@@ -679,9 +679,13 @@ SQL;
             ':p_end' => $p_end->format("Y-m-d G:i:s"))
         , 'all');
 
-        return $counts;
+        $real_counts = array();
+        foreach ($counts as $c) {
+            $real_counts[$c['instance_id']] = $c['instance_count'];
+        }
+        return $real_counts;
 
-    }                                                                          
+    }
 
     public function showEmpty()
     {

install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql

@@ -140,6 +140,12 @@ ALTER TABLE cc_playlistcontents
 ALTER TABLE cc_schedule
 	ADD COLUMN stream_id integer;
 
+CREATE INDEX cc_schedule_instance_id_idx
+  ON cc_schedule
+  USING btree
+  (instance_id);
+
+
 ALTER TABLE cc_subjs
 	ADD COLUMN cell_phone character varying(255);
 

python_apps/pypo/liquidsoap_scripts/ls_lib.liq

@@ -27,7 +27,7 @@ def append_title(m) =
   end
 end
 
-def crossfade(s)
+def crossfade_airtime(s)
   #duration is automatically overwritten by metadata fields passed in
   #with audio
   s = fade.in(type="log", duration=0., s)

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -44,9 +44,9 @@ web_stream = on_metadata(notify_stream, web_stream)
 output.dummy(fallible=true, web_stream)
 
 queue = on_metadata(notify, queue)
-queue = map_metadata(update=false, append_title, queue)
+queue = map_metadata(update=true, append_title, queue)
 # the crossfade function controls fade in/out
-queue = crossfade(queue)
+queue = crossfade_airtime(queue)
 output.dummy(fallible=true, queue)