eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-22 15:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated selection target for OSC

Browse Source 
Adds ability to target a selection of sources stored in the Player
This commit is contained in:
Bruno Herbelin
2023-01-27 20:43:29 +01:00
parent 9ee434f275
commit 9c8abb8edf
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ControlManager.cpp
View File

@@ -22,6 +22,7 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <iomanip> #include <iomanip>
#include <regex>
#include "osc/OscOutboundPacketStream.h" #include "osc/OscOutboundPacketStream.h"
@@ -83,6 +84,7 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
// next part of the OSC message is the attribute // next part of the OSC message is the attribute
address.pop_front(); address.pop_front();
std::string attribute = address.front(); std::string attribute = address.front();
// Log target: just print text in log window // Log target: just print text in log window
if ( target.compare(OSC_INFO) == 0 ) if ( target.compare(OSC_INFO) == 0 )
{ {
@@ -127,15 +129,37 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
Control::manager().sendSourceAttibutes(remoteEndpoint, OSC_CURRENT); Control::manager().sendSourceAttibutes(remoteEndpoint, OSC_CURRENT);
} }
} }
// Selected sources target: apply attribute to all sources of the selection // Selection sources target: apply attribute to all sources of the selection
else if ( target.compare(OSC_SELECTED) == 0 ) else if ( target.compare(OSC_SELECTED) >= 0 )
{ {
// Loop over selected sources std::smatch reg_match;
for (SourceList::iterator it = Mixer::selection().begin(); it != Mixer::selection().end(); ++it) { static std::regex reg_exp( "\\#[[:digit:]]+");
// apply attributes
if ( Control::manager().receiveSourceAttribute( *it, attribute, m.ArgumentStream()) && Mixer::manager().currentSource() == *it) // is the target complemented with a '#' and a number ?
// and send back feedback if needed if ( std::regex_search(target, reg_match, reg_exp) ) {
Control::manager().sendSourceAttibutes(remoteEndpoint, OSC_CURRENT); int i = 0;
std::string num = reg_match.str().substr(1, reg_match.length()-1);
if ( BaseToolkit::is_a_number(num, &i)){
// confirmed : the target is a Player selection (e.g. 'selection#2')
// loop over this selection of sources
SourceList _selection = Mixer::manager().session()->playGroup(i);
for (SourceList::iterator it = _selection.begin(); it != _selection.end(); ++it) {
// apply attributes
if ( Control::manager().receiveSourceAttribute( *it, attribute, m.ArgumentStream()) && Mixer::manager().currentSource() == *it)
// and send back feedback if needed
Control::manager().sendSourceAttibutes(remoteEndpoint, OSC_CURRENT);
}
}
}
// not mathching regex; should be exactly OSC_SELECTED
else if (target.compare(OSC_SELECTED) == 0) {
// Loop over dynamically selected sources
for (SourceList::iterator it = Mixer::selection().begin(); it != Mixer::selection().end(); ++it) {
// apply attributes
if ( Control::manager().receiveSourceAttribute( *it, attribute, m.ArgumentStream()) && Mixer::manager().currentSource() == *it)
// and send back feedback if needed
Control::manager().sendSourceAttibutes(remoteEndpoint, OSC_CURRENT);
}
} }
} }
// Current source target: apply attribute to the current sources // Current source target: apply attribute to the current sources

2
src/ControlManager.h
View File

@@ -25,7 +25,7 @@
#define OSC_OUTPUT_FADE_OUT "/fade-out" #define OSC_OUTPUT_FADE_OUT "/fade-out"
#define OSC_ALL "/all" #define OSC_ALL "/all"
#define OSC_SELECTED "/selected" #define OSC_SELECTED "/selection"
#define OSC_CURRENT "/current" #define OSC_CURRENT "/current"
#define OSC_NEXT "/next" #define OSC_NEXT "/next"
#define OSC_PREVIOUS "/previous" #define OSC_PREVIOUS "/previous"