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

add jamClient.SessionSetTrackVolumeData 

this new api method is used to send session track data
over web channel to qt c++ backend
This commit is contained in:
Nuwan 2022-10-28 22:06:34 +05:30
parent 768f3d976a
commit 3be0e25bcb
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/assets/javascripts/asyncJamClient.js
View File

@ -416,6 +416,7 @@
VST_EnableMidiForTrack: enumAppCounter++,
VST_GetMidiDeviceList: enumAppCounter++,
VST_ScanForMidiDevices: enumAppCounter++,
SessionSetTrackVolumeData: enumAppCounter++,
});
function setupWebSocketConnection() {

3
web/app/assets/javascripts/ftue.js
View File

@ -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

4
web/app/assets/javascripts/member_search_filter.js.coffee
View File

@ -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

12
web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee
View File

@ -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)
}
}`

9
web/app/assets/javascripts/session.js
View File

@ -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)
}
}