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

Merge branch 'CC-2301'

Browse source
This commit is contained in:
Naomi 2013-05-03 16:15:39 -04:00
commit 6bdc2caaec
40 changed files with 4204 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

18
airtime_mvc/application/controllers/LibraryController.php
View file

@ -52,6 +52,24 @@ class LibraryController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/observer/observer.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/config.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/curves.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/fades.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/local_storage.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/controls.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/playout.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/track_render.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/track.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/time_scale.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/playlist.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
//arbitrary attributes need to be allowed to set an id for the templates.
$this->view->headScript()->setAllowArbitraryAttributes(true);
//$this->view->headScript()->appendScript(file_get_contents(APPLICATION_PATH.'/../public/js/waveformplaylist/templates/bottombar.tpl'),
// 'text/template', array('id' => 'tpl_playlist_cues', 'noescape' => true));
$this->view->headLink()->appendStylesheet($baseUrl.'css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
try {

28
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -10,6 +10,7 @@ class PlaylistController extends Zend_Controller_Action
->addActionContext('move-items', 'json')
->addActionContext('delete-items', 'json')
->addActionContext('set-fade', 'json')
->addActionContext('set-crossfade', 'json')
->addActionContext('set-cue', 'json')
->addActionContext('new', 'json')
->addActionContext('edit', 'json')
@ -417,6 +418,33 @@ class PlaylistController extends Zend_Controller_Action
$this->playlistUnknownError($e);
}
}
public function setCrossfadeAction()
{
$id1 = $this->_getParam('id1');
$id2 = $this->_getParam('id2');
$type = $this->_getParam('type');
$fadeIn = $this->_getParam('fadeIn', 0);
$fadeOut = $this->_getParam('fadeOut', 0);
$offset = $this->_getParam('offset', 0);
try {
$obj = $this->getPlaylist($type);
$response = $obj->createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset);
if (!isset($response["error"])) {
$this->createUpdateResponse($obj);
} else {
$this->view->error = $response["error"];
}
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
}
public function getPlaylistFadesAction()
{

4
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -43,7 +43,9 @@ class PreferenceController extends Zend_Controller_Action
if ($form->isValid($values)) {
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetDefaultFade($values["stationDefaultFade"]);
Application_Model_Preference::SetDefaultCrossfadeDuration($values["stationDefaultCrossfadeDuration"]);
Application_Model_Preference::SetDefaultFadeIn($values["stationDefaultFadeIn"]);
Application_Model_Preference::SetDefaultFadeOut($values["stationDefaultFadeOut"]);
Application_Model_Preference::SetAllow3rdPartyApi($values["thirdPartyApi"]);
Application_Model_Preference::SetDefaultLocale($values["locale"]);
Application_Model_Preference::SetDefaultTimezone($values["timezone"]);

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

@ -12,11 +12,9 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
array('ViewScript', array('viewScript' => 'form/preferences_general.phtml'))
));
$defaultFade = Application_Model_Preference::GetDefaultFade();
if ($defaultFade == "") {
$defaultFade = '0.5';
}
$defaultFadeIn = Application_Model_Preference::GetDefaultFadeIn();
$defaultFadeOut = Application_Model_Preference::GetDefaultFadeOut();
//Station name
$this->addElement('text', 'stationName', array(
'class' => 'input_text',
@ -28,11 +26,30 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
'ViewHelper'
)
));
//Default station fade in
$this->addElement('text', 'stationDefaultCrossfadeDuration', array(
'class' => 'input_text',
'label' => _('Default Crossfade Duration (s):'),
'required' => true,
'filters' => array('StringTrim'),
'validators' => array(
array(
$rangeValidator,
$notEmptyValidator,
'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
)
),
'value' => Application_Model_Preference::GetDefaultCrossfadeDuration(),
'decorators' => array(
'ViewHelper'
)
));
//Default station fade
$this->addElement('text', 'stationDefaultFade', array(
//Default station fade in
$this->addElement('text', 'stationDefaultFadeIn', array(
'class' => 'input_text',
'label' => _('Default Fade (s):'),
'label' => _('Default Fade In (s):'),
'required' => true,
'filters' => array('StringTrim'),
'validators' => array(
@ -42,11 +59,30 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
)
),
'value' => $defaultFade,
'value' => $defaultFadeIn,
'decorators' => array(
'ViewHelper'
)
));
//Default station fade out
$this->addElement('text', 'stationDefaultFadeOut', array(
'class' => 'input_text',
'label' => _('Default Fade Out (s):'),
'required' => true,
'filters' => array('StringTrim'),
'validators' => array(
array(
$rangeValidator,
$notEmptyValidator,
'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
)
),
'value' => $defaultFadeOut,
'decorators' => array(
'ViewHelper'
)
));
$third_party_api = new Zend_Form_Element_Radio('thirdPartyApi');
$third_party_api->setLabel(

41
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -33,5 +33,46 @@
</div>
<div class="wrapper" id="content"><?php echo $this->layout()->content ?></div>
<script id="tmpl-pl-cues" type="text/template">
<div class="waveform-cues">
<div class="playlist-tracks"></div>
<div class="playlist-controls">
<span class="btn_play ui-state-default">Play</span>
<span class="btn_stop ui-state-default">Stop</span>
</div>
<div>
<input type="text" class="audio_start">
<input type="button" class="set-cue-in" value="Set Cue In">
<input type="text" class="audio_end">
<input type="button" class="set-cue-out" value="Set Cue Out">
<input type="text" class="audio_pos">
</div>
<div>
<label for="editor-cue-in">Cue In</label>
<input type="text" id="editor-cue-in" class="editor-cue-in">
<span style="display:none" class="cue-in-error"></span>
<label for="editor-cue-out">Cue Out</label>
<input type="text" id="editor-cue-out" class="editor-cue-out">
<span style="display:none" class="cue-out-error"></span>
</div>
</div>
</script>
<script id="tmpl-pl-fades" type="text/template">
<div class="waveform-fades">
<div class="playlist-tracks"></div>
<div>
<span class="btn_play ui-state-default">Play</span>
<span class="btn_stop ui-state-default">Stop</span>
</div>
<div>
<span class="btn_select ui-state-default" data-state="cursor">Cursor</span>
<span class="btn_fadein ui-state-default" data-state="fadein">Fade In</span>
<span class="btn_fadeout ui-state-default" data-state="fadeout">Fade Out</span>
<span class="btn_shift ui-state-default" data-state="shift">Shift</span>
</div>
</div>
</script>
</body>
</html>

49
airtime_mvc/application/models/Block.php
View file

@ -99,13 +99,8 @@ class Application_Model_Block implements Application_Model_LibraryEditable
$this->block->save();
}
$defaultFade = Application_Model_Preference::GetDefaultFade();
if ($defaultFade !== "") {
//fade is in format SS.uuuuuu
$this->blockItem["fadein"] = $defaultFade;
$this->blockItem["fadeout"] = $defaultFade;
}
$this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME);
$this->id = $this->block->getDbId();
@ -200,6 +195,7 @@ SELECT pc.id AS id,
pc.cueout,
pc.fadein,
pc.fadeout,
pc.trackoffset,
bl.type,
f.LENGTH AS orig_length,
f.id AS item_id,
@ -234,7 +230,15 @@ SQL;
foreach ($rows as &$row) {
$clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
$row['trackSec'] = $clipSec;
$row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
$row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
$trackoffset = $row['trackoffset'];
$offset += $clipSec;
$offset -= $trackoffset;
$offset_cliplength = Application_Common_DateHelper::secondsToPlaylistTime($offset);
//format the length for UI.
@ -668,6 +672,29 @@ SQL;
return array($fadeIn, $fadeOut);
}
/*
* create a crossfade from item in cc_playlist_contents with $id1 to item $id2.
*
* $fadeOut length of fade out in seconds if $id1
* $fadeIn length of fade in in seconds of $id2
* $offset time in seconds from end of $id1 that $id2 will begin to play.
*/
public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset)
{
$this->con->beginTransaction();
try {
$this->changeFadeInfo($id1, null, $fadeOut);
$this->changeFadeInfo($id2, $fadeIn, null, $offset);
$this->con->commit();
} catch (Exception $e) {
$this->con->rollback();
throw $e;
}
}
/**
* Change fadeIn and fadeOut values for block Element
@ -680,7 +707,7 @@ SQL;
* new value in ss.ssssss or extent format
* @return boolean
*/
public function changeFadeInfo($id, $fadeIn, $fadeOut)
public function changeFadeInfo($id, $fadeIn, $fadeOut, $offset=null)
{
//See issue CC-2065, pad the fadeIn and fadeOut so that it is TIME compatable with the DB schema
//For the top level PlayList either fadeIn or fadeOut will sometimes be Null so need a gaurd against
@ -714,6 +741,12 @@ SQL;
}
$row->setDbFadein($fadeIn);
if (!is_null($offset)) {
$row->setDbTrackOffset($offset);
Logging::info("Setting offset {$offset} on item {$id}");
$row->save($this->con);
}
}
if (!is_null($fadeOut)) {

61
airtime_mvc/application/models/Playlist.php
View file

@ -36,6 +36,7 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
"cueout" => "00:00:00",
"fadein" => "0.0",
"fadeout" => "0.0",
"crossfadeDuration" => 0
);
//using propel's phpNames.
@ -60,13 +61,9 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
$this->pl->save();
}
$defaultFade = Application_Model_Preference::GetDefaultFade();
if ($defaultFade !== "") {
//fade is in format SS.uuuuuu
$this->plItem["fadein"] = $defaultFade;
$this->plItem["fadeout"] = $defaultFade;
}
$this->plItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$this->plItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$this->plItem["crossfadeDuration"] = Application_Model_Preference::GetDefaultCrossfadeDuration();
$this->con = isset($con) ? $con : Propel::getConnection(CcPlaylistPeer::DATABASE_NAME);
$this->id = $this->pl->getDbId();
@ -166,6 +163,7 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
pc.cueout,
pc.fadein,
pc.fadeout,
pc.trackoffset,
f.id AS item_id,
f.track_title,
f.artist_name AS creator,
@ -193,6 +191,7 @@ SQL;
pc.cueout,
pc.fadein,
pc.fadeout,
pc.trackoffset,
ws.id AS item_id,
(ws.name || ': ' || ws.url) AS title,
sub.login AS creator,
@ -213,6 +212,7 @@ SQL;
pc.cueout,
pc.fadein,
pc.fadeout,
pc.trackoffset,
bl.id AS item_id,
bl.name AS title,
sbj.login AS creator,
@ -227,6 +227,7 @@ SQL;
AND pc.TYPE = 2)) AS temp
ORDER BY temp.position;
SQL;
//Logging::info($sql);
$params = array(
':playlist_id1'=>$this->id, ':playlist_id2'=>$this->id, ':playlist_id3'=>$this->id);
@ -238,8 +239,18 @@ SQL;
$offset = 0;
foreach ($rows as &$row) {
//Logging::info($row);
$clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
$row['trackSec'] = $clipSec;
$row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
$row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
$trackoffset = $row['trackoffset'];
$offset += $clipSec;
$offset -= $trackoffset;
$offset_cliplength = Application_Common_DateHelper::secondsToPlaylistTime($offset);
//format the length for UI.
@ -356,6 +367,7 @@ SQL;
$row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]));
if ($info["ftype"] == "audioclip") {
$row->setDbFileId($info["id"]);
$row->setDbTrackOffset($info["crossfadeDuration"]);
$type = 0;
} elseif ($info["ftype"] == "stream") {
$row->setDbStreamId($info["id"]);
@ -645,19 +657,42 @@ SQL;
return array($fadeIn, $fadeOut);
}
/*
* create a crossfade from item in cc_playlist_contents with $id1 to item $id2.
*
* $fadeOut length of fade out in seconds if $id1
* $fadeIn length of fade in in seconds of $id2
* $offset time in seconds from end of $id1 that $id2 will begin to play.
*/
public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset)
{
$this->con->beginTransaction();
try {
$this->changeFadeInfo($id1, null, $fadeOut);
$this->changeFadeInfo($id2, $fadeIn, null, $offset);
$this->con->commit();
} catch (Exception $e) {
$this->con->rollback();
throw $e;
}
}
/**
* Change fadeIn and fadeOut values for playlist Element
*
* @param int $pos
* position of audioclip in playlist
* @param int $id
* id of audioclip in playlist contents table.
* @param string $fadeIn
* new value in ss.ssssss or extent format
* @param string $fadeOut
* new value in ss.ssssss or extent format
* @return boolean
*/
public function changeFadeInfo($id, $fadeIn, $fadeOut)
public function changeFadeInfo($id, $fadeIn, $fadeOut, $offset=null)
{
//See issue CC-2065, pad the fadeIn and fadeOut so that it is TIME compatable with the DB schema
//For the top level PlayList either fadeIn or fadeOut will sometimes be Null so need a gaurd against
@ -683,6 +718,12 @@ SQL;
$fadeIn = $clipLength;
}
$row->setDbFadein($fadeIn);
if (!is_null($offset)) {
$row->setDbTrackOffset($offset);
Logging::info("Setting offset {$offset} on item {$id}");
$row->save($this->con);
}
}
if (!is_null($fadeOut)) {

51
airtime_mvc/application/models/Preference.php
View file

@ -194,6 +194,57 @@ class Application_Model_Preference
return new DateTime($date, new DateTimeZone("UTC"));
}
}
public static function SetDefaultCrossfadeDuration($duration)
{
self::setValue("default_crossfade_duration", $duration);
}
public static function GetDefaultCrossfadeDuration()
{
$duration = self::getValue("default_crossfade_duration");
if ($duration === "") {
// the default value of the fade is 00.5
return "0";
}
return $duration;
}
public static function SetDefaultFadeIn($fade)
{
self::setValue("default_fade_in", $fade);
}
public static function GetDefaultFadeIn()
{
$fade = self::getValue("default_fade_in");
if ($fade === "") {
// the default value of the fade is 00.5
return "00.5";
}
return $fade;
}
public static function SetDefaultFadeOut($fade)
{
self::setValue("default_fade_out", $fade);
}
public static function GetDefaultFadeOut()
{
$fade = self::getValue("default_fade_out");
if ($fade === "") {
// the default value of the fade is 00.5
return "00.5";
}
return $fade;
}
public static function SetDefaultFade($fade)
{

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

@ -17,6 +17,8 @@ class Application_Model_Scheduler
private $epochNow;
private $nowDT;
private $user;
private $crossfadeDuration;
private $checkUserPermissions = true;
@ -38,6 +40,8 @@ class Application_Model_Scheduler
}
$this->user = Application_Model_User::getCurrentUser();
$this->crossfadeDuration = Application_Model_Preference::GetDefaultCrossfadeDuration();
}
public function setCheckUserPermissions($value)
@ -201,12 +205,9 @@ class Application_Model_Scheduler
$data["cuein"] = $file->getDbCuein();
$data["cueout"] = $file->getDbCueout();
$defaultFade = Application_Model_Preference::GetDefaultFade();
if (isset($defaultFade)) {
//fade is in format SS.uuuuuu
$data["fadein"] = $defaultFade;
$data["fadeout"] = $defaultFade;
}
//fade is in format SS.uuuuuu
$data["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$data["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$files[] = $data;
}
@ -260,12 +261,11 @@ class Application_Model_Scheduler
$cuein = Application_Common_DateHelper::calculateLengthInSeconds($data["cuein"]);
$cueout = Application_Common_DateHelper::calculateLengthInSeconds($data["cueout"]);
$data["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cueout - $cuein);
$defaultFade = Application_Model_Preference::GetDefaultFade();
if (isset($defaultFade)) {
//fade is in format SS.uuuuuu
$data["fadein"] = $defaultFade;
$data["fadeout"] = $defaultFade;
}
//fade is in format SS.uuuuuu
$data["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$data["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$data["type"] = 0;
$files[] = $data;
}
@ -286,12 +286,9 @@ class Application_Model_Scheduler
$data["cueout"] = $stream->getDbLength();
$data["type"] = 1;
$defaultFade = Application_Model_Preference::GetDefaultFade();
if (isset($defaultFade)) {
//fade is in format SS.uuuuuu
$data["fadein"] = $defaultFade;
$data["fadeout"] = $defaultFade;
}
//fade is in format SS.uuuuuu
$data["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$data["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$files[] = $data;
}
@ -321,12 +318,11 @@ class Application_Model_Scheduler
$cuein = Application_Common_DateHelper::calculateLengthInSeconds($data["cuein"]);
$cueout = Application_Common_DateHelper::calculateLengthInSeconds($data["cueout"]);
$data["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cueout - $cuein);
$defaultFade = Application_Model_Preference::GetDefaultFade();
if (isset($defaultFade)) {
//fade is in format SS.uuuuuu
$data["fadein"] = $defaultFade;
$data["fadeout"] = $defaultFade;
}
//fade is in format SS.uuuuuu
$data["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$data["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$data["type"] = 0;
$files[] = $data;
}
@ -336,6 +332,31 @@ class Application_Model_Scheduler
return $files;
}
/*
* @param DateTime startDT in UTC
* @param string duration
* in format H:i:s.u (could be more that 24 hours)
*
* @return DateTime endDT in UTC
*/
private function findTimeDifference($p_startDT, $p_seconds)
{
$startEpoch = $p_startDT->format("U.u");
//add two float numbers to 6 subsecond precision
//DateTime::createFromFormat("U.u") will have a problem if there is no decimal in the resulting number.
$newEpoch = bcsub($startEpoch , (string) $p_seconds, 6);
$dt = DateTime::createFromFormat("U.u", $newEpoch, new DateTimeZone("UTC"));
if ($dt === false) {
//PHP 5.3.2 problem
$dt = DateTime::createFromFormat("U", intval($newEpoch), new DateTimeZone("UTC"));
}
return $dt;
}
/*
* @param DateTime startDT in UTC
@ -393,6 +414,43 @@ class Application_Model_Scheduler
return $nextDT;
}
/*
* @param int $showInstance
* This function recalculates the start/end times of items in a gapless show to
* account for crossfade durations.
*/
private function calculateCrossfades($showInstance)
{
Logging::info("adjusting start, end times of scheduled items to account for crossfades show instance #".$showInstance);
$instance = CcShowInstancesQuery::create()->findPK($showInstance, $this->con);
if (is_null($instance)) {
throw new OutDatedScheduleException(_("The schedule you're viewing is out of date!"));
}
$itemStartDT = $instance->getDbStarts(null);
$itemEndDT = null;
$schedule = CcScheduleQuery::create()
->filterByDbInstanceId($showInstance)
->orderByDbStarts()
->find($this->con);
foreach ($schedule as $item) {
$itemEndDT = $item->getDbEnds(null);
$item
->setDbStarts($itemStartDT)
->setDbEnds($itemEndDT);
$itemStartDT = $this->findTimeDifference($itemEndDT, $this->crossfadeDuration);
$itemEndDT = $this->findEndTime($itemStartDT, $item->getDbClipLength());
}
$schedule->save($this->con);
}
/*
* @param int $showInstance
@ -648,6 +706,8 @@ class Application_Model_Scheduler
$pend = microtime(true);
Logging::debug("adjusting all following items.");
Logging::debug(floatval($pend) - floatval($pstart));
$this->calculateCrossfades($instance->getDbId());
}
}//for each instance
@ -929,6 +989,7 @@ class Application_Model_Scheduler
foreach ($showInstances as $instance) {
$this->removeGaps($instance);
$this->calculateCrossfades($instance);
}
}

1
airtime_mvc/application/models/airtime/map/CcBlockcontentsTableMap.php
View file

@ -42,6 +42,7 @@ class CcBlockcontentsTableMap extends TableMap {
$this->addForeignKey('BLOCK_ID', 'DbBlockId', 'INTEGER', 'cc_block', 'ID', false, null, null);
$this->addForeignKey('FILE_ID', 'DbFileId', 'INTEGER', 'cc_files', 'ID', false, null, null);
$this->addColumn('POSITION', 'DbPosition', 'INTEGER', false, null, null);
$this->addColumn('TRACKOFFSET', 'DbTrackOffset', 'REAL', true, null, 0);
$this->addColumn('CLIPLENGTH', 'DbCliplength', 'VARCHAR', false, null, '00:00:00');
$this->addColumn('CUEIN', 'DbCuein', 'VARCHAR', false, null, '00:00:00');
$this->addColumn('CUEOUT', 'DbCueout', 'VARCHAR', false, null, '00:00:00');

1
airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
View file

@ -45,6 +45,7 @@ class CcPlaylistcontentsTableMap extends TableMap {
$this->addColumn('STREAM_ID', 'DbStreamId', 'INTEGER', false, null, null);
$this->addColumn('TYPE', 'DbType', 'SMALLINT', true, null, 0);
$this->addColumn('POSITION', 'DbPosition', 'INTEGER', false, null, null);
$this->addColumn('TRACKOFFSET', 'DbTrackOffset', 'REAL', true, null, 0);
$this->addColumn('CLIPLENGTH', 'DbCliplength', 'VARCHAR', false, null, '00:00:00');
$this->addColumn('CUEIN', 'DbCuein', 'VARCHAR', false, null, '00:00:00');
$this->addColumn('CUEOUT', 'DbCueout', 'VARCHAR', false, null, '00:00:00');

102
airtime_mvc/application/models/airtime/om/BaseCcBlockcontents.php
View file

@ -48,6 +48,13 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
*/
protected $position;
/**
* The value for the trackoffset field.
* Note: this column has a database default value of: 0
* @var double
*/
protected $trackoffset;
/**
* The value for the cliplength field.
* Note: this column has a database default value of: '00:00:00'
@ -118,6 +125,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
*/
public function applyDefaultValues()
{
$this->trackoffset = 0;
$this->cliplength = '00:00:00';
$this->cuein = '00:00:00';
$this->cueout = '00:00:00';
@ -175,6 +183,16 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
return $this->position;
}
/**
* Get the [trackoffset] column value.
*
* @return double
*/
public function getDbTrackOffset()
{
return $this->trackoffset;
}
/**
* Get the [cliplength] column value.
*
@ -359,6 +377,26 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
return $this;
} // setDbPosition()
/**
* Set the value of [trackoffset] column.
*
* @param double $v new value
* @return CcBlockcontents The current object (for fluent API support)
*/
public function setDbTrackOffset($v)
{
if ($v !== null) {
$v = (double) $v;
}
if ($this->trackoffset !== $v || $this->isNew()) {
$this->trackoffset = $v;
$this->modifiedColumns[] = CcBlockcontentsPeer::TRACKOFFSET;
}
return $this;
} // setDbTrackOffset()
/**
* Set the value of [cliplength] column.
*
@ -529,6 +567,10 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
*/
public function hasOnlyDefaultValues()
{
if ($this->trackoffset !== 0) {
return false;
}
if ($this->cliplength !== '00:00:00') {
return false;
}
@ -575,11 +617,12 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
$this->block_id = ($row[$startcol + 1] !== null) ? (int) $row[$startcol + 1] : null;
$this->file_id = ($row[$startcol + 2] !== null) ? (int) $row[$startcol + 2] : null;
$this->position = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null;
$this->cliplength = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null;
$this->cuein = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
$this->cueout = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
$this->fadein = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
$this->fadeout = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
$this->trackoffset = ($row[$startcol + 4] !== null) ? (double) $row[$startcol + 4] : null;
$this->cliplength = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
$this->cuein = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
$this->cueout = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
$this->fadein = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
$this->fadeout = ($row[$startcol + 9] !== null) ? (string) $row[$startcol + 9] : null;
$this->resetModified();
$this->setNew(false);
@ -588,7 +631,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
$this->ensureConsistency();
}
return $startcol + 9; // 9 = CcBlockcontentsPeer::NUM_COLUMNS - CcBlockcontentsPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 10; // 10 = CcBlockcontentsPeer::NUM_COLUMNS - CcBlockcontentsPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating CcBlockcontents object", $e);
@ -947,18 +990,21 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
return $this->getDbPosition();
break;
case 4:
return $this->getDbCliplength();
return $this->getDbTrackOffset();
break;
case 5:
return $this->getDbCuein();
return $this->getDbCliplength();
break;
case 6:
return $this->getDbCueout();
return $this->getDbCuein();
break;
case 7:
return $this->getDbFadein();
return $this->getDbCueout();
break;
case 8:
return $this->getDbFadein();
break;
case 9:
return $this->getDbFadeout();
break;
default:
@ -989,11 +1035,12 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
$keys[1] => $this->getDbBlockId(),
$keys[2] => $this->getDbFileId(),
$keys[3] => $this->getDbPosition(),
$keys[4] => $this->getDbCliplength(),
$keys[5] => $this->getDbCuein(),
$keys[6] => $this->getDbCueout(),
$keys[7] => $this->getDbFadein(),
$keys[8] => $this->getDbFadeout(),
$keys[4] => $this->getDbTrackOffset(),
$keys[5] => $this->getDbCliplength(),
$keys[6] => $this->getDbCuein(),
$keys[7] => $this->getDbCueout(),
$keys[8] => $this->getDbFadein(),
$keys[9] => $this->getDbFadeout(),
);
if ($includeForeignObjects) {
if (null !== $this->aCcFiles) {
@ -1046,18 +1093,21 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
$this->setDbPosition($value);
break;
case 4:
$this->setDbCliplength($value);
$this->setDbTrackOffset($value);
break;
case 5:
$this->setDbCuein($value);
$this->setDbCliplength($value);
break;
case 6:
$this->setDbCueout($value);
$this->setDbCuein($value);
break;
case 7:
$this->setDbFadein($value);
$this->setDbCueout($value);
break;
case 8:
$this->setDbFadein($value);
break;
case 9:
$this->setDbFadeout($value);
break;
} // switch()
@ -1088,11 +1138,12 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
if (array_key_exists($keys[1], $arr)) $this->setDbBlockId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setDbFileId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setDbPosition($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setDbCliplength($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setDbCuein($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setDbCueout($arr[$keys[6]]);
if (array_key_exists($keys[7], $arr)) $this->setDbFadein($arr[$keys[7]]);
if (array_key_exists($keys[8], $arr)) $this->setDbFadeout($arr[$keys[8]]);
if (array_key_exists($keys[4], $arr)) $this->setDbTrackOffset($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setDbCliplength($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setDbCuein($arr[$keys[6]]);
if (array_key_exists($keys[7], $arr)) $this->setDbCueout($arr[$keys[7]]);
if (array_key_exists($keys[8], $arr)) $this->setDbFadein($arr[$keys[8]]);
if (array_key_exists($keys[9], $arr)) $this->setDbFadeout($arr[$keys[9]]);
}
/**
@ -1108,6 +1159,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
if ($this->isColumnModified(CcBlockcontentsPeer::BLOCK_ID)) $criteria->add(CcBlockcontentsPeer::BLOCK_ID, $this->block_id);
if ($this->isColumnModified(CcBlockcontentsPeer::FILE_ID)) $criteria->add(CcBlockcontentsPeer::FILE_ID, $this->file_id);
if ($this->isColumnModified(CcBlockcontentsPeer::POSITION)) $criteria->add(CcBlockcontentsPeer::POSITION, $this->position);
if ($this->isColumnModified(CcBlockcontentsPeer::TRACKOFFSET)) $criteria->add(CcBlockcontentsPeer::TRACKOFFSET, $this->trackoffset);
if ($this->isColumnModified(CcBlockcontentsPeer::CLIPLENGTH)) $criteria->add(CcBlockcontentsPeer::CLIPLENGTH, $this->cliplength);
if ($this->isColumnModified(CcBlockcontentsPeer::CUEIN)) $criteria->add(CcBlockcontentsPeer::CUEIN, $this->cuein);
if ($this->isColumnModified(CcBlockcontentsPeer::CUEOUT)) $criteria->add(CcBlockcontentsPeer::CUEOUT, $this->cueout);
@ -1177,6 +1229,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
$copyObj->setDbBlockId($this->block_id);
$copyObj->setDbFileId($this->file_id);
$copyObj->setDbPosition($this->position);
$copyObj->setDbTrackOffset($this->trackoffset);
$copyObj->setDbCliplength($this->cliplength);
$copyObj->setDbCuein($this->cuein);
$copyObj->setDbCueout($this->cueout);
@ -1336,6 +1389,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent
$this->block_id = null;
$this->file_id = null;
$this->position = null;
$this->trackoffset = null;
$this->cliplength = null;
$this->cuein = null;
$this->cueout = null;

31
airtime_mvc/application/models/airtime/om/BaseCcBlockcontentsPeer.php
View file

@ -26,7 +26,7 @@ abstract class BaseCcBlockcontentsPeer {
const TM_CLASS = 'CcBlockcontentsTableMap';
/** The total number of columns. */
const NUM_COLUMNS = 9;
const NUM_COLUMNS = 10;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@ -43,6 +43,9 @@ abstract class BaseCcBlockcontentsPeer {
/** the column name for the POSITION field */
const POSITION = 'cc_blockcontents.POSITION';
/** the column name for the TRACKOFFSET field */
const TRACKOFFSET = 'cc_blockcontents.TRACKOFFSET';
/** the column name for the CLIPLENGTH field */
const CLIPLENGTH = 'cc_blockcontents.CLIPLENGTH';
@ -74,12 +77,12 @@ abstract class BaseCcBlockcontentsPeer {
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbBlockId', 'DbFileId', 'DbPosition', 'DbCliplength', 'DbCuein', 'DbCueout', 'DbFadein', 'DbFadeout', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbBlockId', 'dbFileId', 'dbPosition', 'dbCliplength', 'dbCuein', 'dbCueout', 'dbFadein', 'dbFadeout', ),
BasePeer::TYPE_COLNAME => array (self::ID, self::BLOCK_ID, self::FILE_ID, self::POSITION, self::CLIPLENGTH, self::CUEIN, self::CUEOUT, self::FADEIN, self::FADEOUT, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'BLOCK_ID', 'FILE_ID', 'POSITION', 'CLIPLENGTH', 'CUEIN', 'CUEOUT', 'FADEIN', 'FADEOUT', ),
BasePeer::TYPE_FIELDNAME => array ('id', 'block_id', 'file_id', 'position', 'cliplength', 'cuein', 'cueout', 'fadein', 'fadeout', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbBlockId', 'DbFileId', 'DbPosition', 'DbTrackOffset', 'DbCliplength', 'DbCuein', 'DbCueout', 'DbFadein', 'DbFadeout', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbBlockId', 'dbFileId', 'dbPosition', 'dbTrackOffset', 'dbCliplength', 'dbCuein', 'dbCueout', 'dbFadein', 'dbFadeout', ),
BasePeer::TYPE_COLNAME => array (self::ID, self::BLOCK_ID, self::FILE_ID, self::POSITION, self::TRACKOFFSET, self::CLIPLENGTH, self::CUEIN, self::CUEOUT, self::FADEIN, self::FADEOUT, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'BLOCK_ID', 'FILE_ID', 'POSITION', 'TRACKOFFSET', 'CLIPLENGTH', 'CUEIN', 'CUEOUT', 'FADEIN', 'FADEOUT', ),
BasePeer::TYPE_FIELDNAME => array ('id', 'block_id', 'file_id', 'position', 'trackoffset', 'cliplength', 'cuein', 'cueout', 'fadein', 'fadeout', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@ -89,12 +92,12 @@ abstract class BaseCcBlockcontentsPeer {
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbBlockId' => 1, 'DbFileId' => 2, 'DbPosition' => 3, 'DbCliplength' => 4, 'DbCuein' => 5, 'DbCueout' => 6, 'DbFadein' => 7, 'DbFadeout' => 8, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbBlockId' => 1, 'dbFileId' => 2, 'dbPosition' => 3, 'dbCliplength' => 4, 'dbCuein' => 5, 'dbCueout' => 6, 'dbFadein' => 7, 'dbFadeout' => 8, ),
BasePeer::TYPE_COLNAME => array (self::ID => 0, self::BLOCK_ID => 1, self::FILE_ID => 2, self::POSITION => 3, self::CLIPLENGTH => 4, self::CUEIN => 5, self::CUEOUT => 6, self::FADEIN => 7, self::FADEOUT => 8, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'BLOCK_ID' => 1, 'FILE_ID' => 2, 'POSITION' => 3, 'CLIPLENGTH' => 4, 'CUEIN' => 5, 'CUEOUT' => 6, 'FADEIN' => 7, 'FADEOUT' => 8, ),
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'block_id' => 1, 'file_id' => 2, 'position' => 3, 'cliplength' => 4, 'cuein' => 5, 'cueout' => 6, 'fadein' => 7, 'fadeout' => 8, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbBlockId' => 1, 'DbFileId' => 2, 'DbPosition' => 3, 'DbTrackOffset' => 4, 'DbCliplength' => 5, 'DbCuein' => 6, 'DbCueout' => 7, 'DbFadein' => 8, 'DbFadeout' => 9, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbBlockId' => 1, 'dbFileId' => 2, 'dbPosition' => 3, 'dbTrackOffset' => 4, 'dbCliplength' => 5, 'dbCuein' => 6, 'dbCueout' => 7, 'dbFadein' => 8, 'dbFadeout' => 9, ),
BasePeer::TYPE_COLNAME => array (self::ID => 0, self::BLOCK_ID => 1, self::FILE_ID => 2, self::POSITION => 3, self::TRACKOFFSET => 4, self::CLIPLENGTH => 5, self::CUEIN => 6, self::CUEOUT => 7, self::FADEIN => 8, self::FADEOUT => 9, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'BLOCK_ID' => 1, 'FILE_ID' => 2, 'POSITION' => 3, 'TRACKOFFSET' => 4, 'CLIPLENGTH' => 5, 'CUEIN' => 6, 'CUEOUT' => 7, 'FADEIN' => 8, 'FADEOUT' => 9, ),
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'block_id' => 1, 'file_id' => 2, 'position' => 3, 'trackoffset' => 4, 'cliplength' => 5, 'cuein' => 6, 'cueout' => 7, 'fadein' => 8, 'fadeout' => 9, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@ -170,6 +173,7 @@ abstract class BaseCcBlockcontentsPeer {
$criteria->addSelectColumn(CcBlockcontentsPeer::BLOCK_ID);
$criteria->addSelectColumn(CcBlockcontentsPeer::FILE_ID);
$criteria->addSelectColumn(CcBlockcontentsPeer::POSITION);
$criteria->addSelectColumn(CcBlockcontentsPeer::TRACKOFFSET);
$criteria->addSelectColumn(CcBlockcontentsPeer::CLIPLENGTH);
$criteria->addSelectColumn(CcBlockcontentsPeer::CUEIN);
$criteria->addSelectColumn(CcBlockcontentsPeer::CUEOUT);
@ -180,6 +184,7 @@ abstract class BaseCcBlockcontentsPeer {
$criteria->addSelectColumn($alias . '.BLOCK_ID');
$criteria->addSelectColumn($alias . '.FILE_ID');
$criteria->addSelectColumn($alias . '.POSITION');
$criteria->addSelectColumn($alias . '.TRACKOFFSET');
$criteria->addSelectColumn($alias . '.CLIPLENGTH');
$criteria->addSelectColumn($alias . '.CUEIN');
$criteria->addSelectColumn($alias . '.CUEOUT');

35
airtime_mvc/application/models/airtime/om/BaseCcBlockcontentsQuery.php
View file

@ -10,6 +10,7 @@
* @method CcBlockcontentsQuery orderByDbBlockId($order = Criteria::ASC) Order by the block_id column
* @method CcBlockcontentsQuery orderByDbFileId($order = Criteria::ASC) Order by the file_id column
* @method CcBlockcontentsQuery orderByDbPosition($order = Criteria::ASC) Order by the position column
* @method CcBlockcontentsQuery orderByDbTrackOffset($order = Criteria::ASC) Order by the trackoffset column
* @method CcBlockcontentsQuery orderByDbCliplength($order = Criteria::ASC) Order by the cliplength column
* @method CcBlockcontentsQuery orderByDbCuein($order = Criteria::ASC) Order by the cuein column
* @method CcBlockcontentsQuery orderByDbCueout($order = Criteria::ASC) Order by the cueout column
@ -20,6 +21,7 @@
* @method CcBlockcontentsQuery groupByDbBlockId() Group by the block_id column
* @method CcBlockcontentsQuery groupByDbFileId() Group by the file_id column
* @method CcBlockcontentsQuery groupByDbPosition() Group by the position column
* @method CcBlockcontentsQuery groupByDbTrackOffset() Group by the trackoffset column
* @method CcBlockcontentsQuery groupByDbCliplength() Group by the cliplength column
* @method CcBlockcontentsQuery groupByDbCuein() Group by the cuein column
* @method CcBlockcontentsQuery groupByDbCueout() Group by the cueout column
@ -45,6 +47,7 @@
* @method CcBlockcontents findOneByDbBlockId(int $block_id) Return the first CcBlockcontents filtered by the block_id column
* @method CcBlockcontents findOneByDbFileId(int $file_id) Return the first CcBlockcontents filtered by the file_id column
* @method CcBlockcontents findOneByDbPosition(int $position) Return the first CcBlockcontents filtered by the position column
* @method CcBlockcontents findOneByDbTrackOffset(double $trackoffset) Return the first CcBlockcontents filtered by the trackoffset column
* @method CcBlockcontents findOneByDbCliplength(string $cliplength) Return the first CcBlockcontents filtered by the cliplength column
* @method CcBlockcontents findOneByDbCuein(string $cuein) Return the first CcBlockcontents filtered by the cuein column
* @method CcBlockcontents findOneByDbCueout(string $cueout) Return the first CcBlockcontents filtered by the cueout column
@ -55,6 +58,7 @@
* @method array findByDbBlockId(int $block_id) Return CcBlockcontents objects filtered by the block_id column
* @method array findByDbFileId(int $file_id) Return CcBlockcontents objects filtered by the file_id column
* @method array findByDbPosition(int $position) Return CcBlockcontents objects filtered by the position column
* @method array findByDbTrackOffset(double $trackoffset) Return CcBlockcontents objects filtered by the trackoffset column
* @method array findByDbCliplength(string $cliplength) Return CcBlockcontents objects filtered by the cliplength column
* @method array findByDbCuein(string $cuein) Return CcBlockcontents objects filtered by the cuein column
* @method array findByDbCueout(string $cueout) Return CcBlockcontents objects filtered by the cueout column
@ -279,6 +283,37 @@ abstract class BaseCcBlockcontentsQuery extends ModelCriteria
return $this->addUsingAlias(CcBlockcontentsPeer::POSITION, $dbPosition, $comparison);
}
/**
* Filter the query on the trackoffset column
*
* @param double|array $dbTrackOffset The value to use as filter.
* Accepts an associative array('min' => $minValue, 'max' => $maxValue)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return CcBlockcontentsQuery The current query, for fluid interface
*/
public function filterByDbTrackOffset($dbTrackOffset = null, $comparison = null)
{
if (is_array($dbTrackOffset)) {
$useMinMax = false;
if (isset($dbTrackOffset['min'])) {
$this->addUsingAlias(CcBlockcontentsPeer::TRACKOFFSET, $dbTrackOffset['min'], Criteria::GREATER_EQUAL);
$useMinMax = true;
}
if (isset($dbTrackOffset['max'])) {
$this->addUsingAlias(CcBlockcontentsPeer::TRACKOFFSET, $dbTrackOffset['max'], Criteria::LESS_EQUAL);
$useMinMax = true;
}
if ($useMinMax) {
return $this;
}
if (null === $comparison) {
$comparison = Criteria::IN;
}
}
return $this->addUsingAlias(CcBlockcontentsPeer::TRACKOFFSET, $dbTrackOffset, $comparison);
}
/**
* Filter the query on the cliplength column
*

102
airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontents.php
View file

@ -67,6 +67,13 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
*/
protected $position;
/**
* The value for the trackoffset field.
* Note: this column has a database default value of: 0
* @var double
*/
protected $trackoffset;
/**
* The value for the cliplength field.
* Note: this column has a database default value of: '00:00:00'
@ -143,6 +150,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
public function applyDefaultValues()
{
$this->type = 0;
$this->trackoffset = 0;
$this->cliplength = '00:00:00';
$this->cuein = '00:00:00';
$this->cueout = '00:00:00';
@ -230,6 +238,16 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
return $this->position;
}
/**
* Get the [trackoffset] column value.
*
* @return double
*/
public function getDbTrackOffset()
{
return $this->trackoffset;
}
/**
* Get the [cliplength] column value.
*
@ -478,6 +496,26 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
return $this;
} // setDbPosition()
/**
* Set the value of [trackoffset] column.
*
* @param double $v new value
* @return CcPlaylistcontents The current object (for fluent API support)
*/
public function setDbTrackOffset($v)
{
if ($v !== null) {
$v = (double) $v;
}
if ($this->trackoffset !== $v || $this->isNew()) {
$this->trackoffset = $v;
$this->modifiedColumns[] = CcPlaylistcontentsPeer::TRACKOFFSET;
}
return $this;
} // setDbTrackOffset()
/**
* Set the value of [cliplength] column.
*
@ -652,6 +690,10 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
return false;
}
if ($this->trackoffset !== 0) {
return false;
}
if ($this->cliplength !== '00:00:00') {
return false;
}
@ -701,11 +743,12 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
$this->stream_id = ($row[$startcol + 4] !== null) ? (int) $row[$startcol + 4] : null;
$this->type = ($row[$startcol + 5] !== null) ? (int) $row[$startcol + 5] : null;
$this->position = ($row[$startcol + 6] !== null) ? (int) $row[$startcol + 6] : null;
$this->cliplength = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
$this->cuein = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
$this->cueout = ($row[$startcol + 9] !== null) ? (string) $row[$startcol + 9] : null;
$this->fadein = ($row[$startcol + 10] !== null) ? (string) $row[$startcol + 10] : null;
$this->fadeout = ($row[$startcol + 11] !== null) ? (string) $row[$startcol + 11] : null;
$this->trackoffset = ($row[$startcol + 7] !== null) ? (double) $row[$startcol + 7] : null;
$this->cliplength = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
$this->cuein = ($row[$startcol + 9] !== null) ? (string) $row[$startcol + 9] : null;
$this->cueout = ($row[$startcol + 10] !== null) ? (string) $row[$startcol + 10] : null;
$this->fadein = ($row[$startcol + 11] !== null) ? (string) $row[$startcol + 11] : null;
$this->fadeout = ($row[$startcol + 12] !== null) ? (string) $row[$startcol + 12] : null;
$this->resetModified();
$this->setNew(false);
@ -714,7 +757,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
$this->ensureConsistency();
}
return $startcol + 12; // 12 = CcPlaylistcontentsPeer::NUM_COLUMNS - CcPlaylistcontentsPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 13; // 13 = CcPlaylistcontentsPeer::NUM_COLUMNS - CcPlaylistcontentsPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating CcPlaylistcontents object", $e);
@ -1099,18 +1142,21 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
return $this->getDbPosition();
break;
case 7:
return $this->getDbCliplength();
return $this->getDbTrackOffset();
break;
case 8:
return $this->getDbCuein();
return $this->getDbCliplength();
break;
case 9:
return $this->getDbCueout();
return $this->getDbCuein();
break;
case 10:
return $this->getDbFadein();
return $this->getDbCueout();
break;
case 11:
return $this->getDbFadein();
break;
case 12:
return $this->getDbFadeout();
break;
default:
@ -1144,11 +1190,12 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
$keys[4] => $this->getDbStreamId(),
$keys[5] => $this->getDbType(),
$keys[6] => $this->getDbPosition(),
$keys[7] => $this->getDbCliplength(),
$keys[8] => $this->getDbCuein(),
$keys[9] => $this->getDbCueout(),
$keys[10] => $this->getDbFadein(),
$keys[11] => $this->getDbFadeout(),
$keys[7] => $this->getDbTrackOffset(),
$keys[8] => $this->getDbCliplength(),
$keys[9] => $this->getDbCuein(),
$keys[10] => $this->getDbCueout(),
$keys[11] => $this->getDbFadein(),
$keys[12] => $this->getDbFadeout(),
);
if ($includeForeignObjects) {
if (null !== $this->aCcFiles) {
@ -1213,18 +1260,21 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
$this->setDbPosition($value);
break;
case 7:
$this->setDbCliplength($value);
$this->setDbTrackOffset($value);
break;
case 8:
$this->setDbCuein($value);
$this->setDbCliplength($value);
break;
case 9:
$this->setDbCueout($value);
$this->setDbCuein($value);
break;
case 10:
$this->setDbFadein($value);
$this->setDbCueout($value);
break;
case 11:
$this->setDbFadein($value);
break;
case 12:
$this->setDbFadeout($value);
break;
} // switch()
@ -1258,11 +1308,12 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
if (array_key_exists($keys[4], $arr)) $this->setDbStreamId($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setDbType($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setDbPosition($arr[$keys[6]]);
if (array_key_exists($keys[7], $arr)) $this->setDbCliplength($arr[$keys[7]]);
if (array_key_exists($keys[8], $arr)) $this->setDbCuein($arr[$keys[8]]);
if (array_key_exists($keys[9], $arr)) $this->setDbCueout($arr[$keys[9]]);
if (array_key_exists($keys[10], $arr)) $this->setDbFadein($arr[$keys[10]]);
if (array_key_exists($keys[11], $arr)) $this->setDbFadeout($arr[$keys[11]]);
if (array_key_exists($keys[7], $arr)) $this->setDbTrackOffset($arr[$keys[7]]);
if (array_key_exists($keys[8], $arr)) $this->setDbCliplength($arr[$keys[8]]);
if (array_key_exists($keys[9], $arr)) $this->setDbCuein($arr[$keys[9]]);
if (array_key_exists($keys[10], $arr)) $this->setDbCueout($arr[$keys[10]]);
if (array_key_exists($keys[11], $arr)) $this->setDbFadein($arr[$keys[11]]);
if (array_key_exists($keys[12], $arr)) $this->setDbFadeout($arr[$keys[12]]);
}
/**
@ -1281,6 +1332,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
if ($this->isColumnModified(CcPlaylistcontentsPeer::STREAM_ID)) $criteria->add(CcPlaylistcontentsPeer::STREAM_ID, $this->stream_id);
if ($this->isColumnModified(CcPlaylistcontentsPeer::TYPE)) $criteria->add(CcPlaylistcontentsPeer::TYPE, $this->type);
if ($this->isColumnModified(CcPlaylistcontentsPeer::POSITION)) $criteria->add(CcPlaylistcontentsPeer::POSITION, $this->position);
if ($this->isColumnModified(CcPlaylistcontentsPeer::TRACKOFFSET)) $criteria->add(CcPlaylistcontentsPeer::TRACKOFFSET, $this->trackoffset);
if ($this->isColumnModified(CcPlaylistcontentsPeer::CLIPLENGTH)) $criteria->add(CcPlaylistcontentsPeer::CLIPLENGTH, $this->cliplength);
if ($this->isColumnModified(CcPlaylistcontentsPeer::CUEIN)) $criteria->add(CcPlaylistcontentsPeer::CUEIN, $this->cuein);
if ($this->isColumnModified(CcPlaylistcontentsPeer::CUEOUT)) $criteria->add(CcPlaylistcontentsPeer::CUEOUT, $this->cueout);
@ -1353,6 +1405,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
$copyObj->setDbStreamId($this->stream_id);
$copyObj->setDbType($this->type);
$copyObj->setDbPosition($this->position);
$copyObj->setDbTrackOffset($this->trackoffset);
$copyObj->setDbCliplength($this->cliplength);
$copyObj->setDbCuein($this->cuein);
$copyObj->setDbCueout($this->cueout);
@ -1564,6 +1617,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
$this->stream_id = null;
$this->type = null;
$this->position = null;
$this->trackoffset = null;
$this->cliplength = null;
$this->cuein = null;
$this->cueout = null;

31
airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontentsPeer.php
View file

@ -26,7 +26,7 @@ abstract class BaseCcPlaylistcontentsPeer {
const TM_CLASS = 'CcPlaylistcontentsTableMap';
/** The total number of columns. */
const NUM_COLUMNS = 12;
const NUM_COLUMNS = 13;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@ -52,6 +52,9 @@ abstract class BaseCcPlaylistcontentsPeer {
/** the column name for the POSITION field */
const POSITION = 'cc_playlistcontents.POSITION';
/** the column name for the TRACKOFFSET field */
const TRACKOFFSET = 'cc_playlistcontents.TRACKOFFSET';
/** the column name for the CLIPLENGTH field */
const CLIPLENGTH = 'cc_playlistcontents.CLIPLENGTH';
@ -83,12 +86,12 @@ abstract class BaseCcPlaylistcontentsPeer {
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbPlaylistId', 'DbFileId', 'DbBlockId', 'DbStreamId', 'DbType', 'DbPosition', 'DbCliplength', 'DbCuein', 'DbCueout', 'DbFadein', 'DbFadeout', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbPlaylistId', 'dbFileId', 'dbBlockId', 'dbStreamId', 'dbType', 'dbPosition', 'dbCliplength', 'dbCuein', 'dbCueout', 'dbFadein', 'dbFadeout', ),
BasePeer::TYPE_COLNAME => array (self::ID, self::PLAYLIST_ID, self::FILE_ID, self::BLOCK_ID, self::STREAM_ID, self::TYPE, self::POSITION, self::CLIPLENGTH, self::CUEIN, self::CUEOUT, self::FADEIN, self::FADEOUT, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'PLAYLIST_ID', 'FILE_ID', 'BLOCK_ID', 'STREAM_ID', 'TYPE', 'POSITION', 'CLIPLENGTH', 'CUEIN', 'CUEOUT', 'FADEIN', 'FADEOUT', ),
BasePeer::TYPE_FIELDNAME => array ('id', 'playlist_id', 'file_id', 'block_id', 'stream_id', 'type', 'position', 'cliplength', 'cuein', 'cueout', 'fadein', 'fadeout', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbPlaylistId', 'DbFileId', 'DbBlockId', 'DbStreamId', 'DbType', 'DbPosition', 'DbTrackOffset', 'DbCliplength', 'DbCuein', 'DbCueout', 'DbFadein', 'DbFadeout', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbPlaylistId', 'dbFileId', 'dbBlockId', 'dbStreamId', 'dbType', 'dbPosition', 'dbTrackOffset', 'dbCliplength', 'dbCuein', 'dbCueout', 'dbFadein', 'dbFadeout', ),
BasePeer::TYPE_COLNAME => array (self::ID, self::PLAYLIST_ID, self::FILE_ID, self::BLOCK_ID, self::STREAM_ID, self::TYPE, self::POSITION, self::TRACKOFFSET, self::CLIPLENGTH, self::CUEIN, self::CUEOUT, self::FADEIN, self::FADEOUT, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'PLAYLIST_ID', 'FILE_ID', 'BLOCK_ID', 'STREAM_ID', 'TYPE', 'POSITION', 'TRACKOFFSET', 'CLIPLENGTH', 'CUEIN', 'CUEOUT', 'FADEIN', 'FADEOUT', ),
BasePeer::TYPE_FIELDNAME => array ('id', 'playlist_id', 'file_id', 'block_id', 'stream_id', 'type', 'position', 'trackoffset', 'cliplength', 'cuein', 'cueout', 'fadein', 'fadeout', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
);
/**
@ -98,12 +101,12 @@ abstract class BaseCcPlaylistcontentsPeer {
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbPlaylistId' => 1, 'DbFileId' => 2, 'DbBlockId' => 3, 'DbStreamId' => 4, 'DbType' => 5, 'DbPosition' => 6, 'DbCliplength' => 7, 'DbCuein' => 8, 'DbCueout' => 9, 'DbFadein' => 10, 'DbFadeout' => 11, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbPlaylistId' => 1, 'dbFileId' => 2, 'dbBlockId' => 3, 'dbStreamId' => 4, 'dbType' => 5, 'dbPosition' => 6, 'dbCliplength' => 7, 'dbCuein' => 8, 'dbCueout' => 9, 'dbFadein' => 10, 'dbFadeout' => 11, ),
BasePeer::TYPE_COLNAME => array (self::ID => 0, self::PLAYLIST_ID => 1, self::FILE_ID => 2, self::BLOCK_ID => 3, self::STREAM_ID => 4, self::TYPE => 5, self::POSITION => 6, self::CLIPLENGTH => 7, self::CUEIN => 8, self::CUEOUT => 9, self::FADEIN => 10, self::FADEOUT => 11, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'PLAYLIST_ID' => 1, 'FILE_ID' => 2, 'BLOCK_ID' => 3, 'STREAM_ID' => 4, 'TYPE' => 5, 'POSITION' => 6, 'CLIPLENGTH' => 7, 'CUEIN' => 8, 'CUEOUT' => 9, 'FADEIN' => 10, 'FADEOUT' => 11, ),
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'playlist_id' => 1, 'file_id' => 2, 'block_id' => 3, 'stream_id' => 4, 'type' => 5, 'position' => 6, 'cliplength' => 7, 'cuein' => 8, 'cueout' => 9, 'fadein' => 10, 'fadeout' => 11, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbPlaylistId' => 1, 'DbFileId' => 2, 'DbBlockId' => 3, 'DbStreamId' => 4, 'DbType' => 5, 'DbPosition' => 6, 'DbTrackOffset' => 7, 'DbCliplength' => 8, 'DbCuein' => 9, 'DbCueout' => 10, 'DbFadein' => 11, 'DbFadeout' => 12, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbPlaylistId' => 1, 'dbFileId' => 2, 'dbBlockId' => 3, 'dbStreamId' => 4, 'dbType' => 5, 'dbPosition' => 6, 'dbTrackOffset' => 7, 'dbCliplength' => 8, 'dbCuein' => 9, 'dbCueout' => 10, 'dbFadein' => 11, 'dbFadeout' => 12, ),
BasePeer::TYPE_COLNAME => array (self::ID => 0, self::PLAYLIST_ID => 1, self::FILE_ID => 2, self::BLOCK_ID => 3, self::STREAM_ID => 4, self::TYPE => 5, self::POSITION => 6, self::TRACKOFFSET => 7, self::CLIPLENGTH => 8, self::CUEIN => 9, self::CUEOUT => 10, self::FADEIN => 11, self::FADEOUT => 12, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'PLAYLIST_ID' => 1, 'FILE_ID' => 2, 'BLOCK_ID' => 3, 'STREAM_ID' => 4, 'TYPE' => 5, 'POSITION' => 6, 'TRACKOFFSET' => 7, 'CLIPLENGTH' => 8, 'CUEIN' => 9, 'CUEOUT' => 10, 'FADEIN' => 11, 'FADEOUT' => 12, ),
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'playlist_id' => 1, 'file_id' => 2, 'block_id' => 3, 'stream_id' => 4, 'type' => 5, 'position' => 6, 'trackoffset' => 7, 'cliplength' => 8, 'cuein' => 9, 'cueout' => 10, 'fadein' => 11, 'fadeout' => 12, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
);
/**
@ -182,6 +185,7 @@ abstract class BaseCcPlaylistcontentsPeer {
$criteria->addSelectColumn(CcPlaylistcontentsPeer::STREAM_ID);
$criteria->addSelectColumn(CcPlaylistcontentsPeer::TYPE);
$criteria->addSelectColumn(CcPlaylistcontentsPeer::POSITION);
$criteria->addSelectColumn(CcPlaylistcontentsPeer::TRACKOFFSET);
$criteria->addSelectColumn(CcPlaylistcontentsPeer::CLIPLENGTH);
$criteria->addSelectColumn(CcPlaylistcontentsPeer::CUEIN);
$criteria->addSelectColumn(CcPlaylistcontentsPeer::CUEOUT);
@ -195,6 +199,7 @@ abstract class BaseCcPlaylistcontentsPeer {
$criteria->addSelectColumn($alias . '.STREAM_ID');
$criteria->addSelectColumn($alias . '.TYPE');
$criteria->addSelectColumn($alias . '.POSITION');
$criteria->addSelectColumn($alias . '.TRACKOFFSET');
$criteria->addSelectColumn($alias . '.CLIPLENGTH');
$criteria->addSelectColumn($alias . '.CUEIN');
$criteria->addSelectColumn($alias . '.CUEOUT');

35
airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontentsQuery.php
View file

@ -13,6 +13,7 @@
* @method CcPlaylistcontentsQuery orderByDbStreamId($order = Criteria::ASC) Order by the stream_id column
* @method CcPlaylistcontentsQuery orderByDbType($order = Criteria::ASC) Order by the type column
* @method CcPlaylistcontentsQuery orderByDbPosition($order = Criteria::ASC) Order by the position column
* @method CcPlaylistcontentsQuery orderByDbTrackOffset($order = Criteria::ASC) Order by the trackoffset column
* @method CcPlaylistcontentsQuery orderByDbCliplength($order = Criteria::ASC) Order by the cliplength column
* @method CcPlaylistcontentsQuery orderByDbCuein($order = Criteria::ASC) Order by the cuein column
* @method CcPlaylistcontentsQuery orderByDbCueout($order = Criteria::ASC) Order by the cueout column
@ -26,6 +27,7 @@
* @method CcPlaylistcontentsQuery groupByDbStreamId() Group by the stream_id column
* @method CcPlaylistcontentsQuery groupByDbType() Group by the type column
* @method CcPlaylistcontentsQuery groupByDbPosition() Group by the position column
* @method CcPlaylistcontentsQuery groupByDbTrackOffset() Group by the trackoffset column
* @method CcPlaylistcontentsQuery groupByDbCliplength() Group by the cliplength column
* @method CcPlaylistcontentsQuery groupByDbCuein() Group by the cuein column
* @method CcPlaylistcontentsQuery groupByDbCueout() Group by the cueout column
@ -58,6 +60,7 @@
* @method CcPlaylistcontents findOneByDbStreamId(int $stream_id) Return the first CcPlaylistcontents filtered by the stream_id column
* @method CcPlaylistcontents findOneByDbType(int $type) Return the first CcPlaylistcontents filtered by the type column
* @method CcPlaylistcontents findOneByDbPosition(int $position) Return the first CcPlaylistcontents filtered by the position column
* @method CcPlaylistcontents findOneByDbTrackOffset(double $trackoffset) Return the first CcPlaylistcontents filtered by the trackoffset column
* @method CcPlaylistcontents findOneByDbCliplength(string $cliplength) Return the first CcPlaylistcontents filtered by the cliplength column
* @method CcPlaylistcontents findOneByDbCuein(string $cuein) Return the first CcPlaylistcontents filtered by the cuein column
* @method CcPlaylistcontents findOneByDbCueout(string $cueout) Return the first CcPlaylistcontents filtered by the cueout column
@ -71,6 +74,7 @@
* @method array findByDbStreamId(int $stream_id) Return CcPlaylistcontents objects filtered by the stream_id column
* @method array findByDbType(int $type) Return CcPlaylistcontents objects filtered by the type column
* @method array findByDbPosition(int $position) Return CcPlaylistcontents objects filtered by the position column
* @method array findByDbTrackOffset(double $trackoffset) Return CcPlaylistcontents objects filtered by the trackoffset column
* @method array findByDbCliplength(string $cliplength) Return CcPlaylistcontents objects filtered by the cliplength column
* @method array findByDbCuein(string $cuein) Return CcPlaylistcontents objects filtered by the cuein column
* @method array findByDbCueout(string $cueout) Return CcPlaylistcontents objects filtered by the cueout column
@ -388,6 +392,37 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria
return $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $dbPosition, $comparison);
}
/**
* Filter the query on the trackoffset column
*
* @param double|array $dbTrackOffset The value to use as filter.
* Accepts an associative array('min' => $minValue, 'max' => $maxValue)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return CcPlaylistcontentsQuery The current query, for fluid interface
*/
public function filterByDbTrackOffset($dbTrackOffset = null, $comparison = null)
{
if (is_array($dbTrackOffset)) {
$useMinMax = false;
if (isset($dbTrackOffset['min'])) {
$this->addUsingAlias(CcPlaylistcontentsPeer::TRACKOFFSET, $dbTrackOffset['min'], Criteria::GREATER_EQUAL);
$useMinMax = true;
}
if (isset($dbTrackOffset['max'])) {
$this->addUsingAlias(CcPlaylistcontentsPeer::TRACKOFFSET, $dbTrackOffset['max'], Criteria::LESS_EQUAL);
$useMinMax = true;
}
if ($useMinMax) {
return $this;
}
if (null === $comparison) {
$comparison = Criteria::IN;
}
}
return $this->addUsingAlias(CcPlaylistcontentsPeer::TRACKOFFSET, $dbTrackOffset, $comparison);
}
/**
* Filter the query on the cliplength column
*

38
airtime_mvc/application/views/scripts/form/preferences_general.phtml
View file

@ -14,14 +14,40 @@
</ul>
<?php endif; ?>
</dd>
<dt id="stationDefaultFade-label" class="block-display">
<label class="optional" for="stationDefaultFade"><?php echo $this->element->getElement('stationDefaultFade')->getLabel() ?></label>
<dt id="stationDefaultFadeIn-label" class="block-display">
<label class="optional" for="stationDefaultFadeIn"><?php echo $this->element->getElement('stationDefaultFadeIn')->getLabel() ?></label>
</dt>
<dd id="stationDefaultFade-element" class="block-display">
<?php echo $this->element->getElement('stationDefaultFade') ?>
<?php if($this->element->getElement('stationDefaultFade')->hasErrors()) : ?>
<dd id="stationDefaultFadeIn-element" class="block-display">
<?php echo $this->element->getElement('stationDefaultFadeIn') ?>
<?php if($this->element->getElement('stationDefaultFadeIn')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('stationDefaultFade')->getMessages() as $error): ?>
<?php foreach($this->element->getElement('stationDefaultFadeIn')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<dt id="stationDefaultFadeOut-label" class="block-display">
<label class="optional" for="stationDefaultFadeOut"><?php echo $this->element->getElement('stationDefaultFadeOut')->getLabel() ?></label>
</dt>
<dd id="stationDefaultFadeOut-element" class="block-display">
<?php echo $this->element->getElement('stationDefaultFadeOut') ?>
<?php if($this->element->getElement('stationDefaultFadeOut')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('stationDefaultFadeOut')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<dt id="stationDefaultCrossfadeDuration-label" class="block-display">
<label class="optional" for="stationDefaultCrossfadeDuration"><?php echo $this->element->getElement('stationDefaultCrossfadeDuration')->getLabel() ?></label>
</dt>
<dd id="stationDefaultCrossfadeDuration-element" class="block-display">
<?php echo $this->element->getElement('stationDefaultCrossfadeDuration') ?>
<?php if($this->element->getElement('stationDefaultCrossfadeDuration')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('stationDefaultCrossfadeDuration')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>

7
airtime_mvc/application/views/scripts/playlist/set-cue.phtml
View file

@ -1,11 +1,14 @@
<dl id="spl_cue_editor" class="inline-list">
<dd data-uri="<?php echo $this->uri; ?>">
<input type="button" class="pl-waveform-cues-btn" value="Show Waveform"></input>
</dd>
<dt><? echo _("Cue In: "); ?><span class='spl_cue_hint'><? echo _("(hh:mm:ss.t)")?></span></dt>
<dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in">
<dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in" data-cue-in="<?php echo $this->cueIn; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span>
</dd>
<dd class="edit-error"></dd>
<dt><? echo _("Cue Out: "); ?><span class='spl_cue_hint'><? echo _("(hh:mm:ss.t)")?></span></dt>
<dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out">
<dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out" data-cue-out="<?php echo $this->cueOut; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span>
</dd>
<dd class="edit-error"></dd>

13
airtime_mvc/application/views/scripts/playlist/set-fade.phtml
View file

@ -1,16 +1,23 @@
<dl id="spl_editor" class="inline-list">
<dd>
<input type="button" class="pl-waveform-fades-btn" value="Show Waveform"></input>
</dd>
<?php if ($this->item1Type == 0) {?>
<dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
<dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out">
<dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out" data-fadeout="<?php echo $this->item1Url; ?>"
data-cuein="<?php echo $this->cueIn1; ?>" data-cueout="<?php echo $this->cueOut1; ?>" data-length="<?php echo $this->fadeOut; ?>"
data-type="logarithmic" data-item="<?php echo $this->item1; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span>
</dd>
<dd class="edit-error"></dd>
<?php }
if ($this->item2Type == 0) {?>
<dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
<dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in">
<dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in" data-fadein="<?php echo $this->item2Url; ?>" data-offset="<?php if ($this->item1Type == 0) { echo $this->offset; } else { echo 0; } ?>"
data-cuein="<?php echo $this->cueIn2; ?>" data-cueout="<?php echo $this->cueOut2; ?>" data-length="<?php echo $this->fadeIn; ?>"
data-type="logarithmic" data-item="<?php echo $this->item2; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span>
</dd>
<dd class="edit-error"></dd>
<dd class="edit-error"></dd>
<?php }?>
</dl>

20
airtime_mvc/application/views/scripts/playlist/update.phtml
View file

@ -8,6 +8,15 @@ if ($item['type'] == 2) {
$bl= new Application_Model_Block($item['item_id']);
$staticBlock = $bl->isStatic();
}
else if ($item['type'] == 0) {
$audiofile = Application_Model_StoredFile::RecallById($item['item_id']);
$fileUrl = $audiofile->getFileUrl();
}
if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) {
$nextAudiofile = Application_Model_StoredFile::RecallById($items[$i+1]['item_id']);
$nextFileUrl = $nextAudiofile->getFileUrl();
}
?>
<li class="ui-state-default" id="spl_<?php echo $item["id"] ?>" unqid="<?php echo $item["id"]; ?>">
<div class="list-item-container">
@ -65,6 +74,7 @@ if ($item['type'] == 2) {
'id' => $item["id"],
'cueIn' => $item['cuein'],
'cueOut' => $item['cueout'],
'uri' => $fileUrl,
'origLength' => $item['orig_length'])); ?>
</div>
<?php }?>
@ -80,8 +90,16 @@ if ($item['type'] == 2) {
'item2' => $items[$i+1]['id'],
'item1Type' => $items[$i]['type'],
'item2Type' => $items[$i+1]['type'],
'item1Url' => $fileUrl,
'item2Url' => $nextFileUrl,
'fadeOut' => $items[$i]['fadeout'],
'fadeIn' => $items[$i+1]['fadein'])); ?>
'fadeIn' => $items[$i+1]['fadein'],
'offset' => $items[$i]['trackSec'] - $items[$i+1]['trackoffset'],
'cueIn1' => $items[$i]['cueInSec'],
'cueOut1' => $items[$i]['cueOutSec'],
'cueIn2' => $items[$i+1]['cueInSec'],
'cueOut2' => $items[$i+1]['cueOutSec'])
); ?>
</div>
<?php endif; ?>
<?php if ($item['type'] == 2) {?>