CC-3842: Next scheduled show gets registered as next scheduled song
- removed case where light stays on for first 5 seconds of track - also removed function calls no longer in use (notifySongStart(), and notifyShowStart()) - removed nowplayingdatagrid.js since it is no longer in use
This commit is contained in:
parent
9ed4ca4259
commit
8abb57c402
2 changed files with 3 additions and 226 deletions
|
@ -48,20 +48,12 @@ function secondsTimer(){
|
|||
function newSongStart(){
|
||||
nextSongPrepare = true;
|
||||
currentSong = nextSong;
|
||||
nextSong = null;
|
||||
|
||||
if (typeof notifySongStart == "function")
|
||||
notifySongStart();
|
||||
|
||||
nextSong = null;
|
||||
}
|
||||
|
||||
function nextShowStart(){
|
||||
nextShowPrepare = true;
|
||||
currentShow[0] = nextShow.shift();
|
||||
|
||||
//call function in nowplayingdatagrid.js
|
||||
if (typeof notifyShowStart == "function")
|
||||
notifyShowStart(currentShow[0]);
|
||||
}
|
||||
|
||||
/* Called every "uiUpdateInterval" mseconds. */
|
||||
|
@ -78,18 +70,16 @@ function updateProgressBarValue(){
|
|||
$('#progress-show').attr("style", "width:"+showPercentDone+"%");
|
||||
|
||||
var songPercentDone = 0;
|
||||
var songElapsedTime = 0;
|
||||
var scheduled_play_div = $("#scheduled_play_div");
|
||||
var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch");
|
||||
|
||||
if (currentSong !== null){
|
||||
if (currentSong !== null){
|
||||
songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
|
||||
songElapsedTime = estimatedSchedulePosixTime - currentSong.songStartPosixTime;
|
||||
if (songPercentDone < 0 || songPercentDone > 100){
|
||||
songPercentDone = 0;
|
||||
currentSong = null;
|
||||
} else {
|
||||
if ( (currentSong.media_item_played == true && currentShow.length > 0) || songElapsedTime < 5000 ){
|
||||
if (currentSong.media_item_played == true && currentShow.length > 0) {
|
||||
scheduled_play_line_to_switch.attr("class", "line-to-switch on");
|
||||
scheduled_play_div.addClass("ready");
|
||||
scheduled_play_source = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue