This commit is contained in:
Albert Santoni 2015-04-17 15:23:56 -04:00
commit 82a129285c
11 changed files with 224 additions and 343 deletions

View File

@ -37,8 +37,6 @@ class Application_Model_Preference
if ($isUserValue && is_null($userId))
throw new Exception("User id can't be null for a user preference {$key}.");
Application_Common_Database::prepareAndExecute("LOCK TABLE cc_pref");
//Check if key already exists
$sql = "SELECT COUNT(*) FROM cc_pref"
." WHERE keystr = :key";

View File

@ -828,7 +828,8 @@ class Application_Model_Scheduler
"fade_in = '{$file["fadein"]}', ".
"fade_out = '{$file["fadeout"]}', ".
"clip_length = '{$file["cliplength"]}', ".
"position = {$pos} ".
"position = {$pos}, ".
"instance_id = {$instanceId} ".
"WHERE id = {$sched["id"]}";
Application_Common_Database::prepareAndExecute(

View File

@ -182,12 +182,34 @@
function musesCallback(event,value) {
switch (event) {
case "ioError":
// connection limit reached or problem connecting to stream
if (value === "0") {
// problem connecting to stream
var stream;
if (musesPlayer.playerMode == "auto") {
stream = musesPlayer.getNextAvailableStream();
musesPlayer.setURL(stream["url"]);
} else {
stream = musesPlayer.settings.url;
musesPlayer.setURL(stream);
}
musesPlayer.play();
break;
case "securityError":
// max listeners reached
if (musesPlayer.playerMode == "auto") {
var stream = musesPlayer.getNextAvailableStream();
musesPlayer.setURL(stream["url"]);
musesPlayer.play();
} else {
// If in manual mode and there is a problem connecting to
// the stream display an error and stop play back.
MRP.stop();
if ($("#play_button").hasClass("hide_button")) {
togglePlayStopButton();
}
clearTimeout(metadataTimer);
$("p.now_playing").html("Error - Try again later");
}
break;
}
}

File diff suppressed because it is too large Load Diff