a few mic mode things, starting to switch to pods

This commit is contained in:
lone-cloud 2015-10-02 13:32:25 -07:00
parent e320cf25a7
commit 1b8a21541e
3 changed files with 22 additions and 11 deletions

View file

@ -5,5 +5,6 @@
Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": true
"disableAnalytics": true,
"usePods": true
}

View file

@ -18,13 +18,17 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
var usingMic = this.get('usingMic');
if(!usingMic){
this.startUsingMic(!usingMic);
this.startUsingMic();
} else {
this.changePlayerControl('usingMic', !usingMic);
this.get('audioStream').stop();
if(this.get('playQueuePointer') !== -1) {
this.send('goToSong',this.get('playQueuePointer'));
this.volumeChanged(this.get('volume'));
this.send('volumeChanged', this.get('volume'));
}
document.title = 'Huegasm';
}
},
slideTogglePlayerBottom(){
@ -187,9 +191,9 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
},
usingMicChanged(value){
if(value) {
this.startUsingMic(value);
this.startUsingMic();
} else {
this.set('usingMic', value);
this.set('usingMic', false);
}
},
clickSpeaker(){
@ -238,23 +242,25 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
}
},
startUsingMic(value) {
startUsingMic() {
navigator.getUserMedia(
{audio: true},
(stream) => {
this.changePlayerControl('usingMic', value);
this.changePlayerControl('usingMic', true);
var dancer = this.get('dancer');
if(dancer.audio) {
if(dancer.audio && dancer.audio.pause) {
dancer.pause();
clearInterval(this.get('incrementElapseTimeHandle'));
}
this.setProperties({
volumeCache: this.get('volume'),
playing: true
playing: true,
audioStream: stream
});
document.title = 'Listening to Mic - Huegasm';
dancer.load(stream, true);
dancer.setVolume(0);
},
@ -288,7 +294,10 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
clearCurrentAudio(resetPointer) {
var dancer = this.get('dancer');
dancer.pause();
if(dancer.audio.pause) {
dancer.pause();
}
clearInterval(this.get('incrementElapseTimeHandle'));
if(resetPointer){
@ -426,7 +435,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
sumW += waveform[i];
}
console.log('sumW: ' + sumW + ', sumS: ' + sumS)
//console.log('sumW: ' + sumW + ', sumS: ' + sumS);
});
this.setProperties({

View file

@ -82,6 +82,7 @@ export default Em.Mixin.create({
draggingOverPlayListArea: false,
dragLeaveTimeoutHandle: null,
visualizationsDisplayed: false,
audioStream: null,
notUsingMic: Em.computed.not('usingMic'),
playQueueEmpty: Em.computed.empty('playQueue'),