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

Added OSC interface for batch#

Browse Source
This commit is contained in:
Bruno Herbelin
2023-02-06 08:21:37 +01:00
parent c5cb635b4e
commit 3b51a6e2a9
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ControlManager.cpp
View File

@@ -130,7 +130,17 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
}
}
// Selection sources target: apply attribute to all sources of the selection
else if ( target.compare(OSC_SELECTED) >= 0 )
else if (target.compare(OSC_SELECTION) == 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);
}
}
// Batch sources target: apply attribute to all sources in the Batch
else if ( target.compare(OSC_BATCH) > 0 && target.compare(OSC_BATCH) < 3 )
{
std::smatch reg_match;
static std::regex reg_exp( "\\#[[:digit:]]+");
@@ -140,25 +150,19 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
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()->getBatch(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);
if ( i < (int) Mixer::manager().session()->numBatch() ) {
// confirmed : the target is a Player Batch (e.g. 'batch#2')
// loop over this list of sources
SourceList _selection = Mixer::manager().session()->getBatch(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);
else
Log::Info(CONTROL_OSC_MSG "No batch '%s' requested by %s.", target.c_str(), sender);
}
}
}