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

BugFix: OSC target Batch testing was preventing other targets

Browse Source 
Restore normal use of target /current for OSC
This commit is contained in:
Bruno Herbelin
2023-02-14 00:34:21 +01:00
parent c7367ad46a
commit 1dd2151a20
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/ControlManager.cpp
View File

@@ -139,33 +139,6 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
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:]]+");
// is the target complemented with a '#' and a number ?
if ( std::regex_search(target, reg_match, reg_exp) ) {
int i = 0;
std::string num = reg_match.str().substr(1, reg_match.length()-1);
if ( BaseToolkit::is_a_number(num, &i)){
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);
}
}
else
Log::Info(CONTROL_OSC_MSG "No batch '%s' requested by %s.", target.c_str(), sender);
}
}
}
// Current source target: apply attribute to the current sources
else if ( target.compare(OSC_CURRENT) == 0 )
{
@@ -200,6 +173,34 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
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::string reg_string = target;
std::smatch reg_match;
static std::regex reg_exp( "\\#[[:digit:]]+");
// is the target complemented with a '#' and a number ?
if ( std::regex_search(reg_string, reg_match, reg_exp) ) {
int i = 0;
std::string num = reg_match.str().substr(1, reg_match.length()-1);
if ( BaseToolkit::is_a_number(num, &i)){
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);
}
}
else
Log::Info(CONTROL_OSC_MSG "No batch '%s' requested by %s.", target.c_str(), sender);
}
}
}
// General case: try to identify the target
else {
// try to find source by index