REGISTER_CALLBACK (serv, "/goto_end", "", goto_end);
REGISTER_CALLBACK (serv, "/goto_end", "f", goto_end);
REGISTER_CALLBACK (serv, "/scrub", "f", scrub);
+ REGISTER_CALLBACK (serv, "/jog", "f", jog);
+ REGISTER_CALLBACK (serv, "/jog/mode", "f", jog_mode);
REGISTER_CALLBACK (serv, "/rewind", "", rewind);
REGISTER_CALLBACK (serv, "/rewind", "f", rewind);
REGISTER_CALLBACK (serv, "/ffwd", "", ffwd);
len = strlen (path);
+ if (strstr (path, "/automation")) {
+ ret = set_automation (path, len, argv, argc, msg);
+
+ } else
if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) {
current_value_query (path, len, argv, argc, msg);
ret = 0;
} else
if (!strncmp (path, "/cue/", 5)) {
- cue_parse (path, types, argv, argc, msg);
+ ret = cue_parse (path, types, argv, argc, msg);
- ret = 0;
} else
if (!strncmp (path, "/access_action/", 15)) {
if (!(argc && !argv[0]->i)) {
std::string action_path = path;
access_action (action_path.substr(15));
- std::cout << "access_action path = " << action_path.substr(15) << "\n";
}
ret = 0;
if (!strncmp (path, "/strip/gain/", 12) && strlen (path) > 12) {
// in dB
int ssid = atoi (&path[12]);
- route_set_gain_dB (ssid, argv[0]->f, msg);
- ret = 0;
+ ret = route_set_gain_dB (ssid, argv[0]->f, msg);
}
else if (!strncmp (path, "/strip/fader/", 13) && strlen (path) > 13) {
// in fader position
int ssid = atoi (&path[13]);
- route_set_gain_fader (ssid, argv[0]->f, msg);
- ret = 0;
+ ret = route_set_gain_fader (ssid, argv[0]->f, msg);
}
else if (!strncmp (path, "/strip/trimdB/", 14) && strlen (path) > 14) {
int ssid = atoi (&path[14]);
- route_set_trim_dB (ssid, argv[0]->f, msg);
- ret = 0;
+ ret = route_set_trim_dB (ssid, argv[0]->f, msg);
}
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;
+ ret = route_set_pan_stereo_position (ssid, argv[0]->f, msg);
}
else if (!strncmp (path, "/strip/mute/", 12) && strlen (path) > 12) {
int ssid = atoi (&path[12]);
- route_mute (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = route_mute (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/solo/", 12) && strlen (path) > 12) {
int ssid = atoi (&path[12]);
- route_solo (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = route_solo (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/monitor_input/", 21) && strlen (path) > 21) {
int ssid = atoi (&path[21]);
- route_monitor_input (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = route_monitor_input (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/monitor_disk/", 20) && strlen (path) > 20) {
int ssid = atoi (&path[20]);
- route_monitor_disk (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = route_monitor_disk (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/recenable/", 17) && strlen (path) > 17) {
int ssid = atoi (&path[17]);
- route_recenable (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = route_recenable (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/record_safe/", 19) && strlen (path) > 19) {
int ssid = atoi (&path[19]);
- route_recsafe (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = route_recsafe (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/expand/", 14) && strlen (path) > 14) {
int ssid = atoi (&path[14]);
- strip_expand (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = strip_expand (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
int ssid = atoi (&path[14]);
- strip_gui_select (ssid, argv[0]->i, msg);
- ret = 0;
+ ret = strip_gui_select (ssid, argv[0]->i, msg);
}
else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) {
int ssid = atoi (&path[18]);
- sel_sendgain (ssid, argv[0]->f, msg);
- ret = 0;
+ ret = sel_sendgain (ssid, argv[0]->f, msg);
}
else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) {
int ssid = atoi (&path[19]);
- sel_sendfader (ssid, argv[0]->f, msg);
- ret = 0;
+ ret = sel_sendfader (ssid, argv[0]->f, msg);
}
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;
+ ret = sel_sendenable (ssid, argv[0]->f, msg);
}
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;
+ ret = sel_eq_gain (ssid, argv[0]->f, msg);
}
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;
+ ret = sel_eq_freq (ssid, argv[0]->f , msg);
}
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;
+ ret = sel_eq_q (ssid, argv[0]->f, msg);
}
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;
+ ret = sel_eq_shape (ssid, argv[0]->f, msg);
}
if ((ret && _debugmode != Off)) {
for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end();) {
OSCCueObserver* co;
if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
- delete co;
+ delete *x;
+ x = cue_observers.erase (x);
} else {
++x;
}
{
string r_url;
char * rurl;
+ if (address_only) {
+ string host = lo_address_get_hostname (addr);
+ int protocol = lo_address_get_protocol (addr);
+ addr = lo_address_new_with_proto (protocol, host.c_str(), remote_port.c_str());
+ }
+
rurl = lo_address_get_url (addr);
r_url = rurl;
free (rurl);
// No surface create one with default values
OSCSurface s;
s.remote_url = r_url;
+ 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.expand = 0;
s.expand_enable = false;
s.cue = false;
+ s.aux = 0;
s.strips = get_sorted_stripables(s.strip_types, s.cue);
s.nstrips = s.strips.size();
_surface.push_back (s);
+ // set bank and strip feedback
+ _set_bank(s.bank, addr);
+
+ // Set global/master feedback
+ global_feedback (s.feedback, addr, s.gainmode);
+
return &_surface[_surface.size() - 1];
}
int64_t now = ARDOUR::get_microseconds ();
int64_t diff = now - scrub_time;
- if (diff > 35) {
+ if (diff > 35000) {
// speed 1 (or 0 if jog wheel supports touch)
speed = delta;
- } else if ((diff > 20) && (fabs(scrub_speed) == 1)) {
+ } else if ((diff > 20000) && (fabs(scrub_speed) == 1)) {
// add some hysteresis to stop excess speed jumps
speed = delta;
} else {
return 0;
}
+int
+OSC::jog (float delta, lo_message msg)
+{
+ if (!session) return -1;
+
+ OSCSurface *s = get_surface(get_address (msg));
+
+ string path = "/jog/mode/name";
+ switch(s->jogmode)
+ {
+ case JOG :
+ text_message (path, "Jog", get_address (msg));
+ if (delta) {
+ jump_by_seconds (delta / 5);
+ }
+ break;
+ case SCRUB:
+ text_message (path, "Scrub", get_address (msg));
+ scrub (delta, msg);
+ break;
+ case SHUTTLE:
+ text_message (path, "Shuttle", get_address (msg));
+ if (delta) {
+ double speed = get_transport_speed ();
+ set_transport_speed (speed + (delta / 8));
+ } else {
+ set_transport_speed (0);
+ }
+ break;
+ case SCROLL:
+ text_message (path, "Scroll", get_address (msg));
+ if (delta > 0) {
+ access_action ("Editor/scroll-forward");
+ } else if (delta < 0) {
+ access_action ("Editor/scroll-backward");
+ }
+ break;
+ case TRACK:
+ text_message (path, "Track", get_address (msg));
+ if (delta > 0) {
+ set_bank (s->bank + 1, msg);
+ } else if (delta < 0) {
+ set_bank (s->bank - 1, msg);
+ }
+ break;
+ case BANK:
+ text_message (path, "Bank", get_address (msg));
+ if (delta > 0) {
+ bank_up (msg);
+ } else if (delta < 0) {
+ bank_down (msg);
+ }
+ break;
+ case NUDGE:
+ text_message (path, "Nudge", get_address (msg));
+ if (delta > 0) {
+ access_action ("Common/nudge-playhead-forward");
+ } else if (delta < 0) {
+ access_action ("Common/nudge-playhead-backward");
+ }
+ break;
+ case MARKER:
+ text_message (path, "Marker", get_address (msg));
+ if (delta > 0) {
+ next_marker ();
+ } else if (delta < 0) {
+ prev_marker ();
+ }
+ break;
+ default:
+ break;
+
+ }
+ return 0;
+
+}
+
+int
+OSC::jog_mode (float mode, lo_message msg)
+{
+ if (!session) return -1;
+
+ OSCSurface *s = get_surface(get_address (msg));
+
+ switch((uint32_t)mode)
+ {
+ case JOG :
+ s->jogmode = JOG;
+ break;
+ case SCRUB:
+ s->jogmode = SCRUB;
+ break;
+ case SHUTTLE:
+ s->jogmode = SHUTTLE;
+ break;
+ case SCROLL:
+ s->jogmode = SCROLL;
+ break;
+ case TRACK:
+ s->jogmode = TRACK;
+ break;
+ case BANK:
+ s->jogmode = BANK;
+ break;
+ case NUDGE:
+ s->jogmode = NUDGE;
+ break;
+ case MARKER:
+ s->jogmode = MARKER;
+ break;
+ default:
+ PBD::warning << "Jog Mode: " << mode << " is not valid." << endmsg;
+ break;
+ lo_message reply = lo_message_new ();
+ lo_message_add_int32 (reply, s->jogmode);
+ lo_send_message (get_address(msg), "/jog/mode", reply);
+ lo_message_free (reply);
+
+ }
+ jog (0, msg);
+ return 0;
+
+}
+
// master and monitor calls
int
OSC::master_set_gain (float dB)
}
// strip calls
+
+int
+OSC::set_automation (const char *path, size_t len, lo_arg **argv, int argc, lo_message msg)
+{
+ if (!session) return -1;
+
+ int ret = 1;
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> strp = boost::shared_ptr<Stripable>();
+ uint32_t ctr = 0;
+ uint32_t aut = 0;
+
+ //parse path first to find stripable
+ if (!strncmp (path, "/strip/", 7)) {
+ // find ssid and stripable
+ if (argc > 1) {
+ strp = get_strip (argv[0]->i, get_address (msg));
+ if (argv[1]->f) {
+ aut = (int)argv[1]->f;
+ } else {
+ aut = argv[1]->i;
+ }
+ } else {
+ uint32_t ssid = atoi (&(strrchr (path, '/' ))[1]);
+ strp = get_strip (ssid, get_address (msg));
+ if (argv[0]->f) {
+ aut = (int)argv[0]->f;
+ } else {
+ aut = argv[0]->i;
+ }
+ }
+ ctr = 7;
+ } else if (!strncmp (path, "/select/", 8)) {
+ if (sur->expand_enable && sur->expand) {
+ strp = get_strip (sur->expand, get_address (msg));
+ } else {
+ strp = ControlProtocol::first_selected_stripable();
+ }
+ if (argv[0]->f) {
+ aut = (int)argv[0]->f;
+ } else {
+ aut = argv[0]->i;
+ }
+ ctr = 8;
+ } else {
+ return ret;
+ }
+ if (strp) {
+ if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) {
+ if (strp->gain_control ()) {
+ switch (aut) {
+ case 0:
+ strp->gain_control()->set_automation_state (ARDOUR::Off);
+ ret = 0;
+ break;
+ case 1:
+ strp->gain_control()->set_automation_state (ARDOUR::Play);
+ ret = 0;
+ break;
+ case 2:
+ strp->gain_control()->set_automation_state (ARDOUR::Write);
+ ret = 0;
+ break;
+ case 3:
+ strp->gain_control()->set_automation_state (ARDOUR::Touch);
+ ret = 0;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ return ret;
+}
+
int
OSC::route_mute (int ssid, int yn, lo_message msg)
{
// for those jog wheels that don't have 0 on release (touch), time out.
int64_t now = ARDOUR::get_microseconds ();
int64_t diff = now - scrub_time;
- if (diff > 100) {
+ if (diff > 120000) {
scrub_speed = 0;
session->request_transport_speed (0);
// locate to the place PH was at last tick
s.expand_enable = false;
s.strips = get_sorted_stripables (s.strip_types, s.cue);
s.nstrips = s.strips.size ();
+ s.no_clear = false;
+ s.jogmode = JOG;
+ s.cue = false;
+ s.aux = 0;
_surface.push_back (s);
}
}
sorted.push_back (s);
}
}
- } else
- if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+ } else if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
sorted.push_back (s);
- } else
- if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
+ } else if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
sorted.push_back (s);
- } else
- if (types[8] && (s->presentation_info().flags() & PresentationInfo::Selected)) {
+ } else if (types[8] && (s->is_selected())) {
sorted.push_back (s);
- } else
- if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+ } else if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
sorted.push_back (s);
}
}
if (!strncmp (path, "/cue/aux", 8)) {
// set our Aux bus
- cue_set (argv[0]->i, msg);
- ret = 0;
+ ret = cue_set (argv[0]->i, msg);
}
else if (!strncmp (path, "/cue/connect", 12)) {
- // switch to next Aux bus
- cue_set (0, msg);
- ret = 0;
+ // Connect to default Aux bus
+ if ((!argc) || argv[0]->i) {
+ ret = cue_set (1, msg);
+ }
}
else if (!strncmp (path, "/cue/next_aux", 13)) {
// switch to next Aux bus
- cue_next (msg);
- ret = 0;
+ if ((!argc) || argv[0]->i) {
+ ret = cue_next (msg);
+ }
}
else if (!strncmp (path, "/cue/previous_aux", 17)) {
// switch to previous Aux bus
- cue_previous (msg);
- ret = 0;
+ if ((!argc) || argv[0]->i) {
+ ret = cue_previous (msg);
+ }
}
else if (!strncmp (path, "/cue/send/fader/", 16) && strlen (path) > 16) {
int id = atoi (&path[16]);
- cue_send_fader (id, argv[0]->f, msg);
- ret = 0;
+ ret = cue_send_fader (id, argv[0]->f, msg);
}
else if (!strncmp (path, "/cue/send/enable/", 17) && strlen (path) > 17) {
int id = atoi (&path[17]);
- cue_send_enable (id, argv[0]->f, msg);
- ret = 0;
+ ret = cue_send_enable (id, argv[0]->f, msg);
}
else if (!strncmp (path, "/cue/fader", 10)) {
- cue_aux_fader (argv[0]->f, msg);
- ret = 0;
+ ret = cue_aux_fader (argv[0]->f, msg);
}
else if (!strncmp (path, "/cue/mute", 9)) {
- cue_aux_mute (argv[0]->f, msg);
- ret = 0;
- }
-
- if ((ret && _debugmode == Unhandled)) {
- debugmsg (_("Unhandled OSC cue message"), path, types, argv, argc);
- } else if ((!ret && _debugmode == All)) {
- debugmsg (_("OSC cue"), path, types, argv, argc);
+ ret = cue_aux_mute (argv[0]->f, msg);
}
return ret;
int
OSC::_cue_set (uint32_t aux, lo_address addr)
{
+ int ret = 1;
OSCSurface *s = get_surface(addr);
s->bank_size = 0;
s->strip_types = 128;
s->feedback = 0;
s->gainmode = 1;
s->cue = true;
- s->aux = aux;
s->strips = get_sorted_stripables(s->strip_types, s->cue);
s->nstrips = s->strips.size();
+
+ if (aux < 1) {
+ aux = 1;
+ } else if (aux > s->nstrips) {
+ aux = s->nstrips;
+ }
+ s->aux = aux;
+
// get rid of any old CueObsevers for this address
- cueobserver_connections.drop_connections ();
+ //cueobserver_connections.drop_connections ();
CueObservers::iterator x;
for (x = cue_observers.begin(); x != cue_observers.end();) {
// start cue observer
OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr);
cue_observers.push_back (co);
+ ret = 0;
}
}
}
- return 0;
+ return ret;
}
int
OSC::cue_next (lo_message msg)
{
OSCSurface *s = get_surface(get_address (msg));
+ int ret = 1;
+
+ if (!s->cue) {
+ ret = cue_set (1, msg);
+ }
if (s->aux < s->nstrips) {
- cue_set (s->aux + 1, msg);
+ ret = cue_set (s->aux + 1, msg);
} else {
- cue_set (s->nstrips, msg);
+ ret = cue_set (s->nstrips, msg);
}
- return 0;
+ return ret;
}
int
OSC::cue_previous (lo_message msg)
{
OSCSurface *s = get_surface(get_address (msg));
+ int ret = 1;
+ if (!s->cue) {
+ ret = cue_set (1, msg);
+ }
if (s->aux > 1) {
- cue_set (s->aux - 1, msg);
+ ret = cue_set (s->aux - 1, msg);
}
- return 0;
+ return ret;
}
boost::shared_ptr<Send>
}
}
}
- return cue_float_message ("/cue/fader", 0, get_address (msg));
+ cue_float_message ("/cue/fader", 0, get_address (msg));
+ return -1;
}
int
}
}
}
- return cue_float_message ("/cue/mute", 0, get_address (msg));
+ cue_float_message ("/cue/mute", 0, get_address (msg));
+ return -1;
}
int
return 0;
}
}
- return cue_float_message (string_compose ("/cue/send/fader/%1", id), 0, get_address (msg));
+ cue_float_message (string_compose ("/cue/send/fader/%1", id), 0, get_address (msg));
+ return -1;
}
int
}
return 0;
}
- return cue_float_message (string_compose ("/cue/send/enable/%1", id), 0, get_address (msg));
+ cue_float_message (string_compose ("/cue/send/enable/%1", id), 0, get_address (msg));
+ return -1;
}
int
projects / ardour.git / blobdiff