#include "osc_controllable.h"
#include "osc_route_observer.h"
#include "osc_global_observer.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace std;
, _osc_unix_server (0)
, _send_route_changes (true)
, _debugmode (Off)
+ , address_only (false)
+ , remote_port ("3819")
+ , default_banksize (0)
+ , default_strip (31)
+ , default_feedback (0)
+ , default_gainmode (0)
, tick (true)
, bank_dirty (false)
, gui (0)
periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &OSC::periodic));
periodic_timeout->attach (main_loop()->get_context());
- // catch GUI select changes for GUI_select mode
- StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this, _1), this);
+ // catch changes to selection for GUI_select mode
+ StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
// catch track reordering
// receive routes added
// order changed
PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+ _select = boost::shared_ptr<Stripable>();
return 0;
}
REGISTER_CALLBACK (serv, "/set_surface/bank_size", "i", set_surface_bank_size);
REGISTER_CALLBACK (serv, "/set_surface/gainmode", "i", set_surface_gainmode);
REGISTER_CALLBACK (serv, "/set_surface/strip_types", "i", set_surface_strip_types);
+ REGISTER_CALLBACK (serv, "/refresh", "", refresh_surface);
+ REGISTER_CALLBACK (serv, "/refresh", "f", refresh_surface);
REGISTER_CALLBACK (serv, "/strip/list", "", routes_list);
REGISTER_CALLBACK (serv, "/add_marker", "", add_marker);
REGISTER_CALLBACK (serv, "/add_marker", "f", add_marker);
REGISTER_CALLBACK (serv, "/toggle_all_rec_enables", "f", toggle_all_rec_enables);
REGISTER_CALLBACK (serv, "/all_tracks_rec_in", "f", all_tracks_rec_in);
REGISTER_CALLBACK (serv, "/all_tracks_rec_out", "f", all_tracks_rec_out);
+ REGISTER_CALLBACK (serv, "/cancel_all_solos", "f", cancel_all_solos);
REGISTER_CALLBACK (serv, "/remove_marker", "", remove_marker_at_playhead);
REGISTER_CALLBACK (serv, "/remove_marker", "f", remove_marker_at_playhead);
REGISTER_CALLBACK (serv, "/jump_bars", "f", jump_by_bars);
// controls for "special" strips
REGISTER_CALLBACK (serv, "/master/gain", "f", master_set_gain);
- REGISTER_CALLBACK (serv, "/master/fader", "i", master_set_fader);
+ REGISTER_CALLBACK (serv, "/master/fader", "f", master_set_fader);
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, "/monitor/gain", "f", monitor_set_gain);
- REGISTER_CALLBACK (serv, "/monitor/fader", "i", monitor_set_fader);
+ REGISTER_CALLBACK (serv, "/monitor/fader", "f", monitor_set_fader);
// Controls for the Selected strip
REGISTER_CALLBACK (serv, "/select/recenable", "i", sel_recenable);
REGISTER_CALLBACK (serv, "/select/send_gain", "if", sel_sendgain);
REGISTER_CALLBACK (serv, "/select/send_fader", "if", sel_sendfader);
REGISTER_CALLBACK (serv, "/select/send_enable", "if", sel_sendenable);
+ REGISTER_CALLBACK (serv, "/select/expand", "i", sel_expand);
+ REGISTER_CALLBACK (serv, "/select/pan_elevation_position", "f", sel_pan_elevation);
+ REGISTER_CALLBACK (serv, "/select/pan_frontback_position", "f", sel_pan_frontback);
+ REGISTER_CALLBACK (serv, "/select/pan_lfe_control", "f", sel_pan_lfe);
+ REGISTER_CALLBACK (serv, "/select/comp_enable", "f", sel_comp_enable);
+ REGISTER_CALLBACK (serv, "/select/comp_threshold", "f", sel_comp_threshold);
+ REGISTER_CALLBACK (serv, "/select/comp_speed", "f", sel_comp_speed);
+ REGISTER_CALLBACK (serv, "/select/comp_mode", "f", sel_comp_mode);
+ REGISTER_CALLBACK (serv, "/select/comp_makeup", "f", sel_comp_makeup);
+ REGISTER_CALLBACK (serv, "/select/eq_enable", "f", sel_eq_enable);
+ REGISTER_CALLBACK (serv, "/select/eq_hpf", "f", sel_eq_hpf);
+ REGISTER_CALLBACK (serv, "/select/eq_gain", "if", sel_eq_gain);
+ REGISTER_CALLBACK (serv, "/select/eq_freq", "if", sel_eq_freq);
+ REGISTER_CALLBACK (serv, "/select/eq_q", "if", sel_eq_q);
+ REGISTER_CALLBACK (serv, "/select/eq_shape", "if", sel_eq_shape);
/* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these */
REGISTER_CALLBACK (serv, "/strip/mute", "ii", route_mute);
REGISTER_CALLBACK (serv, "/strip/record_safe", "ii", route_recsafe);
REGISTER_CALLBACK (serv, "/strip/monitor_input", "ii", route_monitor_input);
REGISTER_CALLBACK (serv, "/strip/monitor_disk", "ii", route_monitor_disk);
- REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_select);
- REGISTER_CALLBACK (serv, "/strip/gui_select", "ii", strip_gui_select);
+ REGISTER_CALLBACK (serv, "/strip/expand", "ii", strip_expand);
+ REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_gui_select);
REGISTER_CALLBACK (serv, "/strip/polarity", "ii", strip_phase);
REGISTER_CALLBACK (serv, "/strip/gain", "if", route_set_gain_dB);
REGISTER_CALLBACK (serv, "/strip/fader", "if", route_set_gain_fader);
REGISTER_CALLBACK (serv, "/strip/plugin/parameter", "iiif", route_plugin_parameter);
// prints to cerr only
REGISTER_CALLBACK (serv, "/strip/plugin/parameter/print", "iii", route_plugin_parameter_print);
- REGISTER_CALLBACK (serv, "/strip/send/gainabs", "iif", route_set_send_gain_abs);
REGISTER_CALLBACK (serv, "/strip/send/gain", "iif", route_set_send_gain_dB);
REGISTER_CALLBACK (serv, "/strip/send/fader", "iif", route_set_send_fader);
REGISTER_CALLBACK (serv, "/strip/send/enable", "iif", route_set_send_enable);
}
}
- lo_send_message (lo_message_get_source (msg), "#reply", reply);
+ lo_send_message (get_address (msg), "#reply", reply);
lo_message_free (reply);
}
break;
} else {
cerr << "add listener\n";
- listen_to_route (r, lo_message_get_source (msg));
+ listen_to_route (r, get_address (msg));
lo_message_add_int32 (reply, argv[n]->i);
}
}
}
- lo_send_message (lo_message_get_source (msg), "#reply", reply);
+ lo_send_message (get_address (msg), "#reply", reply);
lo_message_free (reply);
ret = 0;
boost::shared_ptr<Route> r = session->get_remote_nth_route (argv[n]->i);
if (r) {
- end_listen (r, lo_message_get_source (msg));
+ end_listen (r, get_address (msg));
}
}
route_set_trim_dB (ssid, argv[0]->f, msg);
ret = 0;
}
+ else if (!strncmp (path, "/strip/pan_stereo_position/", 27) && strlen (path) > 27) {
+ int ssid = atoi (&path[27]);
+ route_set_pan_stereo_position (ssid, argv[0]->f, msg);
+ ret = 0;
+ }
else if (!strncmp (path, "/strip/mute/", 12) && strlen (path) > 12) {
int ssid = atoi (&path[12]);
route_mute (ssid, argv[0]->f == 1.0, msg);
route_recsafe (ssid, argv[0]->f == 1.0, msg);
ret = 0;
}
- else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
+ else if (!strncmp (path, "/strip/expand/", 14) && strlen (path) > 14) {
int ssid = atoi (&path[14]);
- strip_select (ssid, argv[0]->f == 1.0, msg);
+ strip_expand (ssid, argv[0]->f == 1.0, msg);
ret = 0;
}
- else if (!strncmp (path, "/strip/gui_select/", 18) && strlen (path) > 18) {
- int ssid = atoi (&path[18]);
+ else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
+ int ssid = atoi (&path[14]);
strip_gui_select (ssid, argv[0]->f == 1.0, msg);
ret = 0;
}
else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) {
int ssid = atoi (&path[18]);
- route_mute (ssid, argv[0]->f == 1.0, msg);
+ sel_sendgain (ssid, argv[0]->f, msg);
ret = 0;
}
else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) {
int ssid = atoi (&path[19]);
- route_solo (ssid, argv[0]->f == 1.0, msg);
+ sel_sendfader (ssid, argv[0]->f, msg);
+ ret = 0;
+ }
+ else if (!strncmp (path, "/select/send_enable/", 20) && strlen (path) > 20) {
+ int ssid = atoi (&path[20]);
+ sel_sendenable (ssid, argv[0]->f, msg);
+ ret = 0;
+ }
+ else if (!strncmp (path, "/select/eq_gain/", 16) && strlen (path) > 16) {
+ int ssid = atoi (&path[16]);
+ sel_eq_gain (ssid, argv[0]->f, msg);
+ ret = 0;
+ }
+ else if (!strncmp (path, "/select/eq_freq/", 16) && strlen (path) > 16) {
+ int ssid = atoi (&path[16]);
+ sel_eq_freq (ssid, argv[0]->f , msg);
+ ret = 0;
+ }
+ else if (!strncmp (path, "/select/eq_q/", 13) && strlen (path) > 13) {
+ int ssid = atoi (&path[13]);
+ sel_eq_q (ssid, argv[0]->f, msg);
+ ret = 0;
+ }
+ else if (!strncmp (path, "/select/eq_shape/", 17) && strlen (path) > 17) {
+ int ssid = atoi (&path[17]);
+ sel_eq_shape (ssid, argv[0]->f, msg);
ret = 0;
}
}
/* XXX Can only use order at this point */
//lo_message_add_int32 (reply, r->presentation_info().order());
// try this instead.
- lo_message_add_int32 (reply, get_sid (r, lo_message_get_source (msg)));
+ lo_message_add_int32 (reply, get_sid (r, get_address (msg)));
if (boost::dynamic_pointer_cast<AudioTrack>(r)
|| boost::dynamic_pointer_cast<MidiTrack>(r)) {
}
//Automatically listen to routes listed
- listen_to_route(r, lo_message_get_source (msg));
+ listen_to_route(r, get_address (msg));
- lo_send_message (lo_message_get_source (msg), "#reply", reply);
+ lo_send_message (get_address (msg), "#reply", reply);
lo_message_free (reply);
}
}
lo_message_add_int64 (reply, session->frame_rate());
lo_message_add_int64 (reply, session->current_end_frame());
- lo_send_message (lo_message_get_source (msg), "#reply", reply);
+ lo_send_message (get_address (msg), "#reply", reply);
lo_message_free (reply);
}
+int
+OSC::cancel_all_solos ()
+{
+ session->cancel_all_solo ();
+ return 0;
+}
+
+lo_address
+OSC::get_address (lo_message msg)
+{
+ if (address_only) {
+ lo_address addr = lo_message_get_source (msg);
+ string host = lo_address_get_hostname (addr);
+ int protocol = lo_address_get_protocol (addr);
+ return lo_address_new_with_proto (protocol, host.c_str(), remote_port.c_str());
+ } else {
+ return lo_message_get_source (msg);
+ }
+}
+
+int
+OSC::refresh_surface (lo_message msg)
+{
+ if (address_only) {
+ // get rid of all surfaces and observers.
+ for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
+
+ OSCRouteObserver* rc;
+
+ if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+ delete *x;
+ x = route_observers.erase (x);
+ } else {
+ ++x;
+ }
+ }
+ // Should maybe do global_observers too
+ for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) {
+
+ OSCGlobalObserver* gc;
+
+ if ((gc = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
+ delete *x;
+ x = global_observers.erase (x);
+ } else {
+ ++x;
+ }
+ }
+ // delete select observers
+ for (uint32_t it = 0; it < _surface.size(); ++it) {
+ OSCSurface* sur = &_surface[it];
+ OSCSelectObserver* so;
+ if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
+ delete so;
+ }
+ }
+ // add one from msg + port - Nope get_surface will do that for us
+ // but we do want to clear out surfaces
+ _surface.clear();
+ }
+ OSCSurface *s = get_surface(get_address (msg));
+ // restart all observers
+ set_surface (s->bank_size, (uint32_t) s->strip_types.to_ulong(), (uint32_t) s->feedback.to_ulong(), (uint32_t) s->gainmode, msg);
+ return 0;
+}
+
+
int
OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, lo_message msg)
{
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
s->bank_size = b_size;
s->strip_types = strips;
s->feedback = fb;
// set bank and strip feedback
set_bank(s->bank, msg);
- global_feedback (s->feedback, msg, s->gainmode);
+ global_feedback (s->feedback, get_address (msg), s->gainmode);
return 0;
}
int
OSC::set_surface_bank_size (uint32_t bs, lo_message msg)
{
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
s->bank_size = bs;
// set bank and strip feedback
int
OSC::set_surface_strip_types (uint32_t st, lo_message msg)
{
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
s->strip_types = st;
// set bank and strip feedback
int
OSC::set_surface_feedback (uint32_t fb, lo_message msg)
{
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
s->feedback = fb;
// set bank and strip feedback
set_bank(s->bank, msg);
// Set global/master feedback
- global_feedback (s->feedback, msg, s->gainmode);
+ global_feedback (s->feedback, get_address (msg), s->gainmode);
return 0;
}
int
OSC::set_surface_gainmode (uint32_t gm, lo_message msg)
{
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
s->gainmode = gm;
// set bank and strip feedback
set_bank(s->bank, msg);
// Set global/master feedback
- global_feedback (s->feedback, msg, s->gainmode);
+ global_feedback (s->feedback, get_address (msg), s->gainmode);
return 0;
}
return &_surface[it];
}
}
+ // if we do this when OSC is started we get the wrong stripable
+ // we don't need this until we actually have a surface to deal with
+ if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
+ gui_selection_changed();
+ }
+
// No surface create one with default values
OSCSurface s;
s.remote_url = r_url;
s.bank = 1;
- s.bank_size = 0; // need to find out how many strips there are
- s.strip_types = 31; // 31 is tracks, busses, and VCAs (no master/monitor)
- s.feedback = 0;
- s.gainmode = 0;
+ s.bank_size = default_banksize; // need to find out how many strips there are
+ s.strip_types = default_strip; // 31 is tracks, busses, and VCAs (no master/monitor)
+ s.feedback = default_feedback;
+ s.gainmode = default_gainmode;
s.sel_obs = 0;
- s.surface_sel = 0;
+ s.expand = 0;
+ s.expand_enable = false;
s.strips = get_sorted_stripables(s.strip_types);
- // I think the line below can be removed
s.nstrips = s.strips.size();
_surface.push_back (s);
// setup global feedback for a surface
void
-OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
+OSC::global_feedback (bitset<32> feedback, lo_address addr, uint32_t gainmode)
{
// first destroy global observer for this surface
GlobalObservers::iterator x;
-
for (x = global_observers.begin(); x != global_observers.end();) {
OSCGlobalObserver* ro;
if ((ro = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
- int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(lo_message_get_source (msg)));
+ int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
if (res == 0) {
delete *x;
}
if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
// create a new Global Observer for this surface
- //OSCSurface *s = get_surface (lo_message_get_source (msg));
- OSCGlobalObserver* o = new OSCGlobalObserver (*session, lo_message_get_source (msg), gainmode, /*s->*/feedback);
+ OSCGlobalObserver* o = new OSCGlobalObserver (*session, addr, gainmode, /*s->*/feedback);
global_observers.push_back (o);
}
}
void
OSC::notify_routes_added (ARDOUR::RouteList &)
{
+ // not sure if we need this PI change seems to cover
//recalcbanks();
}
void
OSC::notify_vca_added (ARDOUR::VCAList &)
{
+ // not sure if we need this PI change seems to cover
//recalcbanks();
}
void
OSC::_recalcbanks ()
{
+ if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
+ _select = ControlProtocol::first_selected_stripable();
+ }
+
// do a set_bank for each surface we know about.
for (uint32_t it = 0; it < _surface.size(); ++it) {
OSCSurface* sur = &_surface[it];
int
OSC::set_bank (uint32_t bank_start, lo_message msg)
{
- return _set_bank (bank_start, lo_message_get_source (msg));
+ return _set_bank (bank_start, get_address (msg));
}
+// set bank is callable with either message or address
int
OSC::_set_bank (uint32_t bank_start, lo_address addr)
{
return -1;
}
- // reset local select
- _strip_select (0, addr);
+ OSCSurface *s = get_surface (addr);
+
+ // revert any expand to select
+ s->expand = 0;
+ s->expand_enable = false;
+ _strip_select (ControlProtocol::first_selected_stripable(), addr);
// undo all listeners for this url
StripableList stripables;
}
}
- OSCSurface *s = get_surface (addr);
s->strips = get_sorted_stripables(s->strip_types);
- // I think the line below can be removed
s->nstrips = s->strips.size();
uint32_t b_size;
b_size = s->bank_size;
}
- // Do limits checking - high end still not quite right
+ // Do limits checking
if (bank_start < 1) bank_start = 1;
if (b_size >= s->nstrips) {
bank_start = 1;
} else if (bank_start > ((s->nstrips - b_size) + 1)) {
+ // top bank is always filled if there are enough strips for at least one bank
bank_start = (uint32_t)((s->nstrips - b_size) + 1);
}
//save bank in case we have had to change it
if (stp) {
listen_to_route(stp, addr);
- if (!s->feedback[10]) {
- if (stp->is_selected()) {
- _strip_select (n + 1 - s->bank_size , addr);
- }
- }
}
}
}
}
+ // light bankup or bankdown buttons if it is possible to bank in that direction
if (s->feedback[4]) {
+ // these two messages could be bundled
lo_message reply;
reply = lo_message_new ();
if ((s->bank > (s->nstrips - s->bank_size)) || (s->nstrips < s->bank_size)) {
if (!session) {
return -1;
}
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
set_bank (s->bank + s->bank_size, msg);
return 0;
}
if (!session) {
return -1;
}
- OSCSurface *s = get_surface(lo_message_get_source (msg));
+ OSCSurface *s = get_surface(get_address (msg));
if (s->bank < s->bank_size) {
set_bank (1, msg);
} else {
uint32_t
OSC::get_sid (boost::shared_ptr<ARDOUR::Stripable> strip, lo_address addr)
{
+ if (!strip) {
+ return 0;
+ }
+
OSCSurface *s = get_surface(addr);
uint32_t b_size;
return 0;
}
-uint32_t
-OSC::get_rid (uint32_t ssid, lo_address addr)
-{
- OSCSurface *s = get_surface(addr);
- return ssid + s->bank - 2;
-}
-
boost::shared_ptr<ARDOUR::Stripable>
OSC::get_strip (uint32_t ssid, lo_address addr)
{
OSCSurface *s = get_surface(addr);
- if ((ssid + s->bank - 2) < s->nstrips) {
+ if (ssid && ((ssid + s->bank - 2) < s->nstrips)) {
return s->strips[ssid + s->bank - 2];
}
// guess it is out of range
lo_message reply = lo_message_new ();
lo_message_add_int64 (reply, pos);
- lo_send_message (lo_message_get_source (msg), "/transport_frame", reply);
+ lo_send_message (get_address (msg), "/transport_frame", reply);
lo_message_free (reply);
}
lo_message reply = lo_message_new ();
lo_message_add_double (reply, ts);
- lo_send_message (lo_message_get_source (msg), "/transport_speed", reply);
+ lo_send_message (get_address (msg), "/transport_speed", reply);
lo_message_free (reply);
}
lo_message reply = lo_message_new ();
lo_message_add_int32 (reply, re);
- lo_send_message (lo_message_get_source (msg), "/record_enabled", reply);
+ lo_send_message (get_address (msg), "/record_enabled", reply);
lo_message_free (reply);
}
}
int
-OSC::master_set_fader (uint32_t position)
+OSC::master_set_fader (float position)
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = session->master_out();
if (s) {
- if ((position > 799.5) && (position < 800.5)) {
- s->gain_control()->set_value (1.0, PBD::Controllable::NoGroup);
- } else {
- s->gain_control()->set_value (slider_position_to_gain_with_max (((float)position/1023), 2.0), PBD::Controllable::NoGroup);
- }
+ s->gain_control()->set_value (slider_position_to_gain_with_max (position, 2.0), PBD::Controllable::NoGroup);
}
return 0;
}
if (s) {
if (s->pan_azimuth_control()) {
- s->pan_azimuth_control()->set_value (position, PBD::Controllable::NoGroup);
- endposition = s->pan_azimuth_control()->get_value ();
+ s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (position), PBD::Controllable::NoGroup);
+ endposition = s->pan_azimuth_control()->internal_to_interface (s->pan_azimuth_control()->get_value ());
}
}
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (sur->feedback[4]) {
lo_message reply = lo_message_new ();
lo_message_add_float (reply, endposition);
- lo_send_message (lo_message_get_source (msg), "/master/pan_stereo_position", reply);
+ lo_send_message (get_address (msg), "/master/pan_stereo_position", reply);
lo_message_free (reply);
}
}
int
-OSC::monitor_set_fader (uint32_t position)
+OSC::monitor_set_fader (float position)
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = session->monitor_out();
if (s) {
- if ((position > 799.5) && (position < 800.5)) {
- s->gain_control()->set_value (1.0, PBD::Controllable::NoGroup);
- } else {
- s->gain_control()->set_value (slider_position_to_gain_with_max (((float)position/1023), 2.0), PBD::Controllable::NoGroup);
- }
+ s->gain_control()->set_value (slider_position_to_gain_with_max (position, 2.0), PBD::Controllable::NoGroup);
}
return 0;
}
OSC::route_mute (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->mute_control()) {
}
}
- return route_send_fail ("mute", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("mute", ssid, 0, get_address (msg));
}
int
OSC::sel_mute (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_mute(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("mute", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->mute_control()) {
+ s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("mute", 0, get_address (msg));
}
int
OSC::route_solo (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->solo_control()) {
}
}
- return route_send_fail ("solo", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("solo", ssid, 0, get_address (msg));
}
int
OSC::route_solo_iso (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->solo_isolate_control()) {
}
}
- return route_send_fail ("solo_iso", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("solo_iso", ssid, 0, get_address (msg));
}
int
}
}
- return route_send_fail ("solo_safe", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("solo_safe", ssid, 0, get_address (msg));
}
int
OSC::sel_solo (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_solo(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("solo", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->solo_control()) {
+ s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("solo", 0, get_address (msg));
}
int
OSC::sel_solo_iso (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_solo_iso(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("solo_iso", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->solo_isolate_control()) {
+ s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("solo_iso", 0, get_address (msg));
}
int
OSC::sel_solo_safe (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_solo_safe(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("solo_safe", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->solo_safe_control()) {
+ s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("solo_safe", 0, get_address (msg));
}
int
OSC::sel_recenable (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_recenable(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("recenable", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->rec_enable_control()) {
+ s->rec_enable_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("recenable", 0, get_address (msg));
}
int
OSC::route_recenable (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->rec_enable_control()) {
}
}
}
- return route_send_fail ("recenable", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("recenable", ssid, 0, get_address (msg));
}
int
OSC::sel_recsafe (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_recsafe(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("record_safe", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->rec_safe_control()) {
+ s->rec_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("record_safe", 0, get_address (msg));
}
int
OSC::route_recsafe (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->rec_safe_control()) {
s->rec_safe_control()->set_value (yn, PBD::Controllable::UseGroup);
}
}
}
- return route_send_fail ("record_safe", ssid, 0,lo_message_get_source (msg));
+ return route_send_fail ("record_safe", ssid, 0,get_address (msg));
}
int
OSC::route_monitor_input (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
}
}
- return route_send_fail ("monitor_input", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("monitor_input", ssid, 0, get_address (msg));
}
int
OSC::sel_monitor_input (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_monitor_input(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("monitor_input", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ 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);
+ return 0;
+ }
+ }
}
+ return sel_fail ("monitor_input", 0, get_address (msg));
}
int
OSC::route_monitor_disk (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
}
}
- return route_send_fail ("monitor_disk", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("monitor_disk", ssid, 0, get_address (msg));
}
int
OSC::sel_monitor_disk (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_monitor_disk(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("monitor_disk", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ 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);
+ return 0;
+ }
+ }
}
+ return sel_fail ("monitor_disk", 0, get_address (msg));
}
OSC::strip_phase (int ssid, int yn, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->phase_control()) {
}
}
- return route_send_fail ("polarity", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("polarity", ssid, 0, get_address (msg));
}
int
OSC::sel_phase (uint32_t yn, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return strip_phase(sur->surface_sel, yn, msg);
- } else {
- return route_send_fail ("polarity", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->phase_control()) {
+ s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("polarity", 0, get_address (msg));
}
int
-OSC::strip_select (int ssid, int yn, lo_message msg)
+OSC::strip_expand (int ssid, int yn, lo_message msg)
{
- //ignore button release
- if (!yn) return 0;
+ OSCSurface *sur = get_surface(get_address (msg));
+ sur->expand_enable = (bool) yn;
+ sur->expand = ssid;
+ boost::shared_ptr<Stripable> s;
+ if (yn) {
+ s = get_strip (ssid, get_address (msg));
+ } else {
+ s = ControlProtocol::first_selected_stripable();
+ }
- return _strip_select ( ssid, lo_message_get_source (msg));
+ return _strip_select (s, get_address (msg));
}
int
-OSC::_strip_select (int ssid, lo_address addr)
+OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
{
if (!session) {
- route_send_fail ("select", ssid, 0, addr);
return -1;
}
OSCSurface *sur = get_surface(addr);
delete sur->sel_obs;
sur->sel_obs = 0;
}
- sur->surface_sel = 0;
- boost::shared_ptr<Stripable> s;
- if (ssid){
- s = get_strip (ssid, addr);
- }
if (s) {
- sur->surface_sel = ssid;
- OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, ssid, sur->gainmode, sur->feedback);
+ OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur->gainmode, sur->feedback);
s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
sur->sel_obs = sel_fb;
+ } else if (sur->expand_enable) {
+ sur->expand = 0;
+ sur->expand_enable = false;
+ if (_select) {
+ OSCSelectObserver* sel_fb = new OSCSelectObserver (_select, addr, sur->gainmode, sur->feedback);
+ _select->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+ sur->sel_obs = sel_fb;
+ }
} else {
- route_send_fail ("select", ssid, 0 , addr);
+ route_send_fail ("select", sur->expand, 0 , addr);
}
+ //update buttons on surface
int b_s = sur->bank_size;
if (!b_s) { // bank size 0 means we need to know how many strips there are.
b_s = sur->nstrips;
}
for (int i = 1; i <= b_s; i++) {
- string path = "select";
- if (!sur->feedback[10]) {
- path = "gui_select";
- }
- if (i==(int)sur->surface_sel) {
+ string path = "expand";
+
+ if ((i == (int) sur->expand) && sur->expand_enable) {
lo_message reply = lo_message_new ();
if (sur->feedback[2]) {
ostringstream os;
- os << "/strip/" << path << "/" << ssid;
+ os << "/strip/" << path << "/" << i;
path = os.str();
} else {
ostringstream os;
os << "/strip/" << path;
path = os.str();
- lo_message_add_int32 (reply, ssid);
+ lo_message_add_int32 (reply, i);
}
- lo_message_add_float (reply, (float) 1);
+ lo_message_add_float (reply, (float) 1);
- lo_send_message (addr, path.c_str(), reply);
- lo_message_free (reply);
- } else {
- route_send_fail (path, i, 0, addr);
- }
+ lo_send_message (addr, path.c_str(), reply);
+ lo_message_free (reply);
+ reply = lo_message_new ();
+ lo_message_add_float (reply, 1.0);
+ lo_send_message (addr, "/select/expand", reply);
+ lo_message_free (reply);
+
+ } else {
+ lo_message reply = lo_message_new ();
+ lo_message_add_int32 (reply, i);
+ lo_message_add_float (reply, 0.0);
+ lo_send_message (addr, "/strip/expand", reply);
+ lo_message_free (reply);
+ }
+ }
+ if (!sur->expand_enable) {
+ lo_message reply = lo_message_new ();
+ lo_message_add_float (reply, 0.0);
+ lo_send_message (addr, "/select/expand", reply);
+ lo_message_free (reply);
}
return 0;
if (!yn) return 0;
if (!session) {
- route_send_fail ("gui_select", ssid, 0, lo_message_get_source (msg));
+ route_send_fail ("select", ssid, 0, get_address (msg));
return -1;
}
-
- int rid = get_rid (ssid, lo_message_get_source (msg));
- boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+ OSCSurface *sur = get_surface(get_address (msg));
+ sur->expand_enable = false;
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
- SetStripableSelection (rid);
+ SetStripableSelection (s);
} else {
- route_send_fail ("gui_select", ssid, 0, lo_message_get_source (msg));
+ route_send_fail ("select", ssid, 0, get_address (msg));
}
return 0;
}
+int
+OSC::sel_expand (uint32_t state, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ sur->expand_enable = (bool) state;
+ if (state && sur->expand) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = ControlProtocol::first_selected_stripable();
+ }
+
+ return _strip_select (s, get_address (msg));
+}
+
int
OSC::route_set_gain_abs (int ssid, float level, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
- //boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->gain_control()) {
OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
{
if (!session) {
- route_send_fail ("gain", ssid, -193, lo_message_get_source (msg));
+ route_send_fail ("gain", ssid, -193, get_address (msg));
return -1;
}
int ret;
ret = route_set_gain_abs (ssid, dB_to_coefficient (dB), msg);
}
if (ret != 0) {
- return route_send_fail ("gain", ssid, -193, lo_message_get_source (msg));
+ return route_send_fail ("gain", ssid, -193, get_address (msg));
}
return 0;
}
int
OSC::sel_gain (float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_set_gain_dB(sur->surface_sel, val, msg);
- } else {
- return route_send_fail ("gain", 0, -193, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ float abs;
+ if (val < -192) {
+ abs = 0;
+ } else {
+ abs = dB_to_coefficient (val);
+ }
+ if (s->gain_control()) {
+ s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("gain", -193, get_address (msg));
}
int
OSC::route_set_gain_fader (int ssid, float pos, lo_message msg)
{
if (!session) {
- route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
+ route_send_fail ("fader", ssid, 0, get_address (msg));
return -1;
}
int ret;
- if ((pos > 799.5) && (pos < 800.5)) {
- ret = route_set_gain_abs (ssid, 1.0, msg);
- } else {
- ret = route_set_gain_abs (ssid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
- }
+ ret = route_set_gain_abs (ssid, slider_position_to_gain_with_max (pos, 2.0), msg);
if (ret != 0) {
- return route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("fader", ssid, 0, get_address (msg));
}
return 0;
}
int
OSC::sel_fader (float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_set_gain_fader(sur->surface_sel, val, msg);
- } else {
- return route_send_fail ("fader", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ float abs;
+ abs = slider_position_to_gain_with_max (val, 2.0);
+ if (s->gain_control()) {
+ s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("fader", 0, get_address (msg));
}
int
OSC::route_set_trim_abs (int ssid, float level, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->trim_control()) {
int ret;
ret = route_set_trim_abs(ssid, dB_to_coefficient (dB), msg);
if (ret != 0) {
- return route_send_fail ("trimdB", ssid, 0, lo_message_get_source (msg));
+ return route_send_fail ("trimdB", ssid, 0, get_address (msg));
}
return 0;
int
OSC::sel_trim (float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_set_trim_dB (sur->surface_sel, val, msg);
- } else {
- return route_send_fail ("trimdB", 0, 0, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->trim_control()) {
+ s->trim_control()->set_value (dB_to_coefficient (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("trimdB", 0, get_address (msg));
}
int
OSC::sel_pan_position (float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_set_pan_stereo_position (sur->surface_sel, val, msg);
- } else {
- return route_send_fail ("pan_stereo_position", 0, 0.5, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
}
+ if (s) {
+ if(s->pan_azimuth_control()) {
+ s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return sel_fail ("pan_stereo_position", s->pan_azimuth_control()->internal_to_interface (s->pan_azimuth_control()->get_value ()), get_address (msg));
+ return 0;
+ }
+ }
+ return sel_fail ("pan_stereo_position", 0.5, get_address (msg));
}
int
OSC::sel_pan_width (float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- if (sur->surface_sel) {
- return route_set_pan_stereo_width (sur->surface_sel, val, msg);
- } else {
- return route_send_fail ("pan_stereo_width", 0, 1, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->pan_width_control()) {
+ s->pan_width_control()->set_value (s->pan_width_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return sel_fail ("pan_stereo_width", 1, get_address (msg));
}
int
OSC::route_set_pan_stereo_position (int ssid, float pos, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if(s->pan_azimuth_control()) {
- s->pan_azimuth_control()->set_value (pos, PBD::Controllable::NoGroup);
- return route_send_fail ("pan_stereo_position", ssid, s->pan_azimuth_control()->get_value (), lo_message_get_source (msg));
+ s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (pos), PBD::Controllable::NoGroup);
+ return route_send_fail ("pan_stereo_position", ssid, s->pan_azimuth_control()->internal_to_interface (s->pan_azimuth_control()->get_value ()), get_address (msg));
}
}
- return route_send_fail ("pan_stereo_position", ssid, 0.5, lo_message_get_source (msg));
+ return route_send_fail ("pan_stereo_position", ssid, 0.5, get_address (msg));
}
int
OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg)
{
if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
if (s->pan_width_control()) {
}
}
- return route_send_fail ("pan_stereo_width", ssid, 1, lo_message_get_source (msg));
+ return route_send_fail ("pan_stereo_width", ssid, 1, get_address (msg));
}
int
-OSC::route_set_send_gain_abs (int ssid, int sid, float val, lo_message msg)
+OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
{
if (!session) {
return -1;
}
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ float abs;
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+#ifdef MIXBUS
+ abs = val;
+#else
+ if (val < -192) {
+ abs = 0;
+ } else {
+ abs = dB_to_coefficient (val);
+ }
+#endif
+ if (s->send_level_controllable (id)) {
+ s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return 0;
+}
- if (!s) {
+int
+OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg)
+{
+ if (!session) {
return -1;
}
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ float abs;
+ if (s) {
- /* revert to zero-based counting */
+ if (id > 0) {
+ --id;
+ }
- if (sid > 0) {
- --sid;
- }
-
- if (s->send_level_controllable (sid)) {
- s->send_level_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
- return 0;
- }
-
- return -1;
-}
-
-int
-OSC::route_set_send_gain_dB (int ssid, int sid, float val, lo_message msg)
-{
- return route_set_send_gain_abs (ssid, sid, dB_to_coefficient (val), msg);
-}
-
-int
-OSC::route_set_send_fader (int ssid, int sid, float pos, lo_message msg)
-{
- if (!session) {
- return -1;
- }
- if ((pos > 799.5) && (pos < 800.5)) {
- return route_set_send_gain_abs (ssid, sid, 1.0, msg);
- } else {
- return route_set_send_gain_abs (ssid, sid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
+ if (s->send_level_controllable (id)) {
+#ifdef MIXBUS
+ abs = s->send_level_controllable(id)->interface_to_internal (val);
+#else
+ abs = slider_position_to_gain_with_max (val, 2.0);
+#endif
+ s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
+ return 0;
}
int
OSC::sel_sendgain (int id, float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- int ret;
- if (sur->surface_sel) {
- ret = route_set_send_gain_dB(sur->surface_sel, id, val, msg);
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
}
- if (!ret) {
- return ret;
+ float abs;
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+#ifdef MIXBUS
+ abs = val;
+#else
+ if (val < -192) {
+ abs = 0;
+ } else {
+ abs = dB_to_coefficient (val);
+ }
+#endif
+ if (s->send_level_controllable (id)) {
+ s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ return 0;
+ }
}
- return sel_send_fail ("send_gain", id, -193, lo_message_get_source (msg));
+ return sel_send_fail ("send_gain", id + 1, -193, get_address (msg));
}
int
OSC::sel_sendfader (int id, float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- int ret;
- if (sur->surface_sel) {
- ret = route_set_send_fader(sur->surface_sel, id, val, msg);
- }
- if (!ret) {
- return ret;
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
}
- return sel_send_fail ("send_gain", id, 0, lo_message_get_source (msg));
+ float abs;
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+
+ if (s->send_level_controllable (id)) {
+#ifdef MIXBUS
+ abs = s->send_level_controllable(id)->interface_to_internal (val);
+#else
+ abs = slider_position_to_gain_with_max (val, 2.0);
+#endif
+ s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_send_fail ("send_fader", id, 0, get_address (msg));
}
int
if (!session) {
return -1;
}
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
}
if (s->send_level_controllable (sid)) {
- return 1;
+ return 0;
}
}
int
OSC::sel_sendenable (int id, float val, lo_message msg)
{
- OSCSurface *sur = get_surface(lo_message_get_source (msg));
- int ret;
- if (sur->surface_sel) {
- ret = route_set_send_enable(sur->surface_sel, id, val, msg);
- }
- switch (ret) {
- case 0:
- return ret;
- case 1:
- return sel_send_fail ("send_enable", id, 1, lo_message_get_source (msg));
- default:
- sel_send_fail ("send_enable", id, 0, lo_message_get_source (msg));
- return -1;
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
}
- return -1;
-
-
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+ if (s->send_enable_controllable (id)) {
+ s->send_enable_controllable (id)->set_value (val, PBD::Controllable::NoGroup);
+ return 0;
+ }
+ if (s->send_level_controllable (id)) {
+ return sel_send_fail ("send_enable", id + 1, 1, get_address (msg));
+ }
+ }
+ return sel_send_fail ("send_enable", id + 1, 0, get_address (msg));
}
int
{
if (!session)
return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
if (!session) {
return -1;
}
- boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
return 0;
}
-void
-OSC::gui_selection_changed (StripableNotificationListPtr stripables)
+// select
+
+int
+OSC::sel_pan_elevation (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->pan_elevation_control()) {
+ s->pan_elevation_control()->set_value (s->pan_elevation_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("pan_elevation_position", 0, get_address (msg));
+}
+
+int
+OSC::sel_pan_frontback (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->pan_frontback_control()) {
+ s->pan_frontback_control()->set_value (s->pan_frontback_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("pan_frontback_position", 0.5, get_address (msg));
+}
+
+int
+OSC::sel_pan_lfe (float val, lo_message msg)
{
- boost::shared_ptr<Stripable> strip;
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->pan_lfe_control()) {
+ s->pan_lfe_control()->set_value (s->pan_lfe_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("pan_lfe_control", 0, get_address (msg));
+}
- if (!stripables->empty()) {
- strip = stripables->front().lock();
+// compressor control
+int
+OSC::sel_comp_enable (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
}
+ if (s) {
+ if (s->comp_enable_controllable()) {
+ s->comp_enable_controllable()->set_value (s->comp_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("comp_enable", 0, get_address (msg));
+}
+
+int
+OSC::sel_comp_threshold (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->comp_threshold_controllable()) {
+ s->comp_threshold_controllable()->set_value (s->comp_threshold_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("comp_threshold", 0, get_address (msg));
+}
+
+int
+OSC::sel_comp_speed (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->comp_speed_controllable()) {
+ s->comp_speed_controllable()->set_value (s->comp_speed_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("comp_speed", 0, get_address (msg));
+}
+
+int
+OSC::sel_comp_mode (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->comp_mode_controllable()) {
+ s->comp_mode_controllable()->set_value (s->comp_mode_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("comp_mode", 0, get_address (msg));
+}
+
+int
+OSC::sel_comp_makeup (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->comp_makeup_controllable()) {
+ s->comp_makeup_controllable()->set_value (s->comp_makeup_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("comp_makeup", 0, get_address (msg));
+}
+
+// EQ control
+
+int
+OSC::sel_eq_enable (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->eq_enable_controllable()) {
+ s->eq_enable_controllable()->set_value (s->eq_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("eq_enable", 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_hpf (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (s->eq_hpf_controllable()) {
+ s->eq_hpf_controllable()->set_value (s->eq_hpf_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_fail ("eq_hpf", 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_gain (int id, float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+ if (s->eq_gain_controllable (id)) {
+ s->eq_gain_controllable (id)->set_value (s->eq_gain_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_send_fail ("eq_gain", id + 1, 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_freq (int id, float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+ if (s->eq_freq_controllable (id)) {
+ s->eq_freq_controllable (id)->set_value (s->eq_freq_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_send_fail ("eq_freq", id + 1, 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_q (int id, float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+ if (s->eq_q_controllable (id)) {
+ s->eq_q_controllable (id)->set_value (s->eq_q_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_send_fail ("eq_q", id + 1, 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_shape (int id, float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (id > 0) {
+ --id;
+ }
+ if (s->eq_shape_controllable (id)) {
+ s->eq_shape_controllable (id)->set_value (s->eq_shape_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+ return 0;
+ }
+ }
+ return sel_send_fail ("eq_shape", id + 1, 0, get_address (msg));
+}
+
+void
+OSC::gui_selection_changed ()
+{
+ boost::shared_ptr<Stripable> strip = ControlProtocol::first_selected_stripable();
+
if (strip) {
+ _select = strip;
for (uint32_t it = 0; it < _surface.size(); ++it) {
OSCSurface* sur = &_surface[it];
- if(!sur->feedback[10]) {
+ if(!sur->expand_enable) {
lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
- uint32_t sel_strip = get_sid (strip, addr);
- _strip_select (sel_strip, addr);
+ _strip_select (strip, addr);
}
}
}
-
}
// timer callbacks
{
if (!tick) {
Glib::usleep(100); // let flurry of signals subside
+ if (global_init) {
+ 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_init = false;
+ tick = true;
+ }
if (bank_dirty) {
_recalcbanks ();
bank_dirty = false;
lo_send_message (addr, str_pth.c_str(), reply);
lo_message_free (reply);
}
- if (sur->surface_sel == ssid) {
+ if ((_select == get_strip (ssid, addr)) || ((sur->expand == ssid) && (sur->expand_enable))) {
os.str("");
os << "/select/" << path;
string sel_pth = os.str();
return 0;
}
+int
+OSC::sel_fail (string path, float val, lo_address addr)
+{
+ ostringstream os;
+ os.str("");
+ os << "/select/" << path;
+ string sel_pth = os.str();
+ lo_message reply = lo_message_new ();
+ lo_message_add_float (reply, (float) val);
+ lo_send_message (addr, sel_pth.c_str(), reply);
+ lo_message_free (reply);
+
+ return 0;
+}
+
int
OSC::sel_send_fail (string path, uint32_t id, float val, lo_address addr)
{
{
XMLNode& node (ControlProtocol::get_state());
node.add_property("debugmode", (int) _debugmode); // TODO: enum2str
+ node.add_property ("address_only", address_only);
+ node.add_property ("remote_port", remote_port);
+ node.add_property ("banksize", default_banksize);
+ node.add_property ("striptypes", default_strip);
+ node.add_property ("feedback", default_feedback);
+ node.add_property ("gainmode", default_gainmode);
+ if (_surface.size()) {
+ XMLNode* config = new XMLNode (X_("Configurations"));
+ for (uint32_t it = 0; it < _surface.size(); ++it) {
+ OSCSurface* sur = &_surface[it];
+ XMLNode* devnode = new XMLNode (X_("Configuration"));
+ devnode->add_property (X_("url"), sur->remote_url);
+ devnode->add_property (X_("bank-size"), sur->bank_size);
+ devnode->add_property (X_("strip-types"), sur->strip_types.to_ulong());
+ devnode->add_property (X_("feedback"), sur->feedback.to_ulong());
+ devnode->add_property (X_("gainmode"), sur->gainmode);
+ config->add_child_nocopy (*devnode);
+ }
+ node.add_child_nocopy (*config);
+ }
return node;
}
if (p) {
_debugmode = OSCDebugMode (PBD::atoi(p->value ()));
}
+ p = node.property (X_("address_only"));
+ if (p) {
+ address_only = OSCDebugMode (PBD::atoi(p->value ()));
+ }
+ p = node.property (X_("remote_port"));
+ if (p) {
+ remote_port = OSCDebugMode (PBD::atoi(p->value ()));
+ }
+ p = node.property (X_("banksize"));
+ if (p) {
+ default_banksize = OSCDebugMode (PBD::atoi(p->value ()));
+ }
+ p = node.property (X_("striptypes"));
+ if (p) {
+ default_strip = OSCDebugMode (PBD::atoi(p->value ()));
+ }
+ p = node.property (X_("feedback"));
+ if (p) {
+ default_feedback = OSCDebugMode (PBD::atoi(p->value ()));
+ }
+ p = node.property (X_("gainmode"));
+ if (p) {
+ default_gainmode = OSCDebugMode (PBD::atoi(p->value ()));
+ }
+ XMLNode* cnode = node.child (X_("Configurations"));
+
+ if (cnode) {
+ XMLNodeList const& devices = cnode->children();
+ for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
+ XMLProperty const * prop = (*d)->property (X_("url"));
+ if (prop) {
+ OSCSurface s;
+ bank_dirty = true;
+ s.remote_url = prop->value();
+ prop = (*d)->property (X_("bank-size"));
+ if (prop) {
+ s.bank_size = atoi (prop->value().c_str());
+ }
+ prop = (*d)->property (X_("strip-types"));
+ if (prop) {
+ s.strip_types = atoi (prop->value().c_str());
+ }
+ prop = (*d)->property (X_("feedback"));
+ if (prop) {
+ s.feedback = atoi (prop->value().c_str());
+ }
+ prop = (*d)->property (X_("gainmode"));
+ if (prop) {
+ s.gainmode = atoi (prop->value().c_str());
+ }
+ s.bank = 1;
+ s.sel_obs = 0;
+ s.expand = 0;
+ s.expand_enable = false;
+ s.strips = get_sorted_stripables(s.strip_types);
+ s.nstrips = s.strips.size();
+ _surface.push_back (s);
+ }
+ }
+ }
+ global_init = true;
+ tick = false;
return 0;
}
for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
boost::shared_ptr<Stripable> s = *it;
- if ((!types[9]) && (s->presentation_info().flags() & PresentationInfo::Flag::Hidden)) {
+ if ((!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
// do nothing... skip it
} else {
- if (types[0] && (s->presentation_info().flags() & PresentationInfo::Flag::AudioTrack)) {
- sorted.push_back (s);
- } else
- if (types[1] && (s->presentation_info().flags() & PresentationInfo::Flag::MidiTrack)) {
+ if (types[0] && (s->presentation_info().flags() & PresentationInfo::AudioTrack)) {
sorted.push_back (s);
} else
- if (types[2] && (s->presentation_info().flags() & PresentationInfo::Flag::AudioBus)) {
+ if (types[1] && (s->presentation_info().flags() & PresentationInfo::MidiTrack)) {
sorted.push_back (s);
} else
- if (types[3] && (s->presentation_info().flags() & PresentationInfo::Flag::MidiBus)) {
+ if (types[2] && (s->presentation_info().flags() & PresentationInfo::AudioBus)) {
sorted.push_back (s);
} else
- if (types[4] && (s->presentation_info().flags() & PresentationInfo::Flag::VCA)) {
+ if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
sorted.push_back (s);
} else
- if (types[5] && (s->presentation_info().flags() & PresentationInfo::Flag::MasterOut)) {
+ if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
sorted.push_back (s);
} else
- if (types[6] && (s->presentation_info().flags() & PresentationInfo::Flag::MonitorOut)) {
+ if (types[8] && (s->presentation_info().flags() & PresentationInfo::Selected)) {
sorted.push_back (s);
} else
- if (types[8] && (s->presentation_info().flags() & PresentationInfo::Flag::Selected)) {
- sorted.push_back (s);
- } else
- if (types[9] && (s->presentation_info().flags() & PresentationInfo::Flag::Hidden)) {
+ if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
sorted.push_back (s);
}
}
}
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
+ // Master/Monitor might be anywhere... we put them at the end - Sorry ;)
+ if (types[5]) {
+ sorted.push_back (session->master_out());
+ }
+ if (types[6]) {
+ sorted.push_back (session->monitor_out());
+ }
return sorted;
}