From b09825d18840cf6c274fed3ce84dadf09006dcab Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 18 Feb 2015 10:16:47 -0600 Subject: [PATCH] * VRFS-2791 - unique-ify recorded backing track and backing track IDs --- ruby/lib/jam_ruby/models/backing_track.rb | 2 -- ruby/lib/jam_ruby/models/recorded_backing_track.rb | 2 +- web/app/assets/javascripts/session.js | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/backing_track.rb b/ruby/lib/jam_ruby/models/backing_track.rb index 7437b2de7..fc5e6517b 100644 --- a/ruby/lib/jam_ruby/models/backing_track.rb +++ b/ruby/lib/jam_ruby/models/backing_track.rb @@ -15,7 +15,5 @@ module JamRuby self.connection.user end - - end end \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/recorded_backing_track.rb b/ruby/lib/jam_ruby/models/recorded_backing_track.rb index 42513620c..0826d160c 100644 --- a/ruby/lib/jam_ruby/models/recorded_backing_track.rb +++ b/ruby/lib/jam_ruby/models/recorded_backing_track.rb @@ -30,7 +30,7 @@ module JamRuby recorded_backing_track.recording = recording recorded_backing_track.client_id = backing_track.connection.client_id recorded_backing_track.backing_track_id = backing_track.id - recorded_backing_track.client_track_id = backing_track.client_track_id + recorded_backing_track.client_track_id = "R" + backing_track.client_track_id # Matches behavior in RecordingManager.cpp#getWavComment recorded_backing_track.user = backing_track.connection.user recorded_backing_track.filename = backing_track.filename recorded_backing_track.next_part_to_upload = 0 diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index b7856d46b..3f9b2260a 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -952,6 +952,7 @@ backingTracks = sessionModel.backingTracks(); backingTrackMixers = context._.filter(backingTrackMixers, function(mixer){return !mixer.managed}) if(backingTrackMixers.length > 1) { + logger.error("multiple, managed backing track mixers encountered", backingTrackMixers) app.notify({ title: "Multiple Backing Tracks Encountered", text: "Only one backing track can be open a time.",