diff --git a/web/app/assets/javascripts/asyncJamClient.js b/web/app/assets/javascripts/asyncJamClient.js index 309be55e9..f29c7702f 100644 --- a/web/app/assets/javascripts/asyncJamClient.js +++ b/web/app/assets/javascripts/asyncJamClient.js @@ -416,6 +416,7 @@ VST_EnableMidiForTrack: enumAppCounter++, VST_GetMidiDeviceList: enumAppCounter++, VST_ScanForMidiDevices: enumAppCounter++, + SessionSetTrackVolumeData: enumAppCounter++, }); function setupWebSocketConnection() { diff --git a/web/app/assets/javascripts/ftue.js b/web/app/assets/javascripts/ftue.js index 5f1215ee4..2011a4367 100644 --- a/web/app/assets/javascripts/ftue.js +++ b/web/app/assets/javascripts/ftue.js @@ -187,7 +187,8 @@ // Default input/output to 0 DB context.trackVolumeObject.volL = db; context.trackVolumeObject.volR = db; - await jamClient.SessionSetControlState(trackIds[index]); + //await jamClient.SessionSetControlState(trackIds[index]); + await context.jamClient.SessionSetTrackVolumeData(trackIds[index], null, context.trackVolumeObject) }); $.each(context._.keys(faderMap), function (index, faderId) { // faderChange takes a value from 0-100 diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index 1f96f9df9..2c0c60e43 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -254,9 +254,11 @@ context.JK.MusicianSearchFilter = class MusicianSearchFilter extends BaseSearchF super() loadSearchFilter: (sFilter) => + super(sFilter) - @searchFilter = JSON.parse(sFilter) + @searchFilter = JSON.parse(sFilter) + console.log('loadSearchFilter', sFilter, @searchFilter, this.filterData()) args = interests: this.filterData().interests skill_level: this.filterData().skill_level diff --git a/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee b/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee index ef5de0842..b657662c3 100644 --- a/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee +++ b/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee @@ -723,7 +723,8 @@ MIX_MODES = context.JK.MIX_MODES; context.trackVolumeObject.mute = muting; - await context.jamClient.SessionSetControlState(mixerId, mode); + #await context.jamClient.SessionSetControlState(mixerId, mode); + await context.jamClient.SessionSetTrackVolumeData(mixerId, mode, context.trackVolumeObject) // keep state of mixer in sync with backend const mixer = this.getMixer(mixerId, mode); @@ -881,7 +882,8 @@ MIX_MODES = context.JK.MIX_MODES; setMixerPan: `async function(mixer, panPercent) { context.trackVolumeObject.pan = context.JK.PanHelpers.convertPercentToPan(panPercent); - await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + #await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + await context.jamClient.SessionSetTrackVolumeData(mixer.id, mixer.mode, context.trackVolumeObject) }` # loopChanged: (mixer, shouldLoop) -> @@ -898,7 +900,8 @@ MIX_MODES = context.JK.MIX_MODES; this.fillTrackVolumeObject(mixer.id, mixer.mode); context.trackVolumeObject.loop = shouldLoop; - await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + #await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + await context.jamClient.SessionSetTrackVolumeData(mixer.id, mixer.mode, context.trackVolumeObject) // keep state of mixer in sync with backend mixer = this.getMixer(mixer.id, mixer.mode); @@ -988,7 +991,8 @@ MIX_MODES = context.JK.MIX_MODES; } await context.jamClient.setSessionMixerCategoryPlayoutState(controlGroup === 'music', controlGroupsArg); } else { - await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + #await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + await context.jamClient.SessionSetTrackVolumeData(mixer.id, mixer.mode, context.trackVolumeObject) } }` diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 270e4f523..fa14f5316 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -2301,7 +2301,8 @@ if(mode === undefined) { mode = sessionModel.getMixMode(); } - await context.jamClient.SessionSetControlState(mixerId, mode); + //await context.jamClient.SessionSetControlState(mixerId, mode); + await context.jamClient.SessionSetTrackVolumeData(mixerId, mode, context.trackVolumeObject) } async function _toggleAudioLoop(mixerId, loop, mode) { @@ -2311,7 +2312,8 @@ if(mode === undefined) { mode = sessionModel.getMixMode(); } - await context.jamClient.SessionSetControlState(mixerId, mode); + //await context.jamClient.SessionSetControlState(mixerId, mode); + await context.jamClient.SessionSetTrackVolumeData(mixerId, mode, context.trackVolumeObject) } function showMuteDropdowns($control) { @@ -2474,7 +2476,8 @@ // if this is a media file (Metronome, JamTrack, BackingTrack, RecordedTrack), then we only modify master //var mixMode = isMediaMixer ? MIX_MODES.MASTER : sessionModel.getMixMode(); - await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + //await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); + await context.jamClient.SessionSetTrackVolumeData(mixer.id, mixer.mode, context.trackVolumeObject) } }