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

Send source name in Status bundle of all sources

Browse Source
This commit is contained in:
Bruno Herbelin
2022-08-09 23:44:22 +02:00
parent a13b0d5d91
commit abc21e9692
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ControlManager.cpp
View File

@@ -796,7 +796,7 @@ void Control::receiveMultitouchAttribute(const std::string &attribute,
void Control::sendSourceAttibutes(const IpEndpointName &remoteEndpoint, std::string target, Source *s) void Control::sendSourceAttibutes(const IpEndpointName &remoteEndpoint, std::string target, Source *s)
{ {
// default values // default values
char name[21] = {"\0"}; std::string name = "";
float lock = 0.f; float lock = 0.f;
float play = 0.f; float play = 0.f;
float depth = 0.f; float depth = 0.f;
@@ -809,7 +809,7 @@ void Control::sendSourceAttibutes(const IpEndpointName &remoteEndpoint, std::str
// fill values if the source is valid // fill values if the source is valid
if (_s!=nullptr) { if (_s!=nullptr) {
strncpy(name, _s->name().c_str(), 20); name = _s->name();
lock = _s->locked() ? 1.f : 0.f; lock = _s->locked() ? 1.f : 0.f;
play = _s->playing() ? 1.f : 0.f; play = _s->playing() ? 1.f : 0.f;
depth = _s->depth(); depth = _s->depth();
@@ -829,7 +829,7 @@ void Control::sendSourceAttibutes(const IpEndpointName &remoteEndpoint, std::str
/// name /// name
std::string address = std::string(OSC_PREFIX) + target + OSC_SOURCE_NAME; std::string address = std::string(OSC_PREFIX) + target + OSC_SOURCE_NAME;
p << osc::BeginMessage( address.c_str() ) << name << osc::EndMessage; p << osc::BeginMessage( address.c_str() ) << name.c_str() << osc::EndMessage;
/// Play status /// Play status
address = std::string(OSC_PREFIX) + target + OSC_SOURCE_LOCK; address = std::string(OSC_PREFIX) + target + OSC_SOURCE_LOCK;
p << osc::BeginMessage( address.c_str() ) << lock << osc::EndMessage; p << osc::BeginMessage( address.c_str() ) << lock << osc::EndMessage;
@@ -877,6 +877,10 @@ void Control::sendSourcesStatus(const IpEndpointName &remoteEndpoint, osc::Recei
// send status of alpha // send status of alpha
sprintf(oscaddr, OSC_PREFIX "/%d" OSC_SOURCE_ALPHA, i); sprintf(oscaddr, OSC_PREFIX "/%d" OSC_SOURCE_ALPHA, i);
p << osc::BeginMessage( oscaddr ) << Mixer::manager().sourceAtIndex(i)->alpha() << osc::EndMessage; p << osc::BeginMessage( oscaddr ) << Mixer::manager().sourceAtIndex(i)->alpha() << osc::EndMessage;
// send name
sprintf(oscaddr, OSC_PREFIX "/%d" OSC_SOURCE_NAME, i);
p << osc::BeginMessage( oscaddr ) << Mixer::manager().sourceAtIndex(i)->name().c_str() << osc::EndMessage;
} }
for (; i < (int) N ; ++i) { for (; i < (int) N ; ++i) {
@@ -887,6 +891,10 @@ void Control::sendSourcesStatus(const IpEndpointName &remoteEndpoint, osc::Recei
// reset status of alpha // reset status of alpha
sprintf(oscaddr, OSC_PREFIX "/%d" OSC_SOURCE_ALPHA, i); sprintf(oscaddr, OSC_PREFIX "/%d" OSC_SOURCE_ALPHA, i);
p << osc::BeginMessage( oscaddr ) << 0.f << osc::EndMessage; p << osc::BeginMessage( oscaddr ) << 0.f << osc::EndMessage;
/// name
sprintf(oscaddr, OSC_PREFIX "/%d" OSC_SOURCE_NAME, i);
p << osc::BeginMessage( oscaddr ) << "" << osc::EndMessage;
} }
p << osc::EndBundle; p << osc::EndBundle;