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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Rudi Grinberg 2012-08-30 15:23:24 -04:00
parent a11ec08154 010ba63d59
commit 417997e617
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/ApiController.php
View File

@ -346,6 +346,7 @@ class ApiController extends Zend_Controller_Action
$schedule_group_id = $this->_getParam("schedule_id");
$media_id = $this->_getParam("media_id");
Logging::debug("Received notification of new media item start: $media_id");
$result = Application_Model_Schedule::UpdateMediaPlayedStatus($media_id);
//set a 'last played' timestamp for media item

9
airtime_mvc/application/models/Scheduler.php
View File

@ -160,6 +160,15 @@ class Application_Model_Scheduler
$data["fadeout"] = $plItem['fadeout'];
$data["type"] = 0;
$files[] = $data;
} elseif ($plItem['type'] == 1) {
$data["id"] = $plItem['item_id'];
$data["cliplength"] = $plItem['length'];
$data["cuein"] = $plItem['cuein'];
$data["cueout"] = $plItem['cueout'];
$data["fadein"] = "00.500000";//$plItem['fadein'];
$data["fadeout"] = "00.500000";//$plItem['fadeout'];
$data["type"] = 1;
$files[] = $data;
} elseif ($plItem['type'] == 2) {
// if it's a block
$bl = new Application_Model_Block($plItem['item_id']);