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

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

Browse source
This commit is contained in:
denise 2012-05-23 16:19:06 -04:00
commit 80998f2eac
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/Preference.php
View file

@ -412,7 +412,13 @@ class Application_Model_Preference
$key == 'FREE_RAM' || $key == 'AIRTIME_VERSION' || $key == 'KERNAL_VERSION' || $key == 'FREE_RAM' || $key == 'AIRTIME_VERSION' || $key == 'KERNAL_VERSION' ||
$key == 'MACHINE_ARCHITECTURE' || $key == 'TOTAL_MEMORY_MBYTES' || $key == 'TOTAL_SWAP_MBYTES' || $key == 'MACHINE_ARCHITECTURE' || $key == 'TOTAL_MEMORY_MBYTES' || $key == 'TOTAL_SWAP_MBYTES' ||
$key == 'PLAYOUT_ENGINE_CPU_PERC' ) { $key == 'PLAYOUT_ENGINE_CPU_PERC' ) {
$systemInfoArray[$key] = $info[1]; if($key == 'AIRTIME_VERSION'){
// remove hash tag on the version string
list($version, $dump) = explode('+', $info[1]);
$systemInfoArray[$key] = $version;
}else{
$systemInfoArray[$key] = $info[1];
}
} }
} }
} }

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

@ -45,8 +45,6 @@ class Application_Model_Schedule {
$nextShowID = count($shows['nextShow'])>0?$shows['nextShow'][0]['instance_id']:null; $nextShowID = count($shows['nextShow'])>0?$shows['nextShow'][0]['instance_id']:null;
$results = Application_Model_Schedule::GetPrevCurrentNext($previousShowID, $currentShowID, $nextShowID, $utcTimeNow); $results = Application_Model_Schedule::GetPrevCurrentNext($previousShowID, $currentShowID, $nextShowID, $utcTimeNow);
Logging::log($shows['currentShow']);
$range = array("env"=>APPLICATION_ENV, $range = array("env"=>APPLICATION_ENV,
"schedulerTime"=>$timeNow, "schedulerTime"=>$timeNow,
"previous"=>$results['previous'] !=null?$results['previous']:(count($shows['previousShow'])>0?$shows['previousShow'][0]:null), "previous"=>$results['previous'] !=null?$results['previous']:(count($shows['previousShow'])>0?$shows['previousShow'][0]:null),

2
airtime_mvc/application/models/Show.php
View file

@ -848,7 +848,7 @@ class Application_Model_Show {
$showId = $this->getId(); $showId = $this->getId();
$sql = "SELECT id FROM cc_show_instances" $sql = "SELECT id FROM cc_show_instances"
." WHERE date(starts) = date(TIMESTAMP '$timestamp') " ." WHERE date(starts) = date(TIMESTAMP '$timestamp') "
." AND show_id = $showId"; ." AND show_id = $showId AND rebroadcast = 0";
$query = $con->query($sql); $query = $con->query($sql);
$row = ($query !== false) ? $query->fetchColumn(0) : null; $row = ($query !== false) ? $query->fetchColumn(0) : null;

1
python_apps/pypo/install/pypo-uninitialize.py
View file

@ -9,6 +9,7 @@ if os.geteuid() != 0:
try: try:
#stop pypo and liquidsoap processes #stop pypo and liquidsoap processes
print "Waiting for pypo processes to stop...", print "Waiting for pypo processes to stop...",
subprocess.call("rm -f /usr/bin/airtime-liquidsoap")
if (os.path.exists('/etc/init.d/airtime-playout')): if (os.path.exists('/etc/init.d/airtime-playout')):
subprocess.call("invoke-rc.d airtime-playout stop", shell=True) subprocess.call("invoke-rc.d airtime-playout stop", shell=True)
print "OK" print "OK"