lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

trying stuff

Browse source
This commit is contained in:
lone-cloud 2015-10-01 22:53:49 -07:00
parent da0f6248d5
commit e650225286
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/components/controls/music-control.js
View file

@ -23,6 +23,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
this.changePlayerControl('usingMic', !usingMic); this.changePlayerControl('usingMic', !usingMic);
if(this.get('playQueuePointer') !== -1) { if(this.get('playQueuePointer') !== -1) {
this.send('goToSong',this.get('playQueuePointer')); 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) { if(dancer.audio) {
dancer.pause(); dancer.pause();
clearInterval(this.get('incrementElapseTimeHandle')); 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) { function(err) {
console.log('Error during navigator.getUserMedia: ' + err.name + ', ' + err.message + ', ' + err.constraintName); console.log('Error during navigator.getUserMedia: ' + err.name + ', ' + err.message + ', ' + err.constraintName);