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

CC-3174 : showbuilder

Browse source 
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
This commit is contained in:
Naomi Aro 2012-02-27 21:29:02 +01:00
parent 6ecf2f94b0
commit 43d67c921d
6 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/Schedule.php
View file

@ -316,6 +316,8 @@ class Application_Model_Schedule {
si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, si.last_scheduled AS si_last_scheduled,
sched.starts AS sched_starts, sched.ends AS sched_ends, sched.id AS sched_id,
sched.cue_in AS cue_in, sched.cue_out AS cue_out,
sched.fade_in AS fade_in, sched.fade_out AS fade_out,
ft.track_title AS file_track_title, ft.artist_name AS file_artist_name,
ft.album_title AS file_album_title, ft.length AS file_length

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

@ -40,6 +40,13 @@ class Application_Model_Scheduler {
$data["cliplength"] = $file->getDbLength();
$data["cueout"] = $file->getDbLength();
$defaultFade = Application_Model_Preference::GetDefaultFade();
if ($defaultFade !== "") {
//fade is in format SS.uuuuuu
$data["fadein"] = $defaultFade;
$data["fadeout"] = $defaultFade;
}
$files[] = $data;
}
}

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

@ -26,7 +26,11 @@ class Application_Model_ShowBuilder {
"title" => "",
"creator" => "",
"album" => "",
"timestamp" => null
"timestamp" => null,
"cuein" => "",
"cueout" => "",
"fadein" => "",
"fadeout" => ""
);
/*
@ -184,6 +188,11 @@ class Application_Model_ShowBuilder {
$row["creator"] = $p_item["file_artist_name"];
$row["album"] = $p_item["file_album_title"];
$row["cuein"] = $p_item["cue_in"];
$row["cueout"] = $p_item["cue_out"];
$row["fadein"] = $p_item["fade_in"];
$row["fadeout"] = $p_item["fade_out"];
$this->contentDT = $schedEndDT;
}
//show is empty

2
airtime_mvc/application/models/airtime/CcSchedule.php
View file

@ -176,7 +176,7 @@ class CcSchedule extends BaseCcSchedule {
}
}
$this->fadeIout = $dt->format('H:i:s.u');
$this->fade_out = $dt->format('H:i:s.u');
$this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
return $this;