wip
This commit is contained in:
parent
46c18610e6
commit
bdd44985fa
|
|
@ -70,7 +70,8 @@ MixerActions = @MixerActions
|
|||
$mute = $root.find('.track-icon-mute')
|
||||
$pan = $root.find('.track-icon-pan')
|
||||
|
||||
if @props.isOpener || @props.mode == MIX_MODES.MASTER
|
||||
# get rid of idea that only open can modify
|
||||
if true # @props.isOpener || @props.mode == MIX_MODES.MASTER
|
||||
context.JK.interactReactBubble(
|
||||
$mute,
|
||||
'SessionTrackVolumeHover',
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@ MixerActions = @MixerActions
|
|||
$mute = $root.find('.track-icon-mute')
|
||||
$pan = $root.find('.track-icon-pan')
|
||||
|
||||
if @props.isOpener || @props.mode == MIX_MODES.MASTER
|
||||
# get rid of idea that only open can modify
|
||||
if true # @props.isOpener || @props.mode == MIX_MODES.MASTER
|
||||
context.JK.interactReactBubble(
|
||||
$mute,
|
||||
'SessionTrackVolumeHover',
|
||||
|
|
|
|||
|
|
@ -252,20 +252,20 @@ ChannelGroupIds = context.JK.ChannelGroupIds
|
|||
if this.state.mediaSummary.backingTrackOpen
|
||||
|
||||
for backingTrack in @state.backingTracks
|
||||
backingTrack.mode = MIX_MODES.PERSONAL
|
||||
backingTrack.mode = @props.mode
|
||||
mediaTracks.push(`<SessionBackingTrack key={backingTrack.track.id} {...backingTrack} />`)
|
||||
|
||||
else if this.state.mediaSummary.recordingOpen
|
||||
|
||||
mediaTracks.push(`<SessionRecordedCategory key="RecordedCategory" recordingName={this.state.recordingName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
|
||||
mediaTracks.push(`<SessionRecordedCategory key="RecordedCategory" recordingName={this.state.recordingName} mixers={this.state.mediaCategoryMixer} mode={@props.mode} />`)
|
||||
for recordedTrack in @state.recordedTracks
|
||||
recordedTrack.mode = MIX_MODES.PERSONAL
|
||||
recordedTrack.mode = @props.mode
|
||||
mediaTracks.push(`<SessionRecordedTrack key={recordedTrack.track.id} {...recordedTrack} />`)
|
||||
|
||||
# if a JamTrack is also open (meaning the Recording was made with a Jamtrack), show it's mixers as well
|
||||
if this.state.mediaSummary.jamTrackOpen
|
||||
for jamTrack in @state.jamTracks
|
||||
jamTrack.mode = MIX_MODES.PERSONAL
|
||||
jamTrack.mode = @props.mode
|
||||
mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
|
||||
|
||||
else if this.state.mediaSummary.jamTrackOpen
|
||||
|
|
@ -274,20 +274,20 @@ ChannelGroupIds = context.JK.ChannelGroupIds
|
|||
# The Category mixer
|
||||
# The Metronome
|
||||
# All the JamTracks
|
||||
mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
|
||||
mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={@props.mode} />`)
|
||||
|
||||
if @state.metronome? # && @state.jamTrackMixdown.id == null
|
||||
@state.metronome.mode = MIX_MODES.PERSONAL
|
||||
@state.metronome.mode = @props.mode
|
||||
mediaTracks.push(`<SessionMetronome key="JamTrackMetronome" {...this.state.metronome} location="jam-track" />`)
|
||||
|
||||
|
||||
for jamTrack in @state.jamTracks
|
||||
jamTrack.mode = MIX_MODES.PERSONAL
|
||||
jamTrack.mode = @props.mode
|
||||
mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
|
||||
|
||||
else if this.state.mediaSummary.metronomeOpen
|
||||
|
||||
@state.metronome.mode = MIX_MODES.PERSONAL
|
||||
@state.metronome.mode = @props.mode
|
||||
mediaTracks.push(`<SessionMetronome key={this.state.metronome.id} {...this.state.metronome} />`)
|
||||
|
||||
contents = closeOptions
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ SessionActions = context.SessionActions
|
|||
|
||||
if @state.tracks.length > 0
|
||||
for track in @state.tracks
|
||||
track.mode = MIX_MODES.PERSONAL
|
||||
track.mode = @props.mode
|
||||
tracks.push(`<SessionMyTrack key={track.track.client_track_id} {...track} />`)
|
||||
|
||||
if @state.chat
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@ MixerActions = @MixerActions
|
|||
$mute = $root.find('.track-icon-mute')
|
||||
$pan = $root.find('.track-icon-pan')
|
||||
|
||||
if @props.isOpener || @props.mode == MIX_MODES.MASTER
|
||||
# get rid of idea that only open can modify
|
||||
if true # @props.isOpener || @props.mode == MIX_MODES.MASTER
|
||||
context.JK.interactReactBubble(
|
||||
$mute,
|
||||
'SessionTrackVolumeHover',
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ SessionActions = @SessionActions
|
|||
<SessionLeaveBtn />
|
||||
</div>
|
||||
<div className="tracks" id="new-tracks">
|
||||
<SessionMyTracks mode={MIX_MODES.PERSONAL} />
|
||||
<SessionMyTracks mode={MIX_MODES.MASTER} />
|
||||
<SessionOtherTracks mode={MIX_MODES.PERSONAL} />
|
||||
<SessionMediaTracks mode={MIX_MODES.PERSONAL} />
|
||||
<SessionNotifications />
|
||||
|
|
|
|||
Loading…
Reference in New Issue