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

Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo

Browse source 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
This commit is contained in:
Martin Konecny 2012-02-28 19:22:13 -05:00
commit 497715df44
3 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
airtime_mvc/application/models/Schedule.php
View file

@ -418,9 +418,7 @@ class Application_Model_Schedule {
* @return array
* Returns null if nothing found
*/
public static function GetItems($p_currentDateTime, $p_toDateTime)
{
public static function GetItems($p_currentDateTime, $p_toDateTime) {
global $CC_CONFIG, $CC_DBC;
$rows = array();
@ -444,20 +442,6 @@ class Application_Model_Schedule {
return $rows;
}
/*
"2012-02-23-01-00-00":{
"row_id":"1",
"id":"caf951f6d8f087c3a90291a9622073f9",
"uri":"http:\/\/localhost:80\/api\/get-media\/file\/caf951f6d8f087c3a90291a9622073f9.mp3",
"fade_in":0,
"fade_out":0,
"cue_in":0,
"cue_out":199.798,
"start":"2012-02-23-01-00-00",
"end":"2012-02-23-01-03-19"
}
* */
public static function GetScheduledPlaylists($p_fromDateTime = null, $p_toDateTime = null){
global $CC_CONFIG, $CC_DBC;