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

airtime_mvc/application/models/Dashboard.php

@@ -23,10 +23,14 @@ class Application_Model_Dashboard
             }
         } else {
             if (count($row) == 0){
-                //last item is a show instance
+                if ($showInstance->isRecorded()){
-                return array("name"=>$showInstance->getName(),
+                    //last item is a show instance
-                            "starts"=>$showInstance->getShowStart(),
+                    return array("name"=>$showInstance->getName(),
-                            "ends"=>$showInstance->getShowEnd());
+                                "starts"=>$showInstance->getShowStart(),
+                                "ends"=>$showInstance->getShowEnd());
+                } else {
+                    return null;
+                }
             } else {
                 //return the one that started later.
                 if ($row[0]["starts"] >= $showInstance->getShowStart()){
@@ -107,10 +111,14 @@ class Application_Model_Dashboard
             }
         } else {
             if (count($row) == 0){
-                //last item is a show instance
+                if ($showInstance->isRecorded()){
-                return array("name"=>$showInstance->getName(),
+                    //last item is a show instance
-                            "starts"=>$showInstance->getShowStart(),
+                    return array("name"=>$showInstance->getName(),
-                            "ends"=>$showInstance->getShowEnd());
+                                "starts"=>$showInstance->getShowStart(),
+                                "ends"=>$showInstance->getShowEnd());
+                } else {
+                    return null;
+                }
             } else {
                 //return the one that starts sooner.
                 

airtime_mvc/public/js/airtime/dashboard/playlist.js

@@ -27,11 +27,11 @@ var nextShowPrepare = true;
 
 function secondsTimer(){
     if (localRemoteTimeOffset !== null){
-		var date = new Date();
+        var date = new Date();
         estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset;
-		updateProgressBarValue();
+        updateProgressBarValue();
         updatePlaybar();
-	}
+    }
     setTimeout(secondsTimer, uiUpdateInterval);
 }
 
@@ -57,61 +57,61 @@ function nextShowStart(){
 /* Called every "uiUpdateInterval" mseconds. */
 function updateProgressBarValue(){
     var showPercentDone = 0;
-	if (currentShow.length > 0){
+    if (currentShow.length > 0){
-		showPercentDone = (estimatedSchedulePosixTime - currentShow[0].showStartPosixTime)/currentShow[0].showLengthMs*100;
+        showPercentDone = (estimatedSchedulePosixTime - 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();
-			currentSong = null;
+            currentSong = null;
-		}
+        }
-	}
+    }
     $('#progress-show').attr("style", "width:"+showPercentDone+"%");
 
-	var songPercentDone = 0;
+    var songPercentDone = 0;
-	if (currentSong !== null){
+    if (currentSong !== null){
-		songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
+        songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
-		if (songPercentDone < 0 || songPercentDone > 100){
+        if (songPercentDone < 0 || songPercentDone > 100){
-			songPercentDone = 0;        
+            songPercentDone = 0;        
             currentSong = null;
-		} else {
+        } else {
             if (currentSong.media_item_played == "t" && currentShow.length > 0)
                 $('#on-air-info').attr("class", "on-air-info on");
             else
                 $('#on-air-info').attr("class", "on-air-info off");
             $('#progress-show').attr("class", "progress-show");
-		}
+        }
-	} else {
+    } else {
-		$('#on-air-info').attr("class", "on-air-info off");
+        $('#on-air-info').attr("class", "on-air-info off");
         $('#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 - estimatedSchedulePosixTime;
-		if (diff < serverUpdateInterval){
+        if (diff < serverUpdateInterval){
             
             //sometimes the diff is negative (-100ms for example). Still looking
             //into why this could sometimes happen.
             if (diff < 0)
                 diff=0;
                 
-			nextSongPrepare = false;
+            nextSongPrepare = false;
-			setTimeout(newSongStart, diff);
+            setTimeout(newSongStart, diff);
-		}
+        }
-	}
+    }
-	
+    
-	//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 - estimatedSchedulePosixTime;
-		if (diff < serverUpdateInterval){
+        if (diff < serverUpdateInterval){
             if (diff < 0)
                 diff=0;
                 
-			nextShowPrepare = false;
+            nextShowPrepare = false;
-			setTimeout(nextShowStart, diff);
+            setTimeout(nextShowStart, diff);
-		}
+        }
-	}
+    }
 }
 
 function updatePlaybar(){
@@ -159,7 +159,7 @@ function updatePlaybar(){
     $('#playlist').text("Current Show:");
     var recElem = $('.recording-show');
     if (currentShow.length > 0){
-    	$('#playlist').text(currentShow[0].name);
+        $('#playlist').text(currentShow[0].name);
         (currentShow[0].record == "1") ? recElem.show(): recElem.hide();
     } else {
         recElem.hide();
@@ -181,11 +181,11 @@ function calcAdditionalData(currentItem){
 }
 
 function calcAdditionalShowData(show){
-	if (show.length > 0){
+    if (show.length > 0){
-		show[0].showStartPosixTime = convertDateToPosixTime(show[0].start_timestamp);
+        show[0].showStartPosixTime = convertDateToPosixTime(show[0].start_timestamp);
-		show[0].showEndPosixTime = convertDateToPosixTime(show[0].end_timestamp);
+        show[0].showEndPosixTime = convertDateToPosixTime(show[0].end_timestamp);
-		show[0].showLengthMs = show[0].showEndPosixTime - show[0].showStartPosixTime;
+        show[0].showLengthMs = show[0].showEndPosixTime - show[0].showStartPosixTime;
-	}
+    }
 }
 
 function parseItems(obj){
@@ -252,7 +252,7 @@ function setupQtip(){
 function init() {
     //begin producer "thread"
     getScheduleFromServer();
-	
+    
     //begin consumer "thread"
     secondsTimer();