status check

diversify · Nov 23, 2014 · 96bf924 · 96bf924
1 parent 4eb0673
commit 96bf924
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/app/controllers/controllers.js b/app/controllers/controllers.js
@@ -34,6 +34,7 @@ app.controller('januController', ['$scope','$http','$interval','$timeout', funct
 
     // start the timer
     $interval(function(){
+      console.log($scope.roundActive);
       timeLeft = getTimeLeft();
       if(timeLeft<16){
     		$scope.timeLeft = timeLeft; 
@@ -49,7 +50,7 @@ app.controller('januController', ['$scope','$http','$interval','$timeout', funct
       if (timeLeft <= 0) {
       	$('#album-cover').removeClass('animate-blur');
         $('#album-cover').removeClass('no-blur');
-        if ($scope.roundActive) {
+        if ($scope.roundActive && !musicLoading()) {
           $scope.roundActive = false;
           checkAnswer();
         }
@@ -80,6 +81,9 @@ app.controller('januController', ['$scope','$http','$interval','$timeout', funct
   }
 
   $scope.placeMarker = function () {
+    if (!$scope.roundActive)
+      return;
+
     index = markerIndex();
 
     //if it's the final span, then represent as -1
@@ -176,11 +180,13 @@ app.controller('januController', ['$scope','$http','$interval','$timeout', funct
     //clear the selection
     $scope.currentAnswer = null;
 
-    newSong = fetchNewSong();
-    playSong(newSong);
-    $scope.markerSet = false;
-    $scope.score.round = 0;
-    $scope.roundActive = true;
+    setTimeout(function () {
+      newSong = fetchNewSong();
+      playSong(newSong);
+      $scope.markerSet = false;
+      $scope.score.round = 0;
+      $scope.roundActive = true;
+    }, 3000);
   }
 
   function answerSuccess() {

diff --git a/scripts/musicPlayer.js b/scripts/musicPlayer.js
@@ -1,9 +1,11 @@
 var audio = new Audio();
+audio.loading = false;
 var TIME_PER_SONG = 20.0;
 var TIME_BETWEEN_ROUNDS = 5.0;
 var TIME_PER_ROUND = TIME_PER_SONG - TIME_BETWEEN_ROUNDS;
 
 function playSong(song){
+  audio.loading = true;
   previewURL(song.song_id, function (preview_url) {
     audio.src = preview_url;
     var skipped = false;
@@ -14,6 +16,7 @@ function playSong(song){
       }
     });
     audio.play();
+    audio.loading = false;
   });
 }
 
@@ -38,9 +41,6 @@ function getTimeLeft() {
   }
 }
 
-function isPlaying() {
-  if (audio.duration)
-    return true;
-  else
-    return false;
+function musicLoading() {
+  return audio.loading;
 }