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:
denise 2012-05-15 15:11:04 -04:00
parent b96f0590b1 6695e3e190
commit 61fd560daa
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View File

@ -26,6 +26,7 @@ define('MDATA_KEY_ENCODER', 'encoded_by');
define('MDATA_KEY_ISRC', 'isrc_number');
define('MDATA_KEY_COPYRIGHT', 'copyright');
define('MDATA_KEY_YEAR', 'year');
define('MDATA_KEY_RECORD_DATE', 'year');
define('MDATA_KEY_BPM', 'bpm');
define('MDATA_KEY_TRACKNUMBER', 'track_number');
define('MDATA_KEY_CONDUCTOR', 'conductor');

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

@ -603,7 +603,6 @@ class ApiController extends Zend_Controller_Action
$filepath = $md['MDATA_KEY_FILEPATH'];
$filepath = str_replace("\\", "", $filepath);
$file->setFilePath($filepath);
//$file->setMetadata($md);
}
}
else if ($mode == "delete") {

6
airtime_mvc/application/models/Show.php
View File

@ -1753,8 +1753,7 @@ class Application_Model_Show {
." AND modified_instance != TRUE"
." ORDER BY si.starts";
// Convert back to local timezone
$rows = $con->query($sql)->fetchAll();
$rows = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC);
$numberOfRows = count($rows);
$results['previousShow'] = array();
@ -1771,6 +1770,7 @@ class Application_Model_Show {
"id"=>$rows[$i-1]['id'],
"instance_id"=>$rows[$i-1]['instance_id'],
"name"=>$rows[$i-1]['name'],
"url"=>$rows[$i-1]['url'],
"start_timestamp"=>$rows[$i-1]['start_timestamp'],
"end_timestamp"=>$rows[$i-1]['end_timestamp'],
"starts"=>$rows[$i-1]['starts'],
@ -1784,6 +1784,7 @@ class Application_Model_Show {
"id"=>$rows[$i+1]['id'],
"instance_id"=>$rows[$i+1]['instance_id'],
"name"=>$rows[$i+1]['name'],
"url"=>$rows[$i+1]['url'],
"start_timestamp"=>$rows[$i+1]['start_timestamp'],
"end_timestamp"=>$rows[$i+1]['end_timestamp'],
"starts"=>$rows[$i+1]['starts'],
@ -1802,6 +1803,7 @@ class Application_Model_Show {
"id"=>$rows[$i]['id'],
"instance_id"=>$rows[$i]['instance_id'],
"name"=>$rows[$i]['name'],
"url"=>$rows[$i]['url'],
"start_timestamp"=>$rows[$i]['start_timestamp'],
"end_timestamp"=>$rows[$i]['end_timestamp'],
"starts"=>$rows[$i]['starts'],

2
widgets/js/jquery.showinfo.js
View File

@ -282,7 +282,7 @@ function ScheduleData(data){
this.schedulePosixTime = convertDateToPosixTime(data.schedulerTime);
this.schedulePosixTime += parseInt(data.timezoneOffset)*1000;
//this.schedulePosixTime += parseInt(data.timezoneOffset, 10)*1000;
var date = new Date();
this.localRemoteTimeOffset = date.getTime() - this.schedulePosixTime;
}