This commit is contained in:
Seth Call 2015-07-01 15:24:33 -05:00
parent 7e6e79ccca
commit 512e89074b
10 changed files with 28 additions and 22 deletions

View File

@ -89,11 +89,13 @@ mixins.push(Reflux.listenTo(MediaPlaybackStore, 'onMediaStateChanged'))
context.JK.checkbox($loop)
$loop.on('ifChecked', () =>
console.log("@props", @props)
MixerActions.loopChanged(@props.backingTracks[0].mixers.mixer, true)
logger.debug("@props", @props)
# it doesn't matter if you do personal or master, because backend just syncs both
MixerActions.loopChanged(@props.backingTracks[0].mixers.personal.mixer, true)
)
$loop.on('ifUnchecked', () =>
MixerActions.loopChanged(@props.backingTracks[0].mixers.mixer, false)
# it doesn't matter if you do personal or master, because backend just syncs both
MixerActions.loopChanged(@props.backingTracks[0].mixers.personal.mixer, false)
)
@resizeWindow()

View File

@ -40,7 +40,7 @@ MixerActions = @MixerActions
"backing-track" : true
})
pan = mixers.mixer.pan
pan = if mixers.mixer? then mixers.mixer?.pan else 0
panStyle = {
transform: "rotate(#{pan}deg)"

View File

@ -40,7 +40,7 @@ MixerActions = @MixerActions
"jam-track" : true
})
pan = mixers.mixer.pan
pan = if mixers.mixer? then mixers.mixer?.pan else 0
panStyle = {
transform: "rotate(#{pan}deg)"

View File

@ -8,6 +8,6 @@ MIX_MODES = context.JK.MIX_MODES
<SessionMasterMyTracks mode={MIX_MODES.MASTER} />
<SessionMasterOtherTracks mode={MIX_MODES.MASTER} />
<SessionMasterMediaTracks mode={MIX_MODES.MASTER} />
<SessionMasterCategoryControls />
<SessionMasterCategoryControls mode={MIX_MODES.MASTER} />
</div>`
})

View File

@ -31,7 +31,7 @@ MixerActions = @MixerActions
"metronome" : true
})
pan = mixers.mixer.pan
pan = if mixers.mixer? then mixers.mixer?.pan else 0
panStyle = {
transform: "rotate(#{pan}deg)"

View File

@ -13,7 +13,9 @@ MixerActions = @MixerActions
muting = $(e.currentTarget).is('.enabled')
MixerActions.mute([this.props.mixers.mixer, this.props.mixers.oppositeMixer], muting)
mixers = if this.props.tracks.length > 0 then this.props.tracks[0].mixers else {}
MixerActions.mute([mixers.mixer], muting)
render: () ->

View File

@ -40,7 +40,7 @@ MixerActions = @MixerActions
"recorded-track" : true
})
pan = mixers.mixer.pan
pan = if mixers.mixer? then mixers.mixer?.pan else 0
panStyle = {
transform: "rotate(#{pan}deg)"

View File

@ -505,6 +505,10 @@ MIX_MODES = context.JK.MIX_MODES;
mixers = if mixMode == MIX_MODES.MASTER then @masterMixers else @personalMixers;
for mixer in mixers
unless mixer?
logger.debug("empty mixer: ", mixers)
continue
if mixer.client_id == clientId
for groupId in groupIds
if mixer.group_id == groupId
@ -746,6 +750,7 @@ MIX_MODES = context.JK.MIX_MODES;
if mixer?
context.JK.VuHelpers.updateVU3(mixer, leftValue, leftClipping, rightValue, rightClipping)
###
if mixer
if mixer.stereo # // stereo track

View File

@ -12,18 +12,18 @@ context = window
if session.inSession()
participant = session.getParticipant(@app.clientId)
photoUrl = context.JK.resolveAvatarUrl(participant.user.photo_url);
chatMixer = mixers.chatMixer
chat = null
if chatMixer
chat =
mixers: chatMixer
mode: @props.mode
photoUrl: photoUrl
if participant
photoUrl = context.JK.resolveAvatarUrl(participant.user.photo_url);
chatMixer = mixers.chatMixer
chat = null
if chatMixer
chat =
mixers: chatMixer
mode: @props.mode
photoUrl: photoUrl
name = participant.user.name;
for track in participant.tracks

View File

@ -217,9 +217,6 @@
var fqId = this.createQualifiedId(mixer)
if(mixer.group_id == 13) {
logger.debug("mixer", mixer)
}
var registrations = this.registeredMixers[fqId]
if (registrations) {
var j;