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

Bugfix: support OSC source target by name with ID

Browse Source 
fix a confusion between targetting source by ID (number) and targetting a source name starting with a number.
This commit is contained in:
Bruno Herbelin
2023-03-17 11:58:28 +01:00
parent b0e71f6f18
commit c255b0249f
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ControlManager.cpp
View File

@@ -57,6 +57,7 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
{
// regular expression to check for batch
static std::regex osc_batch_reg_exp( OSC_BATCH );
static std::regex osc_sourceid_reg_exp( OSC_SOURCEID );
char sender[IpEndpointName::ADDRESS_AND_PORT_STRING_LENGTH];
remoteEndpoint.AddressAndPortAsString(sender);
@@ -186,17 +187,27 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
}
}
}
// General case: try to identify the target
// #ID sources target
else if ( std::regex_match(target, osc_sourceid_reg_exp) )
{
int i = 0;
std::string num = target.substr(1);
if ( BaseToolkit::is_a_number(num, &i)){
Source *s = Mixer::manager().sourceAtIndex(i);
if (s) {
// apply attributes to source
if ( Control::manager().receiveSourceAttribute(s, attribute, m.ArgumentStream()) )
// and send back feedback if needed
Control::manager().sendSourceAttibutes(remoteEndpoint, target, s);
}
else
Log::Info(CONTROL_OSC_MSG "Unknown target '%s' requested by %s.", target.c_str(), sender);
}
}
// General case: try to identify the target by name
else {
// try to find source by index
Source *s = nullptr;
int sourceid = -1;
if ( BaseToolkit::is_a_number(target.substr(1), &sourceid) )
s = Mixer::manager().sourceAtIndex(sourceid);
// if failed, try to find source by name
if (s == nullptr)
s = Mixer::manager().findSource(target.substr(1));
// try to find source by given name
Source *s = Mixer::manager().findSource(target.substr(1));
// if a source with the given target name or index was found
if (s) {

1
src/ControlManager.h
View File

@@ -27,6 +27,7 @@
#define OSC_ALL "/all"
#define OSC_SELECTION "/selection"
#define OSC_SOURCEID "(\\/)[[:digit:]]+$"
#define OSC_BATCH "(\\/batch#)[[:digit:]]+$"
#define OSC_CURRENT "/current"
#define OSC_NEXT "/next"