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

4
airtime_mvc/application/forms/GeneralPreferences.php
View file

@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$defaultFade = Application_Model_Preference::GetDefaultFade(); $defaultFade = Application_Model_Preference::GetDefaultFade();
if($defaultFade == ""){ if($defaultFade == ""){
$defaultFade = '00.500000'; $defaultFade = '00.000000';
} }
//Station name //Station name
@ -29,7 +29,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
//Default station fade //Default station fade
$this->addElement('text', 'stationDefaultFade', array( $this->addElement('text', 'stationDefaultFade', array(
'class' => 'input_text', 'class' => 'input_text',
'label' => 'Default Fade:', 'label' => 'Default Fade (s):',
'required' => false, 'required' => false,
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array(array('regex', false, 'validators' => array(array('regex', false,

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, 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.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.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 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["cliplength"] = $file->getDbLength();
$data["cueout"] = $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; $files[] = $data;
} }
} }

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

@ -26,7 +26,11 @@ class Application_Model_ShowBuilder {
"title" => "", "title" => "",
"creator" => "", "creator" => "",
"album" => "", "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["creator"] = $p_item["file_artist_name"];
$row["album"] = $p_item["file_album_title"]; $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; $this->contentDT = $schedEndDT;
} }
//show is empty //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; $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
return $this; return $this;

6
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -201,7 +201,11 @@ $(document).ready(function() {
/* runtime */{"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length"}, /* runtime */{"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length"},
/* title */{"mDataProp": "title", "sTitle": "Title"}, /* title */{"mDataProp": "title", "sTitle": "Title"},
/* creator */{"mDataProp": "creator", "sTitle": "Creator"}, /* creator */{"mDataProp": "creator", "sTitle": "Creator"},
/* album */{"mDataProp": "album", "sTitle": "Album"} /* album */{"mDataProp": "album", "sTitle": "Album"},
/* cue in */{"mDataProp": "cuein", "sTitle": "Cue In", "bVisible": false},
/* cue out */{"mDataProp": "cueout", "sTitle": "Cue Out", "bVisible": false},
/* fade in */{"mDataProp": "fadein", "sTitle": "Fade In", "bVisible": false},
/* fade out */{"mDataProp": "fadeout", "sTitle": "Fade Out", "bVisible": false}
], ],
"bJQueryUI": true, "bJQueryUI": true,