Merge pull request #36 from jamiewq/master

stop sounds before reading metadata
wwelder · Apr 27, 2017 · 1b149de · 1b149de
2 parents 34b5114 + 3488521
commit 1b149de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frontend/app/views/play/play.js b/frontend/app/views/play/play.js
@@ -45,7 +45,7 @@ angular.module('myApp.play', ['ngRoute'])
         utility.get_score(score_id)
           .then(function(response) {
               if(response.metaInfo == null) {
-                  alert(display.show('Fail: Get the musicScore'));
+                //   alert(display.show('Fail: Get the musicScore'));
               }
               else {
                   $scope.score_meta = response.metaInfo;
@@ -55,7 +55,7 @@ angular.module('myApp.play', ['ngRoute'])
                       meta_info_text.push(prop + ". " + $scope.score_meta[i][prop]);
                     }
                   }
-
+                  utility.stop_all_sounds();
                   play([config.api.fetch_mp3 + $scope.score_meta.mp3]);
 
                   $scope.score_content = response.scoreContent;

diff --git a/frontend/app/views/search/search.js b/frontend/app/views/search/search.js
@@ -94,9 +94,9 @@ angular.module('myApp.search', ['ngRoute'])
             .then(function(response) {
                 if (response !== null) {
                     $scope.searchList = response;
-                    debugger
                     if($scope.searchList.length > 0) {
                         $scope.selected = 0;
+                        utility.stop_all_sounds();
                         var sound = new Howl({
                           src: [config.api.fetch_mp3 + $scope.searchList[$scope.selected].title_mp3],
                           preload: true,