seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3364 - show metronome while jamtrack is open

This commit is contained in:
Seth Call 2015-07-27 15:35:21 -05:00
parent 823da09ef3
commit 0c58a0c1d3
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
View File

@ -263,10 +263,9 @@ ChannelGroupIds = context.JK.ChannelGroupIds
# All the JamTracks
mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
# this is not ready yet until VRFS-3363 is done
#if @state.metronome?
# @state.metronome.mode = MIX_MODES.PERSONAL
# mediaTracks.push(`<SessionMetronome key="JamTrackMetronome" {...this.state.metronome} />`)
if @state.metronome?
@state.metronome.mode = MIX_MODES.PERSONAL
mediaTracks.push(`<SessionMetronome key="JamTrackMetronome" {...this.state.metronome} location="jam-track" />`)
for jamTrack in @state.jamTracks
jamTrack.mode = MIX_MODES.PERSONAL

1
web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
View File

@ -33,6 +33,7 @@ MIX_MODES = context.JK.MIX_MODES
"session-track" : true
"metronome" : true
"no-mixer" : @props.mode == MIX_MODES.MASTER # show it as disabled if in master mode
"in-jam-track" : @props.location == 'jam-track'
})
pan = if mixers.mixer? then mixers.mixer?.pan else 0

9
web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
View File

@ -175,6 +175,15 @@
.track-controls {
margin-left:0;
}
&.in-jam-track {
min-height:56px;
.track-buttons {
margin-top:2px;
}
table.vu {
margin-top: 10px;
}
}
}
&.recorded-track, &.jam-track, &.recorded-category, &.jam-track-category {