From e65022528635a194d73fb8429af192ae0aeb94e2 Mon Sep 17 00:00:00 2001
From: lone-cloud <lonecloud604@pm.me>
Date: Thu, 1 Oct 2015 22:53:49 -0700
Subject: [PATCH] trying stuff

---
 app/components/controls/music-control.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/components/controls/music-control.js b/app/components/controls/music-control.js
index a7414e8..13a2a7b 100644
--- a/app/components/controls/music-control.js
+++ b/app/components/controls/music-control.js
@@ -23,6 +23,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
         this.changePlayerControl('usingMic', !usingMic);
         if(this.get('playQueuePointer') !== -1) {
           this.send('goToSong',this.get('playQueuePointer'));
+          this.volumeChanged(this.get('volume'));
         }
       }
     },
@@ -249,13 +250,16 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
         if(dancer.audio) {
           dancer.pause();
           clearInterval(this.get('incrementElapseTimeHandle'));
-
-          this.set('playing', false);
         }
 
-        dancer.load(audio);
+        this.setProperties({
+          volumeCache: this.get('volume'),
+          playing: true
+        });
 
-        this.send('play');
+        dancer.load(audio);
+        dancer.setVolume(0);
+        dancer.play();
       },
       function(err) {
         console.log('Error during navigator.getUserMedia: ' + err.name + ', ' + err.message + ', ' + err.constraintName);