diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 9a8e1dd6a..ba1c0535f 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -38,6 +38,7 @@ var sessionPageDone = null; var $recordingManagerViewer = null; var $screen = null; + var $mixModeDropdown = null; var rest = context.JK.Rest(); var RENDER_SESSION_DELAY = 750; // When I need to render a session, I have to wait a bit for the mixers to be there. @@ -491,13 +492,15 @@ var holder = $.extend(true, {}, {mixers: context.jamClient.SessionGetControlState(mixerIds)}); mixers = holder.mixers; // Always add a hard-coded simplified 'mixer' for the L2M mix - var l2m_mixer = { + + /** + var l2m_mixer = { id: '__L2M__', range_low: -80, range_high: 20, volume_left: context.jamClient.SessionGetMasterLocalMix() }; - mixers.push(l2m_mixer); + mixers.push(l2m_mixer);*/ } function _mixersForGroupId(groupId) { @@ -1483,7 +1486,9 @@ $recordingManagerViewer = $('#recording-manager-viewer'); $screen = $('#session-screen'); - // make sure no previous plays are still going on by accident + $mixModeDropdown = $screen.find('select.monitor-mode') + + // make sure no previous plays are still going on by accident context.jamClient.SessionStopPlay(); if(context.jamClient.SessionRemoveAllPlayTracks) { // upgrade guard diff --git a/web/app/assets/stylesheets/client/session.css.scss b/web/app/assets/stylesheets/client/session.css.scss index 0a7e00e86..90d4eb4a8 100644 --- a/web/app/assets/stylesheets/client/session.css.scss +++ b/web/app/assets/stylesheets/client/session.css.scss @@ -69,6 +69,11 @@ .playback-mode-buttons { display:none; } + + .monitor-mode-holder .easydropdown-wrapper{ + top:-7px; + left:5px; + } } diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb index 6865d987f..92e8293c6 100644 --- a/web/app/views/clients/_session.html.erb +++ b/web/app/views/clients/_session.html.erb @@ -30,12 +30,22 @@ + +