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

VRFS-5653 - fix Music/Chat slider

This commit is contained in:
Seth Call 2025-08-02 11:04:46 -05:00
parent 80010723ca
commit f755e2b0a0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,9 +972,11 @@ MIX_MODES = context.JK.MIX_MODES;
} else { } else {
controlGroupsArg = 1; controlGroupsArg = 1;
} }
await context.jamClient.setSessionMixerCategoryPlayoutState(controlGroup === 'music', controlGroupsArg); //console.log("setSessionMixerCategoryPlayoutState", controlGroup, controlGroupsArg, context.trackVolumeObject.volL)
await context.jamClient.setSessionMixerCategoryPlayoutState(controlGroup === 'music', controlGroupsArg, context.trackVolumeObject.volL);
} else { } else {
//await context.jamClient.SessionSetControlState(mixer.id, mixer.mode); //await context.jamClient.SessionSetControlState(mixer.id, mixer.mode);
//console.log("SessionSetTrackVolumeData", mixer.id, mixer.mode, context.trackVolumeObject)
await context.jamClient.SessionSetTrackVolumeData(mixer.id, mixer.mode, context.trackVolumeObject); await context.jamClient.SessionSetTrackVolumeData(mixer.id, mixer.mode, context.trackVolumeObject);
} }
}` }`

14
web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee
View File

@ -2187,6 +2187,9 @@ ConfigureTracksActions = @ConfigureTracksActions
});*/ });*/
await self.performLeaveSession(deferred); await self.performLeaveSession(deferred);
} }
else {
console.log("SessionModel:leaveSession() - skip.", this.joinDeferred == null, this.isJoinDeferredResolved);
}
}` }`
# performLeaveSession: (deferred) -> # performLeaveSession: (deferred) ->
@ -2216,22 +2219,19 @@ ConfigureTracksActions = @ConfigureTracksActions
# @issueChange() # @issueChange()
performLeaveSession: `async function(deferred) { performLeaveSession: `async function(deferred) {
logger.debug("SessionModel.leaveCurrentSession()");
console.log("performLeaveSession: calling jamClient.LeaveSession for sessionId=" + this.currentSessionId);
logger.debug("performLeaveSession: calling jamClient.LeaveSession for clientId=" + this.app.clientId);
logger.debug('before context.jamClient.LeaveSession')
await context.jamClient.LeaveSession({ sessionID: this.currentSessionId }); await context.jamClient.LeaveSession({ sessionID: this.currentSessionId });
logger.debug('before leaveSessionRest')
this.leaveSessionRest(this.currentSessionId) this.leaveSessionRest(this.currentSessionId)
.done(function() { .done(function() {
session = this.getCurrentOrLastSession(); session = this.getCurrentOrLastSession();
context.SessionStore.updateSessionInfo(session, true) context.SessionStore.updateSessionInfo(session, true)
logger.debug('leaveSessionRest done') console.log('leaveSessionRest done')
deferred.resolve(arguments[0], arguments[1], arguments[2]);}.bind(this)) deferred.resolve(arguments[0], arguments[1], arguments[2]);}.bind(this))
.fail(function() { .fail(function() {
logger.debug('leaveSessionRest fail') console.log('leaveSessionRest fail')
deferred.reject(arguments[0], arguments[1], arguments[2]); deferred.reject(arguments[0], arguments[1], arguments[2]);
}.bind(this)); }.bind(this));