From 340d78d83ec36d89ccb7293806cea4402970c7de Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordaneldredge@gmail.com>
Date: Mon, 13 Apr 2015 22:46:33 -0700
Subject: [PATCH] Decouple stopWaiting state from play state

---
 js/media.js  | 2 ++
 js/winamp.js | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/media.js b/js/media.js
index 5c00a968..1b120d98 100644
--- a/js/media.js
+++ b/js/media.js
@@ -5,6 +5,7 @@ define({
     _buffer: null,
     _callbacks: {
         waiting: function(){},
+        stopWaiting: function(){},
         playing: function(){},
         timeupdate: function(){},
         visualizerupdate: function(){},
@@ -86,6 +87,7 @@ define({
         var loadAudioBuffer = function(buffer) {
             this._buffer = buffer;
             loadedCallback();
+            this._callbacks.stopWaiting();
             if(this.autoPlay) {
                 this.play(0);
             }
diff --git a/js/winamp.js b/js/winamp.js
index e1813568..4909d5d7 100755
--- a/js/winamp.js
+++ b/js/winamp.js
@@ -76,9 +76,12 @@ return {
             window.dispatchEvent(self.events.startWaiting);
         });
 
+        this.media.addEventListener('stopWaiting', function() {
+            window.dispatchEvent(self.events.stopWaiting);
+        });
+
         this.media.addEventListener('playing', function() {
             self.setState('play');
-            window.dispatchEvent(self.events.stopWaiting);
         });
 
         this.fileInput.onchange = function(e){