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

bug fixes

Browse source
This commit is contained in:
Egor 2015-11-06 00:31:39 -08:00
parent 8d51cf6b9e
commit 0626a1e126
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/pods/components/music-tab/component.js
View file

@ -216,7 +216,8 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
}
},
play(replayPause) {
var dancer = this.get('dancer'), playQueuePointer = this.get('playQueuePointer');
var dancer = this.get('dancer'),
playQueuePointer = this.get('playQueuePointer');
if(playQueuePointer !== -1 ) {
if (this.get('playing')) {
@ -240,6 +241,8 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
return;
}
Em.$(window).trigger('resize'); // workaround to redraw the canvas for the vitualizer
dancer.play();
}
@ -377,7 +380,10 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
micBoostChanged(value) {
this.set('micBoost', value);
this.get('storage').set('huegasm.micBoost', value);
this.get('dancer').setBoost(value);
if(this.get('usingMicAudio')) {
this.get('dancer').setBoost(value);
}
},
audioModeChanged(value){
if(value === 1) {
@ -394,12 +400,12 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
clickSpeaker(){
this.simulateKick(1);
},
dropFiles(){
dropFiles(files){
this.setProperties({
dragging: false,
draggingOverPlayListArea: false
});
this.send('handleNewFiles', event.dataTransfer.files);
this.send('handleNewFiles', files);
},
playListAreaDragOver(){
this.set('draggingOverPlayListArea', true);
@ -733,6 +739,10 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
}
});
this.$().on('drop', '#playListArea', (event)=>{
this.send('dropFiles', event.dataTransfer.files);
});
// control the volume by scrolling up/down
Em.$('#playerArea').on('mousewheel', (event)=>{
if(this.get('playQueueNotEmpty') && !this.get('usingMicAudio')) {

7
app/pods/components/music-tab/mixins/visualizer.js
View file

@ -24,7 +24,7 @@ export default Em.Mixin.create({
playerArea = Em.$('#playerArea'),
ctx = canvas.getContext('2d'),
spacing = 2,
h = Em.$('#playerArea').height(), w;
h = playerArea.height(), w;
canvas.height = h;
@ -45,7 +45,7 @@ export default Em.Mixin.create({
pageHidden = document.hidden || document.msHidden || document.webkitHidden || document.mozHidden;
// dont do anything if the page is hidden or no visualization
if(currentVisName === 'None' || pageHidden){
if(currentVisName === 'None' || pageHidden || !this.get('active')){
return;
}
@ -85,5 +85,4 @@ export default Em.Mixin.create({
}
});
}
})
;
});