Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-5424 : Same webstream playing will switch off ON AIR light

This commit is contained in:
Naomi 2013-10-16 12:26:39 -04:00
parent 936ea714f3
commit 109b313d37
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/application/models/Schedule.php
View File

@ -814,7 +814,6 @@ SQL;
'start' => $start, 'start' => $start,
'end' => $end, 'end' => $end,
'show_name' => $item["show_name"], 'show_name' => $item["show_name"],
'row_id' => $item["id"],
'independent_event' => true 'independent_event' => true
); );
self::appendScheduleItem($data, $start, $schedule_item); self::appendScheduleItem($data, $start, $schedule_item);
@ -909,12 +908,14 @@ SQL;
$storedFile = Application_Model_StoredFile::RecallById($media_id); $storedFile = Application_Model_StoredFile::RecallById($media_id);
$uri = $storedFile->getFilePath(); $uri = $storedFile->getFilePath();
self::createFileScheduleEvent($data, $item, $media_id, $uri); self::createFileScheduleEvent($data, $item, $media_id, $uri);
} elseif (!is_null($item['stream_id'])) { }
elseif (!is_null($item['stream_id'])) {
//row is type "webstream" //row is type "webstream"
$media_id = $item['stream_id']; $media_id = $item['stream_id'];
$uri = $item['url']; $uri = $item['url'];
self::createStreamScheduleEvent($data, $item, $media_id, $uri); self::createStreamScheduleEvent($data, $item, $media_id, $uri);
} else { }
else {
throw new Exception("Unknown schedule type: ".print_r($item, true)); throw new Exception("Unknown schedule type: ".print_r($item, true));
} }
@ -991,7 +992,7 @@ SQL;
self::createInputHarborKickTimes($data, $range_start, $range_end); self::createInputHarborKickTimes($data, $range_start, $range_end);
self::createScheduledEvents($data, $range_start, $range_end); self::createScheduledEvents($data, $range_start, $range_end);
self::foldData($data["media"]); //self::foldData($data["media"]);
return $data; return $data;
} }