diff --git a/web/app/assets/javascripts/react-components/SessionMyTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMyTrack.js.jsx.coffee index b7b4a87e3..fb025d2e5 100644 --- a/web/app/assets/javascripts/react-components/SessionMyTrack.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionMyTrack.js.jsx.coffee @@ -184,6 +184,10 @@ ConfigureTracksActions = @ConfigureTracksActions if data.vstOperation == 'open-vst' ConfigureTracksActions.showVstSettings(@props.associatedVst.track) else - ConfigureTracksActions.showEditTrack(@props.associatedVst.track + 1) + # configure tracks does some sort of init that is required for this to work + + originalTrack = @props.associatedVst.track + 1 + context.JK.app.layout.showDialog('configure-tracks') + ConfigureTracksActions.showEditTrack(originalTrack) }) diff --git a/web/app/assets/javascripts/react-components/mixins/SessionMyTracksMixin.js.coffee b/web/app/assets/javascripts/react-components/mixins/SessionMyTracksMixin.js.coffee index d414dbc49..a25950505 100644 --- a/web/app/assets/javascripts/react-components/mixins/SessionMyTracksMixin.js.coffee +++ b/web/app/assets/javascripts/react-components/mixins/SessionMyTracksMixin.js.coffee @@ -73,17 +73,13 @@ MIDI_TRACK = context.JK.MIDI_TRACK else trackAssignment = mixerData.oppositeMixer?.track - if trackAssignment == MIDI_TRACK - no_pan = true - track.no_pan = no_pan - for vst in @configureTracks.vstTrackAssignments.vsts if vst.track == trackAssignment - 1 && vst.name != 'NONE' logger.debug("found VST on track", vst, track) associatedVst = vst break - tracks.push({track: track, mixerFinder: mixerFinder, mixers: mixerData, hasMixer:hasMixer, name: name, trackName: trackName, instrumentIcon: instrumentIcon, photoUrl: photoUrl, clientId: participant.client_id, associatedVst: associatedVst, no_pan: no_pan}) + tracks.push({track: track, mixerFinder: mixerFinder, mixers: mixerData, hasMixer:hasMixer, name: name, trackName: trackName, instrumentIcon: instrumentIcon, photoUrl: photoUrl, clientId: participant.client_id, associatedVst: associatedVst}) else logger.warn("SessionMyTracks: unable to find participant") diff --git a/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee b/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee index 5484b0845..424137776 100644 --- a/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee @@ -56,10 +56,16 @@ void removeSearchPath(int typeId, QString pathToRemove); @loadTrackInstruments() @changed() - onReset: (force) -> + onReset: (loadProfile) -> logger.debug("ConfigureTracksStore:reset", this) @trackNumber = null @editingTrack = null + + # you have to load the current profile in order to see track info, which we need + #if loadProfile + #currentProfile = context.jamClient.LastUsedProfileName(); + #result = context.jamClient.FTUELoadAudioConfiguration(currentProfile); + @loadChannels() @loadTrackInstruments() @@ -489,7 +495,7 @@ void removeSearchPath(int typeId, QString pathToRemove); openLiveTrackDialog: (trackNumber) -> @trackNumber = trackNumber - logger.debug("opening live track dialog for track #{trackNumber}") + logger.debug("opening live track dialog for track #{trackNumber}", @trackAssignments.inputs.assigned) @newTrack = true for inputsForTrack in @trackAssignments.inputs.assigned diff --git a/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee b/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee index 9b510b53f..2bf3d6aba 100644 --- a/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee @@ -735,7 +735,7 @@ ConfigureTracksActions = @ConfigureTracksActions @watchBackendStats() - ConfigureTracksActions.reset(false) + ConfigureTracksActions.reset(true) @delayEnableVst() ) .fail((xhr) =>