eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Select Linked MixingGroup on double clic & a bug fix

Browse Source
This commit is contained in:
Bruno Herbelin
2022-01-06 22:04:05 +01:00
parent 1e2096e691
commit a92b45ae26
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
UserInterfaceManager.cpp
View File

@@ -69,6 +69,7 @@ using namespace std;
#include "Settings.h" #include "Settings.h"
#include "SessionCreator.h" #include "SessionCreator.h"
#include "Mixer.h" #include "Mixer.h"
#include "MixingGroup.h"
#include "Recorder.h" #include "Recorder.h"
#include "Streamer.h" #include "Streamer.h"
#include "Loopback.h" #include "Loopback.h"
@@ -387,13 +388,13 @@ void UserInterface::handleKeyboard()
Mixer::manager().deleteSelection(); Mixer::manager().deleteSelection();
// button tab to select next // button tab to select next
else if ( !alt_modifier_active && ImGui::IsKeyPressed( GLFW_KEY_TAB )) { else if ( !alt_modifier_active && ImGui::IsKeyPressed( GLFW_KEY_TAB )) {
// cancel selection
if (!Mixer::selection().empty())
Mixer::selection().clear();
if (shift_modifier_active) if (shift_modifier_active)
Mixer::manager().setCurrentPrevious(); Mixer::manager().setCurrentPrevious();
else else
Mixer::manager().setCurrentNext(); Mixer::manager().setCurrentNext();
// cancel selection
if (!Mixer::selection().empty())
Mixer::selection().clear();
} }
// arrow keys to act on current view // arrow keys to act on current view
else if (ImGui::IsKeyDown( GLFW_KEY_LEFT )) else if (ImGui::IsKeyDown( GLFW_KEY_LEFT ))
@@ -564,6 +565,12 @@ void UserInterface::handleMouse()
// discard current to select front most source // discard current to select front most source
// (because single clic maintains same source active) // (because single clic maintains same source active)
Mixer::manager().unsetCurrentSource(); Mixer::manager().unsetCurrentSource();
else {
MixingGroup *g = Mixer::manager().currentSource()->mixingGroup();
if (g != nullptr){
Mixer::selection().set( g->getCopy() );
}
}
// display source in left pannel // display source in left pannel
navigator.showPannelSource( Mixer::manager().indexCurrentSource() ); navigator.showPannelSource( Mixer::manager().indexCurrentSource() );
} }