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

wip

This commit is contained in:
Nuwan 2025-03-27 18:53:45 +05:30
parent 76aefd6227
commit c277fdce94
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruby/lib/jam_ruby/models/connection.rb
View File

@ -145,6 +145,7 @@ module JamRuby
end
end
#removing this check to allow users to join recording sessions
# if music_session.is_recording?
# errors.add(:music_session, ValidationMessages::CANT_JOIN_RECORDING_SESSION)
# end

2
ruby/lib/jam_ruby/models/recording.rb
View File

@ -32,7 +32,7 @@ module JamRuby
foreign_key: :foreign_key1_id,
dependent: :destroy
#validate :not_already_recording, :on => :create
validate :not_already_recording, :on => :create
#validate :not_still_finalizing_previous, :on => :create
validate :not_playback_recording, :on => :create
validate :already_stopped_recording

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

@ -1391,7 +1391,6 @@ ConfigureTracksActions = @ConfigureTracksActions
return this.app.notifyAlert("No Inputs Configured", $('<span>You will need to reconfigure your audio device.</span>'));
} else if (response["errors"] && response["errors"]["music_session"] && (response["errors"]["music_session"][0] === ["is currently recording"])) {
alert("Unable to Join Session", "The session is currently recording.");
leaveBehavior = {
location: "/client#/findSession",
notify: {
@ -2008,7 +2007,6 @@ ConfigureTracksActions = @ConfigureTracksActions
# @issueChange()
performLeaveSession: `async function(deferred) {
alert('SessionStore#performLeaveSession')
logger.debug("SessionModel.leaveCurrentSession()");
logger.debug("performLeaveSession: calling jamClient.LeaveSession for clientId=" + this.app.clientId);

14
web/app/assets/javascripts/recordingModel.js
View File

@ -115,7 +115,8 @@
}
/** Nulls can be passed for all 3 currently; that's a user request. */
function stopRecording(recordingId, reason, detail, serverStop = false) {
function stopRecording(recordingId, reason, detail) {
if(stoppingRecording) {
logger.debug("ignoring stopRecording because we are already stopping");
return;
@ -139,10 +140,11 @@
// logger.debug("preemptive stop media")
//context.jamClient.SessionStopPlay();
//}
if(serverStop){
await jamClient.PeerStopRecording(recording.id, groupedTracks);
}else{
console.log("_DEBUG_ stopRecording", recording.owner, context.JK.currentUserId)
if(recording.owner.id === context.JK.currentUserId){
alert("stopping recording for owner")
await jamClient.StopRecording(recording.id, groupedTracks);
}
@ -209,7 +211,7 @@
}
function onServerStopRecording(recordingId) {
stopRecording(recordingId, null, null, true);
stopRecording(recordingId, null, null);
}
function handleRecordingStartResult(recordingId, result) {