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

Bi-directional OSC communication for Control manager

Browse Source 
Unified OSC message declaration with Communicator
This commit is contained in:
Bruno Herbelin
2021-12-21 23:48:20 +01:00
parent 135b6a5702
commit 2d44a60b90
7 changed files with 144 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseToolkit.cpp
View File

@@ -153,11 +153,11 @@ std::string BaseToolkit::truncated(const std::string& str, int N)
std::list<std::string> BaseToolkit::splitted(const std::string& str, char delim) {
std::list<std::string> strings;
size_t start;
size_t start = 0;
size_t end = 0;
while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
end = str.find(delim, start);
strings.push_back(str.substr(start, end - start));
strings.push_back(str.substr(start - 1, end - start + 1));
}
return strings;
}

120
ControlManager.cpp
View File

@@ -36,7 +36,6 @@
#endif
#define CONTROL_OSC_MSG "OSC: "
#define OSC_SEPARATOR '/'
void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
const IpEndpointName& remoteEndpoint )
@@ -56,7 +55,7 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
// A wellformed OSC address is in the form '/vimix/target/attribute {arguments}'
// First test: should have 3 elements and start with APP_NAME ('vimix')
//
if (address.size() == 3 && address.front().compare(APP_NAME) == 0 ){
if (address.size() == 3 && address.front().compare(OSC_PREFIX) == 0 ){
// done with the first part of the OSC address
address.pop_front();
//
@@ -65,15 +64,17 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
std::string target = address.front();
std::string attribute = address.back();
// Log target: just print text in log window
if ( target.compare(OSC_LOG) == 0 )
if ( target.compare(OSC_INFO) == 0 )
{
if ( attribute.compare(OSC_LOG_INFO) == 0)
if ( attribute.compare(OSC_INFO_TEST) == 0)
Control::manager().sendStatus(remoteEndpoint);
else if ( attribute.compare(OSC_INFO_LOG) == 0)
Log::Info(CONTROL_OSC_MSG "received '%s' from %s", m.AddressPattern(), sender);
}
// Output target: concerns attributes of the rendering output
else if ( target.compare(OSC_OUTPUT) == 0 )
{
Control::manager().setOutputAttribute(attribute, m.ArgumentStream());
Control::manager().receiveOutputAttribute(attribute, m.ArgumentStream());
}
// ALL sources target: apply attribute to all sources of the session
else if ( target.compare(OSC_ALL) == 0 )
@@ -81,7 +82,7 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
// Loop over selected sources
for (SourceList::iterator it = Mixer::manager().session()->begin(); it != Mixer::manager().session()->end(); ++it) {
// attributes operate on current source
Control::manager().setSourceAttribute( *it, attribute, m.ArgumentStream());
Control::manager().receiveSourceAttribute( *it, attribute, m.ArgumentStream());
}
}
// Selected sources target: apply attribute to all sources of the selection
@@ -90,7 +91,7 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
// Loop over selected sources
for (SourceList::iterator it = Mixer::selection().begin(); it != Mixer::selection().end(); ++it) {
// attributes operate on current source
Control::manager().setSourceAttribute( *it, attribute, m.ArgumentStream());
Control::manager().receiveSourceAttribute( *it, attribute, m.ArgumentStream());
}
}
// Current source target: apply attribute to the current sources
@@ -101,17 +102,27 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
int index = 0;
m.ArgumentStream() >> index >> osc::EndMessage;
Mixer::manager().setCurrentIndex(index);
// confirm by sending back the current source attributes
Control::manager().sendCurrentSourceAttibutes(remoteEndpoint);
}
else if ( attribute.compare(OSC_NEXT) == 0)
else if ( attribute.compare(OSC_NEXT) == 0) {
Mixer::manager().setCurrentNext();
else if ( attribute.compare(OSC_PREVIOUS) == 0)
// confirm by sending back the current source attributes
Control::manager().sendCurrentSourceAttibutes(remoteEndpoint);
}
else if ( attribute.compare(OSC_PREVIOUS) == 0) {
Mixer::manager().setCurrentPrevious();
// confirm by sending back the current source attributes
Control::manager().sendCurrentSourceAttibutes(remoteEndpoint);
}
// all other attributes operate on current source
else
Control::manager().setSourceAttribute( Mixer::manager().currentSource(), attribute, m.ArgumentStream());
Control::manager().receiveSourceAttribute( Mixer::manager().currentSource(), attribute, m.ArgumentStream());
}
// General case: try to identify the target
else {
// remove osc separator
target.erase(0,1);
// try to find source by name
Source *s = Mixer::manager().findSource(target);
// if failed, try to find source by index
@@ -126,7 +137,7 @@ void Control::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
s = Mixer::manager().sourceAtIndex(N);
}
if (s)
Control::manager().setSourceAttribute(s, attribute, m.ArgumentStream());
Control::manager().receiveSourceAttribute(s, attribute, m.ArgumentStream());
else
Log::Info(CONTROL_OSC_MSG "Unknown target '%s' requested by %s.", target.c_str(), sender);
}
@@ -195,7 +206,7 @@ void Control::terminate()
}
void Control::setOutputAttribute(const std::string &attribute,
void Control::receiveOutputAttribute(const std::string &attribute,
osc::ReceivedMessageArgumentStream arguments)
{
try {
@@ -239,7 +250,7 @@ void Control::setOutputAttribute(const std::string &attribute,
}
}
void Control::setSourceAttribute(Source *target, const std::string &attribute,
void Control::receiveSourceAttribute(Source *target, const std::string &attribute,
osc::ReceivedMessageArgumentStream arguments)
{
if (target == nullptr)
@@ -314,3 +325,86 @@ void Control::setSourceAttribute(Source *target, const std::string &attribute,
}
}
void Control::sendCurrentSourceAttibutes(const IpEndpointName &remoteEndpoint)
{
Source *s = Mixer::manager().currentSource();
if (s!=nullptr) {
// build socket to send message to indicated endpoint
UdpTransmitSocket socket( IpEndpointName( remoteEndpoint.address, Settings::application.control.osc_port_send ) );
// build messages packet
char buffer[IP_MTU_SIZE];
osc::OutboundPacketStream p( buffer, IP_MTU_SIZE );
// create bundle
p.Clear();
p << osc::BeginBundle();
///
/// messages
///
/// Play status
p << osc::BeginMessage( OSC_PREFIX OSC_CURRENT OSC_SOURCE_PLAY );
p << s->playing();
p << osc::EndMessage;
/// Depth
p << osc::BeginMessage( OSC_PREFIX OSC_CURRENT OSC_SOURCE_DEPTH );
p << s->depth();
p << osc::EndMessage;
/// Alpha
p << osc::BeginMessage( OSC_PREFIX OSC_CURRENT OSC_SOURCE_ALPHA );
p << s->alpha();
p << osc::EndMessage;
/// indexed alpha
std::string addresspattern = std::string(OSC_PREFIX) + OSC_SEPARATOR;
addresspattern += std::to_string(Mixer::manager().indexCurrentSource()) + OSC_SOURCE_ALPHA;
p << osc::BeginMessage(addresspattern.c_str());
p << s->alpha();
p << osc::EndMessage;
socket.Send( p.Data(), p.Size() );
// send bundle
p << osc::EndBundle;
socket.Send( p.Data(), p.Size() );
}
}
void Control::sendStatus(const IpEndpointName &remoteEndpoint)
{
// build socket to send message to indicated endpoint
UdpTransmitSocket socket( IpEndpointName( remoteEndpoint.address, Settings::application.control.osc_port_send ) );
// build messages packet
char buffer[IP_MTU_SIZE];
osc::OutboundPacketStream p( buffer, IP_MTU_SIZE );
p.Clear();
p << osc::BeginBundle();
/// Agree to test
p << osc::BeginMessage( OSC_PREFIX OSC_INFO OSC_INFO_TEST );
p << true;
p << osc::EndMessage;
/// send output attributes
p << osc::BeginMessage( OSC_PREFIX OSC_OUTPUT OSC_OUTPUT_ENABLE );
p << !Settings::application.render.disabled;
p << osc::EndMessage;
p << osc::BeginMessage( OSC_PREFIX OSC_OUTPUT OSC_OUTPUT_FADING );
p << Mixer::manager().session()->fading();
p << osc::EndMessage;
/// send all sources alpha
for (int i = 0; i < Mixer::manager().count(); ++i) {
std::string addresspattern = std::string(OSC_PREFIX) + OSC_SEPARATOR;
addresspattern += std::to_string(i) + OSC_SOURCE_ALPHA;
p << osc::BeginMessage(addresspattern.c_str());
p << Mixer::manager().sourceAtIndex(i)->alpha();
p << osc::EndMessage;
}
p << osc::EndBundle;
socket.Send( p.Data(), p.Size() );
}

48
ControlManager.h
View File

@@ -3,30 +3,31 @@
#include "NetworkToolkit.h"
#define OSC_LOG "log"
#define OSC_LOG_INFO "info"
#define OSC_INFO "/info"
#define OSC_INFO_TEST "/test"
#define OSC_INFO_LOG "/log"
#define OSC_OUTPUT "output"
#define OSC_OUTPUT_ENABLE "enable"
#define OSC_OUTPUT_DISABLE "disable"
#define OSC_OUTPUT_FADING "fading"
#define OSC_OUTPUT "/output"
#define OSC_OUTPUT_ENABLE "/enable"
#define OSC_OUTPUT_DISABLE "/disable"
#define OSC_OUTPUT_FADING "/fading"
#define OSC_ALL "all"
#define OSC_SELECTED "selected"
#define OSC_CURRENT "current"
#define OSC_NEXT "next"
#define OSC_PREVIOUS "previous"
#define OSC_SET "set"
#define OSC_ALL "/all"
#define OSC_SELECTED "/selected"
#define OSC_CURRENT "/current"
#define OSC_NEXT "/next"
#define OSC_PREVIOUS "/previous"
#define OSC_SET "/set"
//#define OSC_VERSION "version"
#define OSC_SOURCE_PLAY "play"
#define OSC_SOURCE_PAUSE "pause"
#define OSC_SOURCE_REPLAY "replay"
#define OSC_SOURCE_ALPHA "alpha"
#define OSC_SOURCE_TRANSPARENCY "transparency"
#define OSC_SOURCE_DEPTH "depth"
#define OSC_SOURCE_GRAB "grab"
#define OSC_SOURCE_RESIZE "resize"
#define OSC_SOURCE_PLAY "/play"
#define OSC_SOURCE_PAUSE "/pause"
#define OSC_SOURCE_REPLAY "/replay"
#define OSC_SOURCE_ALPHA "/alpha"
#define OSC_SOURCE_TRANSPARENCY "/transparency"
#define OSC_SOURCE_DEPTH "/depth"
#define OSC_SOURCE_GRAB "/grab"
#define OSC_SOURCE_RESIZE "/resize"
class Session;
class Source;
@@ -61,12 +62,15 @@ protected:
const IpEndpointName& remoteEndpoint );
};
void setOutputAttribute(const std::string &attribute,
void receiveOutputAttribute(const std::string &attribute,
osc::ReceivedMessageArgumentStream arguments);
void setSourceAttribute(Source *target, const std::string &attribute,
void receiveSourceAttribute(Source *target, const std::string &attribute,
osc::ReceivedMessageArgumentStream arguments);
void sendCurrentSourceAttibutes(const IpEndpointName& remoteEndpoint);
void sendStatus(const IpEndpointName& remoteEndpoint);
private:
static void listen();

7
Mixer.cpp
View File

@@ -909,11 +909,16 @@ void Mixer::unsetCurrentSource()
}
}
int Mixer::indexCurrentSource()
int Mixer::indexCurrentSource() const
{
return current_source_index_;
}
int Mixer::count() const
{
return (int) session_->numSource();
}
Source *Mixer::currentSource()
{
if ( current_source_ != session_->end() )

3
Mixer.h
View File

@@ -80,7 +80,8 @@ public:
Source *sourceAtIndex (int index);
void setCurrentIndex (int index);
void moveIndex (int current_index, int target_index);
int indexCurrentSource ();
int indexCurrentSource () const;
int count() const;
// browsing into sources
Source * findSource (Node *node);

1
NetworkToolkit.h
View File

@@ -8,6 +8,7 @@
#include "osc/OscPacketListener.h"
#include "ip/UdpSocket.h"
#define OSC_SEPARATOR '/'
#define OSC_PREFIX "/vimix"
#define OSC_PING "/ping"
#define OSC_PONG "/pong"

BIN
rsc/osc/vimix.tosc
View File

Binary file not shown.