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

nothing here...trying to get mic recording

Browse source
This commit is contained in:
Egor 2015-09-30 22:47:18 -07:00
parent 211ce448f1
commit 97a70350f8
4 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,12 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
actions: {
useMic: function() {
this.changePlayerControl('usingMic', !this.get('usingMic'));
var usingMic = this.get('usingMic');
this.changePlayerControl('usingMic', !usingMic);
if(!usingMic){
Em.$('#micInput').click();
}
},
slideTogglePlayerBottom: function(){
this.changePlayerControl('playerBottomDisplayed', !this.get('playerBottomDisplayed'));

4
app/components/mixins/music-control.js
View file

@ -49,7 +49,7 @@ export default Em.Mixin.create({
transitionTime: {
range: {min: 0, max: 0.5},
step: 0.1,
defaultValue: 0,
defaultValue: 0.1,
pips: {
mode: 'positions',
values: [0,20,40,60,80,100],
@ -62,7 +62,7 @@ export default Em.Mixin.create({
}
},
transitionTime: 0,
transitionTime: 0.1,
threshold: 0.3,
decay: 0.02,
frequency: [0,4],

13
app/styles/app.scss
View file

@ -399,9 +399,16 @@ md-toolbar {
}
#slideToggle {
color: white;
color: $playerDefaultIconColor;
background-color: $playerBottomBackground;
padding: 5px;
div md-icon {
font-size: 40px;
color: inherit !important;
}
}
#slideToggle:hover{
color: lighten($playerDefaultIconColor, 30%) !important;;
}
md-switch.md-default-theme.md-checked .md-bar {
@ -612,7 +619,7 @@ md-switch.md-default-theme.md-checked .md-thumb {
box-shadow: inset 0 0 20px 0 rgba(0, 0, 0, 1);
}
#fileInput {
#fileInput, #micInput {
width: 1px;
height: 1px;
visibility: hidden;

22
app/templates/components/controls/music-control.hbs
View file

@ -17,7 +17,7 @@
data-title="Next" {{action "next"}}>{{paper-icon icon="skip-next" action="" class="playerControllIcon"}}</span><!--
-->{{/if}}<!--
--><span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" id="volumeMutedTooltip"
data-title={{volumeMutedTooltipTxt}} {{action "volumeMutedChanged"}}>{{paper-icon icon=volumeClass class="playerControllIcon volumeButton"}}</span><!--
data-title={{volumeMutedTooltipTxt}} {{action "volumeMutedChanged"}}>{{paper-icon icon=volumeClass class="playerControllIcon volumeButton"}}</span><!--
-->{{range-slider start=volume min=0 max=100 slide="volumeChanged" id="volumeBar"}}
<div id="playerTimeControls">{{timeElapsedTxt}} / {{timeTotalTxt}}</div>
@ -34,7 +34,8 @@
</div>
<div id="playlist" class="col-sm-4 col-xs-12">
<input id="fileInput" type="file" accept="audio/*" multiple="true"/>
<input id="fileInput" type="file" accept="audio/*" multiple="true" />
<input id="micInput" type="file" accept="audio/*" capture />
<div id="playListControls">
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
@ -76,10 +77,13 @@
</div>
</div>
<div class="text-center cursorPointer row" {{action "slideTogglePlayerBottom"}}>
<div id="slideToggle" class="col-xs-12">
{{paper-icon icon=beatDetectionArrowIcon}} Beat Detection Settings {{paper-icon icon=beatDetectionArrowIcon}}
<div id="slideToggle" class="text-center cursorPointer row" {{action "slideTogglePlayerBottom"}}>
<div class="col-xs-offset-3 col-xs-3">
{{paper-icon icon=beatDetectionArrowIcon}}
</div>
<div class="col-xs-3">
{{paper-icon icon=beatDetectionArrowIcon}}
</div>
</div>
{{#if playerBottomDisplayed}}
@ -125,15 +129,11 @@
<div id="beatOptionButtonGroup" class="row">
<div class="beatOption col-xs-6">
{{#paper-switch checked=sequentialTransition disabled=trial}}<span data-toggle="tooltip"
data-placement="bottom auto"
data-title="The order in which the active lights are transitioned to on beat"
{{#paper-switch checked=sequentialTransition disabled=trial}}<span data-toggle="tooltip" data-placement="bottom auto" data-title="The order in which the active lights are transitioned to on beat"
class="optionDescription bootstrapTooltip">{{sequentialTransitionLabel}}</span>{{/paper-switch}}
</div>
<div class="beatOption col-xs-6">
{{#paper-switch checked=onBeatBriOnly disabled=trial}}<span data-toggle="tooltip" data-placement="bottom auto"
data-title="The properties of the lights to change on beat"
class="optionDescription bootstrapTooltip"> {{onBeatBriOnlyLabel}}</span>{{/paper-switch}}
{{#paper-switch checked=onBeatBriOnly disabled=trial}}<span data-toggle="tooltip" data-placement="bottom auto" data-title="The properties of the lights to change on beat" class="optionDescription bootstrapTooltip"> {{onBeatBriOnlyLabel}}</span>{{/paper-switch}}
</div>
</div>