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

CC-2301 : adding in crossfade durations to smart blocks.

This commit is contained in:
Naomi 2013-05-08 11:43:53 -04:00
parent f64e99176e
commit fe916ec043
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/models/Block.php
View File

@ -33,6 +33,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable
"cueout" => "00:00:00", "cueout" => "00:00:00",
"fadein" => "0.0", "fadein" => "0.0",
"fadeout" => "0.0", "fadeout" => "0.0",
"crossfadeDuration" => 0
); );
//using propel's phpNames. //using propel's phpNames.
@ -101,6 +102,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable
$this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn(); $this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut(); $this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$this->blockItem["crossfadeDuration"] = Application_Model_Preference::GetDefaultCrossfadeDuration();
$this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME); $this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME);
$this->id = $this->block->getDbId(); $this->id = $this->block->getDbId();
@ -390,6 +392,7 @@ SQL;
$row->setDbCueout($info["cueout"]); $row->setDbCueout($info["cueout"]);
$row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"])); $row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]));
$row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"])); $row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]));
$row->setDbTrackOffset($info["crossfadeDuration"]);
$row->save($this->con); $row->save($this->con);
// above save result update on cc_block table on length column. // above save result update on cc_block table on length column.
// but $this->block doesn't get updated automatically // but $this->block doesn't get updated automatically

4
airtime_mvc/public/js/waveformplaylist/playout.js
View File

@ -82,7 +82,9 @@ AudioPlayout.prototype.loadData = function (audioData, cb) {
that.buffer = buffer; that.buffer = buffer;
cb(buffer); cb(buffer);
}, },
Error function(err) {
console.log("err(decodeAudioData): "+err);
}
); );
}; };