#include "ardour/route.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
+#include "ardour/vca.h"
#include "ardour/monitor_control.h"
#include "ardour/dB.h"
#include "ardour/filesystem_paths.h"
, _osc_server (0)
, _osc_unix_server (0)
, _debugmode (Off)
- , address_only (false)
+ , address_only (true)
, remote_port ("8000")
, default_banksize (0)
, default_strip (159)
REGISTER_CALLBACK (serv, "/bank_up", "f", bank_delta);
REGISTER_CALLBACK (serv, "/bank_down", "", bank_down);
REGISTER_CALLBACK (serv, "/bank_down", "f", bank_down);
+ REGISTER_CALLBACK (serv, "/use_group", "f", use_group);
// controls for "special" strips
REGISTER_CALLBACK (serv, "/master/gain", "f", master_set_gain);
REGISTER_CALLBACK (serv, "/master/mute", "i", master_set_mute);
REGISTER_CALLBACK (serv, "/master/trimdB", "f", master_set_trim);
REGISTER_CALLBACK (serv, "/master/pan_stereo_position", "f", master_set_pan_stereo_position);
+ REGISTER_CALLBACK (serv, "/master/select", "f", master_select);
REGISTER_CALLBACK (serv, "/monitor/gain", "f", monitor_set_gain);
REGISTER_CALLBACK (serv, "/monitor/fader", "f", monitor_set_fader);
REGISTER_CALLBACK (serv, "/monitor/db_delta", "f", monitor_delta_gain);
OSCSurface *s = get_surface(addr);
uint32_t ssid = get_sid (strip, addr);
- OSCRouteObserver* o = new OSCRouteObserver (strip, addr, ssid, s);
+ OSCRouteObserver* o = new OSCRouteObserver (strip, ssid, s);
route_observers.push_back (o);
strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::route_lost, this, boost::weak_ptr<Stripable> (strip)), this);
lo_message reply = lo_message_new ();
- if (s->presentation_info().flags() & PresentationInfo::AudioTrack) {
+ if (boost::dynamic_pointer_cast<AudioTrack>(s)) {
lo_message_add_string (reply, "AT");
- } else if (s->presentation_info().flags() & PresentationInfo::MidiTrack) {
+ } else if (boost::dynamic_pointer_cast<MidiTrack>(s)) {
lo_message_add_string (reply, "MT");
- } else if (s->presentation_info().flags() & PresentationInfo::AudioBus) {
- // r->feeds (session->master_out()) may make more sense
- if (r->direct_feeds_according_to_reality (session->master_out())) {
- // this is a bus
- lo_message_add_string (reply, "B");
- } else {
- // this is an Aux out
- lo_message_add_string (reply, "AX");
- }
- } else if (s->presentation_info().flags() & PresentationInfo::MidiBus) {
- lo_message_add_string (reply, "MB");
- } else if (s->presentation_info().flags() & PresentationInfo::VCA) {
+ } else if (boost::dynamic_pointer_cast<VCA>(s)) {
lo_message_add_string (reply, "V");
} else if (s->is_master()) {
lo_message_add_string (reply, "MA");
} else if (s->is_monitor()) {
lo_message_add_string (reply, "MO");
+ } else if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+ // r->feeds (session->master_out()) may make more sense
+ if (r->direct_feeds_according_to_reality (session->master_out())) {
+ // this is a bus
+ lo_message_add_string (reply, "B");
+ } else {
+ // this is an Aux out
+ lo_message_add_string (reply, "AX");
+ }
+ } else {
+ lo_message_add_string (reply, "MB");
+ }
}
lo_message_add_string (reply, s->name().c_str());
s->strip_types = strips;
s->feedback = fb;
s->gainmode = gm;
+ if (s->strip_types[10]) {
+ s->usegroup = PBD::Controllable::UseGroup;
+ } else {
+ s->usegroup = PBD::Controllable::NoGroup;
+ }
s->send_page_size = se_size;
s->plug_page_size = pi_size;
// set bank and strip feedback
set_bank(s->bank, msg);
- global_feedback (s->feedback, get_address (msg), s->gainmode);
+ global_feedback (*s, get_address (msg));
sel_send_pagesize (se_size, msg);
sel_plug_pagesize (pi_size, msg);
return 0;
{
OSCSurface *s = get_surface(get_address (msg));
s->strip_types = st;
+ if (s->strip_types[10]) {
+ s->usegroup = PBD::Controllable::UseGroup;
+ } else {
+ s->usegroup = PBD::Controllable::NoGroup;
+ }
// set bank and strip feedback
set_bank(s->bank, msg);
set_bank(s->bank, msg);
// Set global/master feedback
- global_feedback (s->feedback, get_address (msg), s->gainmode);
+ global_feedback (*s, get_address (msg));
return 0;
}
set_bank(s->bank, msg);
// Set global/master feedback
- global_feedback (s->feedback, get_address (msg), s->gainmode);
+ global_feedback (*s, get_address (msg));
return 0;
}
s.no_clear = false;
s.jogmode = JOG;
s.bank = 1;
- s.bank_size = default_banksize; // need to find out how many strips there are
- s.strip_types = default_strip; // 159 is tracks, busses, and VCAs (no master/monitor)
+ s.bank_size = default_banksize;
+ s.strip_types = default_strip;
s.feedback = default_feedback;
s.gainmode = default_gainmode;
+ s.usegroup = PBD::Controllable::NoGroup;
s.sel_obs = 0;
s.expand = 0;
s.expand_enable = false;
_set_bank(s.bank, addr);
// Set global/master feedback
- global_feedback (s.feedback, addr, s.gainmode);
+ global_feedback (s, addr);
return &_surface[_surface.size() - 1];
}
// setup global feedback for a surface
void
-OSC::global_feedback (bitset<32> feedback, lo_address addr, uint32_t gainmode)
+OSC::global_feedback (OSCSurface sur, lo_address addr)
{
// first destroy global observer for this surface
GlobalObservers::iterator x;
for (x = global_observers.begin(); x != global_observers.end();) {
- OSCGlobalObserver* ro;
+ OSCGlobalObserver* go;
- if ((ro = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
+ if ((go = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
- int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
+ int res = strcmp(lo_address_get_url(go->address()), lo_address_get_url(addr));
if (res == 0) {
delete *x;
++x;
}
}
+ std::bitset<32> feedback = sur.feedback;
if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
// create a new Global Observer for this surface
- OSCGlobalObserver* o = new OSCGlobalObserver (*session, addr, gainmode, /*s->*/feedback);
+ OSCGlobalObserver* o = new OSCGlobalObserver (*session, &sur);
global_observers.push_back (o);
}
}
return 0;
}
+int
+OSC::use_group (float value, lo_message msg)
+{
+ if (!session) {
+ return -1;
+ }
+ OSCSurface *s = get_surface(get_address (msg));
+ if (value) {
+ s->usegroup = PBD::Controllable::UseGroup;
+ } else {
+ s->usegroup = PBD::Controllable::NoGroup;
+ }
+ return 0;
+}
+
uint32_t
OSC::get_sid (boost::shared_ptr<ARDOUR::Stripable> strip, lo_address addr)
{
return 0;
}
+int
+OSC::master_select (lo_message msg)
+{
+ if (!session) {
+ return -1;
+ }
+ OSCSurface *sur = get_surface(get_address (msg));
+ sur->expand_enable = false;
+ boost::shared_ptr<Stripable> s = session->master_out();
+ if (s) {
+ SetStripableSelection (s);
+ }
+
+ return 0;
+}
+
int
OSC::monitor_set_gain (float dB)
{
if (control) {
if (touch) {
//start touch
- if (control->automation_state() == Touch && !control->touching ()) {
- control->start_touch (control->session().transport_frame());
- }
+ control->start_touch (control->session().transport_frame());
ret = 0;
} else {
// end touch
- control->stop_touch (true, control->session().transport_frame());
+ control->stop_touch (control->session().transport_frame());
ret = 0;
}
// just in case some crazy surface starts sending control values before touch
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->mute_control()) {
- s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->mute_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->solo_control()) {
- s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->solo_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->solo_isolate_control()) {
- s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->solo_safe_control()) {
- s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->rec_enable_control()) {
- s->rec_enable_control()->set_value (yn, PBD::Controllable::NoGroup);
+ s->rec_enable_control()->set_value (yn, sur->usegroup);
if (s->rec_enable_control()->get_value()) {
return 0;
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->rec_safe_control()) {
- s->rec_safe_control()->set_value (yn, PBD::Controllable::NoGroup);
+ s->rec_safe_control()->set_value (yn, sur->usegroup);
if (s->rec_safe_control()->get_value()) {
return 0;
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
- track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ track->monitoring_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
- track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+ track->monitoring_control()->set_value (yn ? 2.0 : 0.0, sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->phase_control()) {
- s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->phase_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->gain_control()) {
fake_touch (s->gain_control());
- s->gain_control()->set_value (level, PBD::Controllable::NoGroup);
+ s->gain_control()->set_value (level, sur->usegroup);
} else {
return 1;
}
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->gain_control()) {
fake_touch (s->gain_control());
- s->gain_control()->set_value (s->gain_control()->interface_to_internal (pos), PBD::Controllable::NoGroup);
+ s->gain_control()->set_value (s->gain_control()->interface_to_internal (pos), sur->usegroup);
} else {
return route_send_fail ("fader", ssid, 0, get_address (msg));
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
float db = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
float abs;
abs = top;
}
}
- s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+ s->gain_control()->set_value (abs, sur->usegroup);
return 0;
}
return -1;
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->trim_control()) {
- s->trim_control()->set_value (level, PBD::Controllable::NoGroup);
+ s->trim_control()->set_value (level, sur->usegroup);
return 0;
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if(s->pan_azimuth_control()) {
- s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (pos), PBD::Controllable::NoGroup);
+ s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (pos), sur->usegroup);
return 0;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->pan_width_control()) {
- s->pan_width_control()->set_value (pos, PBD::Controllable::NoGroup);
+ s->pan_width_control()->set_value (pos, sur->usegroup);
return 0;
}
}
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
float abs;
if (s) {
if (id > 0) {
}
#endif
if (s->send_level_controllable (id)) {
- s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ s->send_level_controllable (id)->set_value (abs, sur->usegroup);
return 0;
}
}
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
float abs;
if (s) {
if (s->send_level_controllable (id)) {
abs = s->send_level_controllable(id)->interface_to_internal (val);
- s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ s->send_level_controllable (id)->set_value (abs, sur->usegroup);
return 0;
}
}
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
}
if (s->send_enable_controllable (sid)) {
- s->send_enable_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
+ s->send_enable_controllable (sid)->set_value (val, sur->usegroup);
return 0;
}
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
lo_message_add_string (reply, pip->name());
+ lo_message_add_int32(reply, redi->enabled() ? 1 : 0);
piid++;
}
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
bool ok = false;
- lo_message reply = lo_message_new();
- lo_message_add_int32 (reply, ssid);
- lo_message_add_int32 (reply, piid);
- lo_message_add_int32(reply, redi->enabled() ? 1 : 0);
-
for ( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) {
uint32_t controlid = pip->nth_parameter(ppi, ok);
}
boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
+ lo_message reply = lo_message_new();
+ lo_message_add_int32 (reply, ssid);
+ lo_message_add_int32 (reply, piid);
+
lo_message_add_int32 (reply, ppi + 1);
ParameterDescriptor pd;
pi->plugin()->get_parameter_descriptor(controlid, pd);
flags |= pd.logarithmic ? 4 : 0;
flags |= pd.sr_dependent ? 32 : 0;
flags |= pd.toggled ? 64 : 0;
+ flags |= pip->parameter_is_input(controlid) ? 0x80 : 0;
+
+ std::string param_desc = pi->plugin()->describe_parameter(Evoral::Parameter(PluginAutomation, 0, controlid));
+ flags |= (param_desc == X_("hidden")) ? 0x100 : 0;
lo_message_add_int32 (reply, flags);
switch(pd.datatype) {
lo_message_add_string(reply, _("UNKNOWN"));
break;
}
-
lo_message_add_float (reply, pd.lower);
lo_message_add_float (reply, pd.upper);
lo_message_add_string (reply, pd.print_fmt.c_str());
if ( pd.scale_points ) {
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) {
- lo_message_add_int32 (reply, i->second);
+ lo_message_add_float (reply, i->second);
lo_message_add_string (reply, ((std::string)i->first).c_str());
}
- } else {
+ }
+ else {
lo_message_add_int32 (reply, 0);
}
if ( c ) {
lo_message_add_double (reply, c->get_value());
- } else {
+ }
+ else {
lo_message_add_double (reply, 0);
}
+
+ lo_send_message (get_address (msg), "/strip/plugin/descriptor", reply);
+ lo_message_free (reply);
}
- lo_send_message (get_address (msg), "/strip/plugin/descriptor", reply);
+ lo_message reply = lo_message_new ();
+ lo_message_add_int32 (reply, ssid);
+ lo_message_add_int32 (reply, piid);
+ lo_send_message (get_address (msg), "/strip/plugin/descriptor_end", reply);
lo_message_free (reply);
return 0;
for (uint32_t it = 0; it < _surface.size(); it++) {
OSCSurface* sur = &_surface[it];
lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
- global_feedback (sur->feedback, addr, sur->gainmode);
+ global_feedback (*sur, addr);
}
global_init = false;
tick = true;
if (!(*x).second) {
boost::shared_ptr<ARDOUR::AutomationControl> ctrl = (*x).first;
// turn touch off
- ctrl->stop_touch (true, ctrl->session().transport_frame());
+ ctrl->stop_touch (ctrl->session().transport_frame());
_touch_timeout.erase (x++);
} else {
x++;
OSC::get_sorted_stripables(std::bitset<32> types, bool cue)
{
Sorted sorted;
-
- // fetch all stripables
StripableList stripables;
+ // fetch all stripables
session->get_stripables (stripables);
// Look for stripables that match bit in sur->strip_types
boost::shared_ptr<Stripable> s = *it;
if ((!cue) && (!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
// do nothing... skip it
+ } else if (types[8] && (s->is_selected())) {
+ sorted.push_back (s);
+ } else if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+ sorted.push_back (s);
+ } else if (s->is_master() || s->is_monitor() || s->is_auditioner()) {
+ // do nothing for these either (we add them later)
} else {
-
- if (types[0] && (s->presentation_info().flags() & PresentationInfo::AudioTrack)) {
+ if (types[0] && boost::dynamic_pointer_cast<AudioTrack>(s)) {
+ sorted.push_back (s);
+ } else if (types[1] && boost::dynamic_pointer_cast<MidiTrack>(s)) {
+ sorted.push_back (s);
+ } else if (types[4] && boost::dynamic_pointer_cast<VCA>(s)) {
sorted.push_back (s);
} else
- if (types[1] && (s->presentation_info().flags() & PresentationInfo::MidiTrack)) {
+#ifdef MIXBUS
+ if (types[2] && Profile->get_mixbus() && s->mixbus()) {
sorted.push_back (s);
} else
- if ((s->presentation_info().flags() & PresentationInfo::AudioBus)) {
- boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
- // r->feeds (session->master_out()) may make more sense
- if (r->direct_feeds_according_to_reality (session->master_out())) {
- // this is a bus
- if (types[2]) {
- sorted.push_back (s);
- }
- } else {
- // this is an Aux out
- if (types[7]) {
- sorted.push_back (s);
- }
+ if (types[7] && boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ if (Profile->get_mixbus() && !s->mixbus()) {
+ sorted.push_back (s);
}
- } else if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
- sorted.push_back (s);
- } else if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
- sorted.push_back (s);
- } else if (types[8] && (s->is_selected())) {
- sorted.push_back (s);
- } else if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
- sorted.push_back (s);
- }
-#ifdef MIXBUS
- else if (types[2]) {
- if (Profile->get_mixbus()) {
- if (s->mixbus()) {
- sorted.push_back (s);
+ } else
+#endif
+ if ((types[2] || types[3] || types[7]) && boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
+ if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+ // note some older sessions will show midibuses as busses
+ if (r->direct_feeds_according_to_reality (session->master_out())) {
+ // this is a bus
+ if (types[2]) {
+ sorted.push_back (s);
+ }
+ } else {
+ // this is an Aux out
+ if (types[7]) {
+ sorted.push_back (s);
+ }
}
+ } else if (types[3]) {
+ sorted.push_back (s);
}
}
-#endif
}
}
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
sorted.push_back (session->master_out());
}
if (types[6]) {
- sorted.push_back (session->monitor_out());
+ if (session->monitor_out()) {
+ sorted.push_back (session->monitor_out());
+ }
}
return sorted;
}