ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

OSC: no op, white space cleanup

Browse Source
This commit is contained in:
Len Ovens 2016-11-26 10:23:36 -08:00
parent c7f8471d52
commit d26aac9020
2 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
libs/surfaces/osc/osc.cc
View File

@ -2793,12 +2793,12 @@ OSC::sel_sendenable (int id, float val, lo_message msg)
} }
int int
OSC::route_plugin_list(int ssid, lo_message msg) { OSC::route_plugin_list (int ssid, lo_message msg) {
if (!session) { if (!session) {
return -1; return -1;
} }
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (get_strip(ssid, get_address(msg))); boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(get_strip (ssid, get_address (msg)));
if (!r) { if (!r) {
PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg; PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
@ -2806,13 +2806,13 @@ OSC::route_plugin_list(int ssid, lo_message msg) {
} }
int piid = 0; int piid = 0;
lo_message reply = lo_message_new(); lo_message reply = lo_message_new ();
lo_message_add_int32(reply, ssid); lo_message_add_int32 (reply, ssid);
for(;;) { for (;;) {
boost::shared_ptr<Processor> redi = r->nth_plugin(piid); boost::shared_ptr<Processor> redi = r->nth_plugin(piid);
if( !redi ) { if ( !redi ) {
break; break;
} }
@ -2822,26 +2822,26 @@ OSC::route_plugin_list(int ssid, lo_message msg) {
PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg; PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
continue; continue;
} }
lo_message_add_int32(reply, piid + 1); lo_message_add_int32 (reply, piid + 1);
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin(); boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
lo_message_add_string(reply, pip->name()); lo_message_add_string (reply, pip->name());
piid++; piid++;
} }
lo_send_message(get_address (msg), "/strip/plugin/list", reply); lo_send_message (get_address (msg), "/strip/plugin/list", reply);
lo_message_free(reply); lo_message_free (reply);
return 0; return 0;
} }
int int
OSC::route_plugin_descriptor(int ssid, int piid, lo_message msg) { OSC::route_plugin_descriptor (int ssid, int piid, lo_message msg) {
if (!session) { if (!session) {
return -1; return -1;
} }
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (get_strip(ssid, get_address(msg))); boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(get_strip (ssid, get_address (msg)));
if (!r) { if (!r) {
PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg; PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
@ -2866,22 +2866,22 @@ OSC::route_plugin_descriptor(int ssid, int piid, lo_message msg) {
bool ok = false; bool ok = false;
lo_message reply = lo_message_new(); lo_message reply = lo_message_new();
lo_message_add_int32(reply, ssid); lo_message_add_int32 (reply, ssid);
lo_message_add_int32(reply, piid); lo_message_add_int32 (reply, piid);
lo_message_add_string(reply, pip->name()); lo_message_add_string (reply, pip->name());
for( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) { for ( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) {
uint32_t controlid = pip->nth_parameter(ppi, ok); uint32_t controlid = pip->nth_parameter(ppi, ok);
if (!ok) { if (!ok) {
continue; continue;
} }
if( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) { if ( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) {
boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid)); boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
lo_message_add_int32(reply, ppi + 1); lo_message_add_int32 (reply, ppi + 1);
ParameterDescriptor pd; ParameterDescriptor pd;
pi->plugin()->get_parameter_descriptor(controlid, pd); pi->plugin()->get_parameter_descriptor(controlid, pd);
lo_message_add_string(reply, pd.label.c_str()); lo_message_add_string (reply, pd.label.c_str());
// I've combined those binary descriptor parts in a bit-field to reduce lilo message elements // I've combined those binary descriptor parts in a bit-field to reduce lilo message elements
int flags = 0; int flags = 0;
@ -2893,24 +2893,24 @@ OSC::route_plugin_descriptor(int ssid, int piid, lo_message msg) {
flags |= pd.sr_dependent ? 32 : 0; flags |= pd.sr_dependent ? 32 : 0;
flags |= pd.toggled ? 64 : 0; flags |= pd.toggled ? 64 : 0;
flags |= c != NULL ? 128 : 0; // bit 7 indicates in input control flags |= c != NULL ? 128 : 0; // bit 7 indicates in input control
lo_message_add_int32(reply, flags); lo_message_add_int32 (reply, flags);
lo_message_add_int32(reply, pd.datatype); lo_message_add_int32 (reply, pd.datatype);
lo_message_add_float(reply, pd.lower); lo_message_add_float (reply, pd.lower);
lo_message_add_float(reply, pd.upper); lo_message_add_float (reply, pd.upper);
lo_message_add_string(reply, pd.print_fmt.c_str()); lo_message_add_string (reply, pd.print_fmt.c_str());
if( pd.scale_points ) { if ( pd.scale_points ) {
lo_message_add_int32(reply, pd.scale_points->size()); lo_message_add_int32 (reply, pd.scale_points->size());
for( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) { for ( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) {
lo_message_add_int32(reply, i->second); lo_message_add_int32 (reply, i->second);
lo_message_add_string(reply, ((std::string)i->first).c_str()); lo_message_add_string (reply, ((std::string)i->first).c_str());
} }
} }
else { else {
lo_message_add_int32(reply, 0); lo_message_add_int32 (reply, 0);
} }
if( c ) { if ( c ) {
lo_message_add_double(reply, c->get_value()); lo_message_add_double (reply, c->get_value());
} }
else { else {
lo_message_add_double (reply, 0); lo_message_add_double (reply, 0);
@ -2925,12 +2925,12 @@ OSC::route_plugin_descriptor(int ssid, int piid, lo_message msg) {
} }
int int
OSC::route_plugin_reset(int ssid, int piid, lo_message msg) { OSC::route_plugin_reset (int ssid, int piid, lo_message msg) {
if (!session) { if (!session) {
return -1; return -1;
} }
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (get_strip(ssid, get_address(msg))); boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(get_strip (ssid, get_address (msg)));
if (!r) { if (!r) {
PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg; PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
@ -2951,7 +2951,7 @@ OSC::route_plugin_reset(int ssid, int piid, lo_message msg) {
return -1; return -1;
} }
pi->reset_parameters_to_default(); pi->reset_parameters_to_default ();
return 0; return 0;
} }

154
libs/surfaces/osc/osc.h
View File

@ -224,15 +224,15 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
debugmsg (dgettext(PACKAGE, "OSC"), path, types, argv, argc); \ debugmsg (dgettext(PACKAGE, "OSC"), path, types, argv, argc); \
} }
#define PATH_CALLBACK_MSG(name) \ #define PATH_CALLBACK_MSG(name) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 0 && !strcmp (types, "f") && argv[0]->f != 1.0) { return 0; } \ if (argc > 0 && !strcmp (types, "f") && argv[0]->f != 1.0) { return 0; } \
name (data); \ name (data); \
return 0; \ return 0; \
} }
PATH_CALLBACK_MSG(route_get_sends); PATH_CALLBACK_MSG(route_get_sends);
@ -246,11 +246,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
PATH_CALLBACK_MSG(bank_down); PATH_CALLBACK_MSG(bank_down);
#define PATH_CALLBACK(name) \ #define PATH_CALLBACK(name) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg ** argv, int argc, void *) { \ int cb_ ## name (const char *path, const char *types, lo_arg ** argv, int argc, void *) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 0 && !strcmp (types, "f") && argv[0]->f != 1.0) { return 0; } \ if (argc > 0 && !strcmp (types, "f") && argv[0]->f != 1.0) { return 0; } \
name (); \ name (); \
return 0; \ return 0; \
@ -312,16 +312,16 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
PATH_CALLBACK(scroll_up_1_page); PATH_CALLBACK(scroll_up_1_page);
PATH_CALLBACK(scroll_dn_1_page); PATH_CALLBACK(scroll_dn_1_page);
#define PATH_CALLBACK1(name,type,optional) \ #define PATH_CALLBACK1(name,type,optional) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 0) { \ if (argc > 0) { \
name (optional argv[0]->type); \ name (optional argv[0]->type); \
} \ } \
return 0; \ return 0; \
} }
PATH_CALLBACK1(set_transport_speed,f,); PATH_CALLBACK1(set_transport_speed,f,);
@ -336,16 +336,16 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
PATH_CALLBACK1(monitor_set_gain,f,); PATH_CALLBACK1(monitor_set_gain,f,);
PATH_CALLBACK1(monitor_set_fader,f,); PATH_CALLBACK1(monitor_set_fader,f,);
#define PATH_CALLBACK1_MSG(name,arg1type) \ #define PATH_CALLBACK1_MSG(name,arg1type) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 0) { \ if (argc > 0) { \
name (argv[0]->arg1type, data); \ name (argv[0]->arg1type, data); \
} \ } \
return 0; \ return 0; \
} }
// pan position needs message info to send feedback // pan position needs message info to send feedback
@ -381,65 +381,65 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
PATH_CALLBACK1_MSG(sel_eq_hpf,f); PATH_CALLBACK1_MSG(sel_eq_hpf,f);
PATH_CALLBACK1_MSG(sel_expand,i); PATH_CALLBACK1_MSG(sel_expand,i);
#define PATH_CALLBACK2(name,arg1type,arg2type) \ #define PATH_CALLBACK2(name,arg1type,arg2type) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type); \ name (argv[0]->arg1type, argv[1]->arg2type); \
} \ } \
return 0; \ return 0; \
} }
#define PATH_CALLBACK2_MSG(name,arg1type,arg2type) \ #define PATH_CALLBACK2_MSG(name,arg1type,arg2type) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type, data); \ name (argv[0]->arg1type, argv[1]->arg2type, data); \
} \ } \
return 0; \ return 0; \
} }
#define PATH_CALLBACK2_MSG_s(name,arg1type,arg2type) \ #define PATH_CALLBACK2_MSG_s(name,arg1type,arg2type) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, &argv[1]->arg2type, data); \ name (argv[0]->arg1type, &argv[1]->arg2type, data); \
} \ } \
return 0; \ return 0; \
} }
#define PATH_CALLBACK3(name,arg1type,arg2type,arg3type) \ #define PATH_CALLBACK3(name,arg1type,arg2type,arg3type) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type, data); \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type, data); \
} \ } \
return 0; \ return 0; \
} }
#define PATH_CALLBACK4(name,arg1type,arg2type,arg3type,arg4type) \ #define PATH_CALLBACK4(name,arg1type,arg2type,arg3type,arg4type) \
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
OSC_DEBUG; \ OSC_DEBUG; \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type, data); \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type, data); \
} \ } \
return 0; \ return 0; \
} }
PATH_CALLBACK2_MSG(sel_sendgain,i,f); PATH_CALLBACK2_MSG(sel_sendgain,i,f);
PATH_CALLBACK2_MSG(sel_sendfader,i,f); PATH_CALLBACK2_MSG(sel_sendfader,i,f);