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

CC-2733: Resume play is broken: mp3 files skipped 

- killing old pypo and liquidsoap processes
- comparing mime type againt old type of mime
This commit is contained in:
James 2011-08-25 16:32:57 -04:00
parent 7cfde811c9
commit 14e1e15830
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/StoredFile.php
View File

@ -395,10 +395,10 @@ class StoredFile {
{ {
$mime = $this->_file->getDbMime(); $mime = $this->_file->getDbMime();
if ($mime == "audio/vorbis") { if ($mime == "audio/vorbis" || $mime == "application/ogg") {
return "ogg"; return "ogg";
} }
else if ($mime == "audio/mp3") { else if ($mime == "audio/mp3" || $mime == "audio/mpeg") {
return "mp3"; return "mp3";
} }
} }

13
install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
View File

@ -759,12 +759,13 @@ AirtimeInstall::CreateZendPhpLogFile();
exec("/usr/bin/airtime-pypo-stop"); exec("/usr/bin/airtime-pypo-stop");
exec("/usr/bin/airtime-show-recorder-stop"); exec("/usr/bin/airtime-show-recorder-stop");
exec("svc -d /etc/service/pypo"); exec("svc -dx /etc/service/pypo");
exec("svc -d /etc/service/pypo/log"); exec("svc -dx /etc/service/pypo/log");
exec("svc -d /etc/service/pypo-liquidsoap"); exec("svc -dx /etc/service/pypo-liquidsoap");
exec("svc -d /etc/service/pypo-liquidsoap/log"); exec("svc -dx /etc/service/pypo-liquidsoap/log");
exec("svc -d /etc/service/recorder"); exec("svc -dx /etc/service/recorder");
exec("svc -d /etc/service/recorder/log"); exec("svc -dx /etc/service/recorder/log");
exec("killall supervise");
$pathnames = array("/usr/bin/airtime-pypo-start", $pathnames = array("/usr/bin/airtime-pypo-start",
"/usr/bin/airtime-pypo-stop", "/usr/bin/airtime-pypo-stop",

1
python_apps/pypo/pypofetch.py
View File

@ -370,6 +370,7 @@ class PypoFetch(Thread):
# most recent schedule. After that we can just wait for updates. # most recent schedule. After that we can just wait for updates.
status, schedule_data = self.api_client.get_schedule() status, schedule_data = self.api_client.get_schedule()
if status == 1: if status == 1:
logger.info("Bootstrap schedule received: %s", schedule_data)
self.process_schedule(schedule_data, "scheduler", True) self.process_schedule(schedule_data, "scheduler", True)
logger.info("Bootstrap complete: got initial copy of the schedule") logger.info("Bootstrap complete: got initial copy of the schedule")