From 5a37bd1d4ae3267ac69339af2959205e01ddcacd Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Tue, 3 Nov 2015 01:53:06 -0800 Subject: [PATCH] fallback for mic stream stop --- app/pods/components/music-tab/component.js | 8 +++++++- app/pods/components/music-tab/mixins/helpers.js | 2 +- app/pods/components/music-tab/template.hbs | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index cabc1a9..5b5140d 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -95,7 +95,13 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { this.changePlayerControl('audioMode', 0); if(!Em.isNone(audioStream)){ - audioStream.stop(); + var tracks = audioStream.getVideoTracks(); + if (tracks && tracks[0] && tracks[0].stop) tracks[0].stop(); + + if (audioStream.stop) { + // deprecated, may be removed in future + audioStream.stop(); + } this.setProperties({ audioStream: null, diff --git a/app/pods/components/music-tab/mixins/helpers.js b/app/pods/components/music-tab/mixins/helpers.js index 0c863cb..4dc5ec9 100644 --- a/app/pods/components/music-tab/mixins/helpers.js +++ b/app/pods/components/music-tab/mixins/helpers.js @@ -33,7 +33,7 @@ export default Em.Mixin.create({ values: [0,20,40,60,80,100], density: 10, format: { - to: function ( value ) {return value;}, + to: function ( value ) {return 'x'+value;}, from: function ( value ) { return value; } } } diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs index 0549852..d78174f 100644 --- a/app/pods/components/music-tab/template.hbs +++ b/app/pods/components/music-tab/template.hbs @@ -157,7 +157,6 @@
Microphone Boost {{range-slider start=micBoost orientation="vertical" step=beatOptions.micBoost.step range=beatOptions.micBoost.range slide="micBoostChanged" pips=beatOptions.micBoost.pips}} -
{{micBoost}}
{{/if}}