CC-4473: On Air button greys out when one out of two same Webstreams is cancelled

-fixed

airtime_mvc/application/models/Schedule.php

@@ -696,6 +696,7 @@ SQL;
             'start'             => $start,
             'end'               => $end,
             'show_name'         => $item["show_name"],
+            'row_id'            => $item["id"],
             'independent_event' => true
         );
         self::appendScheduleItem($data, $start, $schedule_item);

airtime_mvc/application/models/Webstream.php

@@ -216,9 +216,9 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
     }
 
     // TODO : Fix this interface
+    //This function should not be defined in the interface.
     public function setMetadata($key, $val)
     {
-        //This function should not be defined in the interface.
         throw new Exception("Not implemented.");
     }
 

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -41,11 +41,13 @@ stream_harbor_pass = list.hd(get_process_lines('pwgen -s -N 1 -n 20'))
 
 web_stream = input.harbor("test-harbor", port=8999, password=stream_harbor_pass)
 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)
 # the crossfade function controls fade in/out
 queue = crossfade(queue)
+output.dummy(fallible=true, queue)
 
 
 stream_queue = switch(id="stream_queue_switch", track_sensitive=false, 

python_apps/pypo/pypopush.py

@@ -191,7 +191,7 @@ class PypoPush(Thread):
                 if self.current_stream_info is None:
                     correct = False
                 else:
-                    correct = self.current_stream_info['uri'] == media_item['uri']
+                    correct = self.current_stream_info['row_id'] == media_item['row_id']
 
         self.logger.debug("Is current item correct?: %s", str(correct))
         return correct