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

CC-3174 : showbuilder

Browse source 
fixing jplayer preview
This commit is contained in:
Naomi Aro 2012-03-27 16:27:43 +02:00
parent dfc6ae6273
commit 9c52b2ee1f
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/models/ShowBuilder.php
View file

@ -14,7 +14,8 @@ class Application_Model_ShowBuilder {
private $user;
private $opts;
private $pos;
private $contentDT;
private $epoch_now;
@ -209,6 +210,8 @@ class Application_Model_ShowBuilder {
$row["cueout"] = $p_item["cue_out"];
$row["fadein"] = round(substr($p_item["fade_in"], 6), 6);
$row["fadeout"] = round(substr($p_item["fade_out"], 6), 6);
$row["pos"] = $this->pos++;
$this->contentDT = $schedEndDT;
}
@ -332,6 +335,8 @@ class Application_Model_ShowBuilder {
$display_items[] = $this->makeHeaderRow($item);
$current_id = $item["si_id"];
$this->pos = 1;
}
//make a normal data row.

3
airtime_mvc/application/models/ShowInstance.php
View file

@ -657,7 +657,8 @@ class Application_Model_ShowInstance {
$sql = "SELECT *
FROM (cc_schedule AS s LEFT JOIN cc_files AS f ON f.id = s.file_id)
WHERE s.instance_id = '{$this->_instanceId}' ORDER BY starts";
WHERE s.instance_id = '{$this->_instanceId}' AND s.playout_status >= 0
ORDER BY starts";
Logging::log($sql);