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

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
Martin Konecny 2013-05-08 15:25:52 -04:00
parent 56b9d0580f 8344f3f3d5
commit ebfa5b8c5c
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,7 +488,7 @@ SQL;
}
foreach ($p_items as $ac) {
Logging::info("Adding audio file {$ac[0]}");
//Logging::info("Adding audio file {$ac[0]}");
try {
if (is_array($ac) && $ac[1] == 'audioclip') {
$res = $this->insertBlockElement($this->buildEntry($ac[0], $pos));
@ -658,7 +658,7 @@ SQL;
public function getFadeInfo($pos)
{
Logging::info("Getting fade info for pos {$pos}");
//Logging::info("Getting fade info for pos {$pos}");
$row = CcBlockcontentsQuery::create()
->joinWith(CcFilesPeer::OM_CLASS)
@ -1275,8 +1275,10 @@ SQL;
$isBlockFull = false;
while ($iterator->valid()) {
$id = $iterator->current()->getDbId();
$length = Application_Common_DateHelper::calculateLengthInSeconds($iterator->current()->getDbLength());
$fileLength = $iterator->current()->getCueLength();
$length = Application_Common_DateHelper::calculateLengthInSeconds($fileLength);
$insertList[] = array('id'=>$id, 'length'=>$length);
$totalTime += $length;
$totalItems++;
@ -1291,8 +1293,11 @@ SQL;
$sizeOfInsert = count($insertList);
// if block is not full and reapeat_track is check, fill up more
// if block is not full and repeat_track is check, fill up more
while (!$isBlockFull && $repeat == 1 && $sizeOfInsert > 0) {
Logging::debug("adding repeated tracks.");
Logging::debug("total time = " . $totalTime);
$randomEleKey = array_rand(array_slice($insertList, 0, $sizeOfInsert));
$insertList[] = $insertList[$randomEleKey];
$totalTime += $insertList[$randomEleKey]['length'];

14
airtime_mvc/application/models/airtime/CcFiles.php
View File

@ -12,6 +12,20 @@
* @package propel.generator.campcaster
*/
class CcFiles extends BaseCcFiles {
public function getCueLength()
{
$cuein = $this->getDbCuein();
$cueout = $this->getDbCueout();
$cueinSec = Application_Common_DateHelper::calculateLengthInSeconds($cuein);
$cueoutSec = Application_Common_DateHelper::calculateLengthInSeconds($cueout);
$lengthSec = bcsub($cueoutSec, $cueinSec, 6);
$length = Application_Common_DateHelper::secondsToPlaylistTime($lengthSec);
return $length;
}
public function getDbLength($format = "H:i:s.u")
{

2
airtime_mvc/application/services/ShowFormService.php
View File

@ -216,7 +216,7 @@ class Application_Service_ShowFormService
'add_show_no_end' => (!$service_show->getRepeatingEndDate()),
'add_show_monthly_repeat_type' => $monthlyRepeatType));
if (!$this->ccShow->isLinkable()) {
if (!$this->ccShow->isLinkable() || $this->ccShow->isRecorded()) {
$form->getElement('add_show_linked')->setOptions(array('disabled' => true));
}
}

6
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -191,6 +191,12 @@ function setAddShowEvents() {
$(this).blur();
form.find("#add_show_rebroadcast").toggle();
if (form.find("#add_show_record").attr("checked")) {
form.find("#add_show_linked").attr("checked", false).attr("disabled", true);
} else {
form.find("#add_show_linked").attr("disabled", false);
}
//uncheck rebroadcast checkbox
form.find("#add_show_rebroadcast").attr('checked', false);