From 31e4fbfdf86d05a4d726a71d60089b2f984e3938 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 25 Mar 2015 14:45:51 -0500 Subject: [PATCH] * suppress metronome logic when JamTrack is open VRFS-2971 --- web/app/assets/javascripts/session.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 5aa7ac747..38e469d3d 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -481,6 +481,12 @@ function checkMetronomeTransition() { // trust backend over server + if(sessionModel.jamTracks() !== null) { + // ignore all metronome events when jamtracks are open, because backend opens metronome mixer to play jamtrack tap-ins + logger.debug("ignore checkMetronomeTransition because JamTrack is open") + return; + } + var metronomeMasterMixers = getMetronomeMasterMixers(); if (metronomeMixer == null && metronomeMasterMixers.length > 0) { @@ -1035,7 +1041,7 @@ if(jamTrackMixers.length > 0) { renderJamTracks(jamTrackMixers); } - if(metronomeTrackMixers.length > 0) { + if(metronomeTrackMixers.length > 0 && sessionModel.jamTracks() === null) { renderMetronomeTracks(metronomeTrackMixers); } if(adhocTrackMixers.length > 0) {