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

added comments, remove deprecated code, better var names...

Browse source
This commit is contained in:
Martin Konecny 2013-05-15 16:44:36 -04:00
parent 018c88d12a
commit 05dc0b7dbc
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
airtime_mvc/public/js/airtime/dashboard/dashboard.js
View file

@ -1,4 +1,6 @@
var estimatedSchedulePosixTime = null; //approximate server time, because once we receive it from the server,
//there way have been a great amount of latency and it is no longer accurate.
var approximateServerTime = null;
var localRemoteTimeOffset = null; var localRemoteTimeOffset = null;
var previousSong = null; var previousSong = null;
@ -25,10 +27,8 @@ var scheduled_play_source = false;
//is 25, then that means 5 seconds have gone by. //is 25, then that means 5 seconds have gone by.
var onAirOffIterations = 0; var onAirOffIterations = 0;
//var timezoneOffset = 0;
/* boolean flag to let us know if we should prepare to execute a function /* boolean flag to let us know if we should prepare to execute a function
* that flips the playlist to the next song. This flags purpose is to * that flips the playlist to the next song. This flag's purpose is to
* make sure the function is only executed once*/ * make sure the function is only executed once*/
var nextSongPrepare = true; var nextSongPrepare = true;
var nextShowPrepare = true; var nextShowPrepare = true;
@ -36,7 +36,7 @@ var nextShowPrepare = true;
function secondsTimer(){ function secondsTimer(){
if (localRemoteTimeOffset !== null){ if (localRemoteTimeOffset !== null){
var date = new Date(); var date = new Date();
estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset; approximateServerTime = date.getTime() - localRemoteTimeOffset;
updateProgressBarValue(); updateProgressBarValue();
updatePlaybar(); updatePlaybar();
controlOnAirLight(); controlOnAirLight();
@ -62,7 +62,7 @@ function nextShowStart(){
function updateProgressBarValue(){ function updateProgressBarValue(){
var showPercentDone = 0; var showPercentDone = 0;
if (currentShow.length > 0){ if (currentShow.length > 0){
showPercentDone = (estimatedSchedulePosixTime - currentShow[0].showStartPosixTime)/currentShow[0].showLengthMs*100; showPercentDone = (approximateServerTime - currentShow[0].showStartPosixTime)/currentShow[0].showLengthMs*100;
if (showPercentDone < 0 || showPercentDone > 100){ if (showPercentDone < 0 || showPercentDone > 100){
showPercentDone = 0; showPercentDone = 0;
currentShow = new Array(); currentShow = new Array();
@ -77,8 +77,8 @@ function updateProgressBarValue(){
if (currentSong !== null){ if (currentSong !== null){
var songElapsedTime = 0; var songElapsedTime = 0;
songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100; songPercentDone = (approximateServerTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
songElapsedTime = estimatedSchedulePosixTime - currentSong.songStartPosixTime; songElapsedTime = approximateServerTime - currentSong.songStartPosixTime;
if (songPercentDone < 0 || songPercentDone > 100){ if (songPercentDone < 0 || songPercentDone > 100){
songPercentDone = 0; songPercentDone = 0;
//currentSong = null; //currentSong = null;
@ -100,13 +100,12 @@ function updateProgressBarValue(){
scheduled_play_line_to_switch.attr("class", "line-to-switch off"); scheduled_play_line_to_switch.attr("class", "line-to-switch off");
scheduled_play_div.removeClass("ready"); scheduled_play_div.removeClass("ready");
$('#progress-show').attr("class", "progress-show-error"); $('#progress-show').attr("class", "progress-show-error");
} }
$('#progress-bar').attr("style", "width:"+songPercentDone+"%"); $('#progress-bar').attr("style", "width:"+songPercentDone+"%");
//calculate how much time left to next song if there is any //calculate how much time left to next song if there is any
if (nextSong !== null && nextSongPrepare){ if (nextSong !== null && nextSongPrepare){
var diff = nextSong.songStartPosixTime - estimatedSchedulePosixTime; var diff = nextSong.songStartPosixTime - approximateServerTime;
if (diff < serverUpdateInterval){ if (diff < serverUpdateInterval){
//sometimes the diff is negative (-100ms for example). Still looking //sometimes the diff is negative (-100ms for example). Still looking
@ -121,7 +120,7 @@ function updateProgressBarValue(){
//calculate how much time left to next show if there is any //calculate how much time left to next show if there is any
if (nextShow.length > 0 && nextShowPrepare){ if (nextShow.length > 0 && nextShowPrepare){
var diff = nextShow[0].showStartPosixTime - estimatedSchedulePosixTime; var diff = nextShow[0].showStartPosixTime - approximateServerTime;
if (diff < serverUpdateInterval){ if (diff < serverUpdateInterval){
if (diff < 0) if (diff < 0)
diff=0; diff=0;
@ -141,6 +140,7 @@ function updatePlaybar(){
$('#previous').empty(); $('#previous').empty();
$('#prev-length').empty(); $('#prev-length').empty();
} }
if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){ if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
if (currentSong.record == "1") if (currentSong.record == "1")
$('#current').html("<span style='color:red; font-weight:bold'>"+$.i18n._("Recording:")+"</span>"+currentSong.name+","); $('#current').html("<span style='color:red; font-weight:bold'>"+$.i18n._("Recording:")+"</span>"+currentSong.name+",");
@ -186,8 +186,8 @@ function updatePlaybar(){
var songStartRoughly = parseInt(Math.round(currentSong.songStartPosixTime/1000))*1000; var songStartRoughly = parseInt(Math.round(currentSong.songStartPosixTime/1000))*1000;
var songEndRoughly = parseInt(Math.round(currentSong.songEndPosixTime/1000))*1000; var songEndRoughly = parseInt(Math.round(currentSong.songEndPosixTime/1000))*1000;
$('#time-elapsed').text(convertToHHMMSS(estimatedSchedulePosixTime - songStartRoughly)); $('#time-elapsed').text(convertToHHMMSS(approximateServerTime - songStartRoughly));
$('#time-remaining').text(convertToHHMMSS(songEndRoughly - estimatedSchedulePosixTime)); $('#time-remaining').text(convertToHHMMSS(songEndRoughly - approximateServerTime));
$('#song-length').text(convertToHHMMSSmm(currentSong.songLengthMs)); $('#song-length').text(convertToHHMMSSmm(currentSong.songLengthMs));
} }
/* Column 1 update */ /* Column 1 update */
@ -202,13 +202,11 @@ function updatePlaybar(){
$('#show-length').empty(); $('#show-length').empty();
if (currentShow.length > 0){ if (currentShow.length > 0){
//$('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime + timezoneOffset) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime + timezoneOffset));
$('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime)); $('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime));
} }
/* Column 2 update */ /* Column 2 update */
//$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime + timezoneOffset)); $('#time').text(convertDateToHHMMSS(approximateServerTime));
$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime));
} }
function calcAdditionalData(currentItem){ function calcAdditionalData(currentItem){
@ -246,7 +244,6 @@ function parseItems(obj){
nextShow = obj.nextShow; nextShow = obj.nextShow;
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime); var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
//timezoneOffset = parseInt(obj.timezoneOffset)*1000;
var date = new Date(); var date = new Date();
localRemoteTimeOffset = date.getTime() - schedulePosixTime; localRemoteTimeOffset = date.getTime() - schedulePosixTime;
} }