X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.cc;h=1a9d7371598918f088d59587b27115e426297210;hb=edd21ac89e03c843b4fa3fecb97fa90470b5a779;hp=71bd98cae736fa0557919cc0e23c7de4670425f7;hpb=41bc5bc116c4137053d078484010092355d67a0e;p=ardour.git diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 71bd98cae7..1a9d737159 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -37,8 +37,10 @@ #include "ardour/amp.h" #include "ardour/session.h" #include "ardour/route.h" +#include "ardour/route_group.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" @@ -94,7 +96,7 @@ OSC::OSC (Session& s, uint32_t port) , _osc_server (0) , _osc_unix_server (0) , _debugmode (Off) - , address_only (false) + , address_only (true) , remote_port ("8000") , default_banksize (0) , default_strip (159) @@ -104,6 +106,7 @@ OSC::OSC (Session& s, uint32_t port) , default_plugin_size (0) , tick (true) , bank_dirty (false) + , observer_busy (true) , scrub_speed (0) , gui (0) { @@ -114,6 +117,7 @@ OSC::OSC (Session& s, uint32_t port) OSC::~OSC() { + tick = false; stop (); tear_down_gui (); _instance = 0; @@ -233,6 +237,7 @@ OSC::start () } } + observer_busy = false; register_callbacks(); session_loaded (*session); @@ -257,7 +262,10 @@ OSC::start () // order changed PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); - _select = boost::shared_ptr(); + _select = ControlProtocol::first_selected_stripable(); + if(!_select) { + _select = session->master_out (); + } return 0; } @@ -295,8 +303,18 @@ OSC::thread_init () int OSC::stop () { - /* stop main loop */ + periodic_connection.disconnect (); + session_connections.drop_connections (); + + // clear surfaces + observer_busy = true; + for (uint32_t it = 0; it < _surface.size (); ++it) { + OSCSurface* sur = &_surface[it]; + surface_destroy (sur); + } + _surface.clear(); + /* stop main loop */ if (local_server) { g_source_destroy (local_server); g_source_unref (local_server); @@ -329,59 +347,48 @@ OSC::stop () ::g_unlink (_osc_url_file.c_str() ); } - periodic_connection.disconnect (); - session_connections.drop_connections (); - cueobserver_connections.drop_connections (); - // Delete any active route observers - for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) { - - OSCRouteObserver* rc; + return 0; +} - if ((rc = dynamic_cast(*x)) != 0) { - delete *x; - x = route_observers.erase (x); - } else { - ++x; - } +void +OSC::surface_destroy (OSCSurface* sur) +{ + OSCSelectObserver* so; + if ((so = dynamic_cast(sur->sel_obs)) != 0) { + so->clear_observer (); + delete so; + sur->sel_obs = 0; + PBD::ScopedConnection pc = sur->proc_connection; + pc.disconnect (); } -// Should maybe do global_observers too - for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) { - OSCGlobalObserver* gc; - - if ((gc = dynamic_cast(*x)) != 0) { - delete *x; - x = global_observers.erase (x); - } else { - ++x; - } + OSCCueObserver* co; + if ((co = dynamic_cast(sur->cue_obs)) != 0) { + delete co; + sur->cue_obs = 0; + sur->sends.clear (); } -// delete select observers - for (uint32_t it = 0; it < _surface.size(); ++it) { - OSCSurface* sur = &_surface[it]; - OSCSelectObserver* so; - if ((so = dynamic_cast(sur->sel_obs)) != 0) { - delete so; - } + OSCGlobalObserver* go; + if ((go = dynamic_cast(sur->global_obs)) != 0) { + go->clear_observer (); + delete go; + sur->global_obs = 0; } + uint32_t st_end = sur->observers.size (); -// delete cue observers - for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end();) { - - OSCCueObserver* co; - - if ((co = dynamic_cast(*x)) != 0) { - delete *x; - x = cue_observers.erase (x); - } else { - ++x; + for (uint32_t i = 0; i < st_end; i++) { + OSCRouteObserver* ro; + if ((ro = dynamic_cast(sur->observers[i])) != 0) { + ro->clear_strip (); + delete ro; + ro = 0; } } - - return 0; + sur->observers.clear(); } + void OSC::register_callbacks() { @@ -405,221 +412,241 @@ OSC::register_callbacks() // Some controls have optional "f" for feedback or touchosc // http://hexler.net/docs/touchosc-controls-reference - REGISTER_CALLBACK (serv, "/refresh", "", refresh_surface); - REGISTER_CALLBACK (serv, "/refresh", "f", refresh_surface); - REGISTER_CALLBACK (serv, "/strip/list", "", routes_list); - REGISTER_CALLBACK (serv, "/strip/list", "f", routes_list); - REGISTER_CALLBACK (serv, "/add_marker", "", add_marker); - REGISTER_CALLBACK (serv, "/add_marker", "f", add_marker); - REGISTER_CALLBACK (serv, "/access_action", "s", access_action); - REGISTER_CALLBACK (serv, "/loop_toggle", "", loop_toggle); - REGISTER_CALLBACK (serv, "/loop_toggle", "f", loop_toggle); - REGISTER_CALLBACK (serv, "/loop_location", "ii", loop_location); - REGISTER_CALLBACK (serv, "/goto_start", "", goto_start); - REGISTER_CALLBACK (serv, "/goto_start", "f", goto_start); - 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); - REGISTER_CALLBACK (serv, "/ffwd", "f", ffwd); - REGISTER_CALLBACK (serv, "/transport_stop", "", transport_stop); - REGISTER_CALLBACK (serv, "/transport_stop", "f", transport_stop); - REGISTER_CALLBACK (serv, "/transport_play", "", transport_play); - REGISTER_CALLBACK (serv, "/transport_play", "f", transport_play); - REGISTER_CALLBACK (serv, "/transport_frame", "", transport_frame); - REGISTER_CALLBACK (serv, "/transport_speed", "", transport_speed); - REGISTER_CALLBACK (serv, "/record_enabled", "", record_enabled); - REGISTER_CALLBACK (serv, "/set_transport_speed", "f", set_transport_speed); + REGISTER_CALLBACK (serv, X_("/refresh"), "", refresh_surface); + REGISTER_CALLBACK (serv, X_("/refresh"), "f", refresh_surface); + REGISTER_CALLBACK (serv, X_("/strip/list"), "", routes_list); + REGISTER_CALLBACK (serv, X_("/strip/list"), "f", routes_list); + REGISTER_CALLBACK (serv, X_("/group/list"), "", group_list); + REGISTER_CALLBACK (serv, X_("/group/list"), "f", group_list); + REGISTER_CALLBACK (serv, X_("/strip/custom/mode"), "f", custom_mode); + REGISTER_CALLBACK (serv, X_("/strip/custom/clear"), "f", custom_clear); + REGISTER_CALLBACK (serv, X_("/strip/custom/clear"), "", custom_clear); + REGISTER_CALLBACK (serv, X_("/surface/list"), "", surface_list); + REGISTER_CALLBACK (serv, X_("/surface/list"), "f", surface_list); + REGISTER_CALLBACK (serv, X_("/add_marker"), "", add_marker); + REGISTER_CALLBACK (serv, X_("/add_marker"), "f", add_marker); + REGISTER_CALLBACK (serv, X_("/access_action"), "s", access_action); + REGISTER_CALLBACK (serv, X_("/loop_toggle"), "", loop_toggle); + REGISTER_CALLBACK (serv, X_("/loop_toggle"), "f", loop_toggle); + REGISTER_CALLBACK (serv, X_("/loop_location"), "ii", loop_location); + REGISTER_CALLBACK (serv, X_("/goto_start"), "", goto_start); + REGISTER_CALLBACK (serv, X_("/goto_start"), "f", goto_start); + REGISTER_CALLBACK (serv, X_("/goto_end"), "", goto_end); + REGISTER_CALLBACK (serv, X_("/goto_end"), "f", goto_end); + REGISTER_CALLBACK (serv, X_("/scrub"), "f", scrub); + REGISTER_CALLBACK (serv, X_("/jog"), "f", jog); + REGISTER_CALLBACK (serv, X_("/jog/mode"), "f", jog_mode); + REGISTER_CALLBACK (serv, X_("/rewind"), "", rewind); + REGISTER_CALLBACK (serv, X_("/rewind"), "f", rewind); + REGISTER_CALLBACK (serv, X_("/ffwd"), "", ffwd); + REGISTER_CALLBACK (serv, X_("/ffwd"), "f", ffwd); + REGISTER_CALLBACK (serv, X_("/transport_stop"), "", transport_stop); + REGISTER_CALLBACK (serv, X_("/transport_stop"), "f", transport_stop); + REGISTER_CALLBACK (serv, X_("/transport_play"), "", transport_play); + REGISTER_CALLBACK (serv, X_("/transport_play"), "f", transport_play); + REGISTER_CALLBACK (serv, X_("/transport_frame"), "", transport_sample); + REGISTER_CALLBACK (serv, X_("/transport_speed"), "", transport_speed); + REGISTER_CALLBACK (serv, X_("/record_enabled"), "", record_enabled); + REGISTER_CALLBACK (serv, X_("/set_transport_speed"), "f", set_transport_speed); // locate ii is position and bool roll - REGISTER_CALLBACK (serv, "/locate", "ii", locate); - REGISTER_CALLBACK (serv, "/save_state", "", save_state); - REGISTER_CALLBACK (serv, "/save_state", "f", save_state); - REGISTER_CALLBACK (serv, "/prev_marker", "", prev_marker); - REGISTER_CALLBACK (serv, "/prev_marker", "f", prev_marker); - REGISTER_CALLBACK (serv, "/next_marker", "", next_marker); - REGISTER_CALLBACK (serv, "/next_marker", "f", next_marker); - REGISTER_CALLBACK (serv, "/undo", "", undo); - REGISTER_CALLBACK (serv, "/undo", "f", undo); - REGISTER_CALLBACK (serv, "/redo", "", redo); - REGISTER_CALLBACK (serv, "/redo", "f", redo); - REGISTER_CALLBACK (serv, "/toggle_punch_in", "", toggle_punch_in); - REGISTER_CALLBACK (serv, "/toggle_punch_in", "f", toggle_punch_in); - REGISTER_CALLBACK (serv, "/toggle_punch_out", "", toggle_punch_out); - REGISTER_CALLBACK (serv, "/toggle_punch_out", "f", toggle_punch_out); - REGISTER_CALLBACK (serv, "/rec_enable_toggle", "", rec_enable_toggle); - REGISTER_CALLBACK (serv, "/rec_enable_toggle", "f", rec_enable_toggle); - REGISTER_CALLBACK (serv, "/toggle_all_rec_enables", "", toggle_all_rec_enables); - 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); - REGISTER_CALLBACK (serv, "/jump_seconds", "f", jump_by_seconds); - REGISTER_CALLBACK (serv, "/mark_in", "", mark_in); - REGISTER_CALLBACK (serv, "/mark_in", "f", mark_in); - REGISTER_CALLBACK (serv, "/mark_out", "", mark_out); - REGISTER_CALLBACK (serv, "/mark_out", "f", mark_out); - REGISTER_CALLBACK (serv, "/toggle_click", "", toggle_click); - REGISTER_CALLBACK (serv, "/toggle_click", "f", toggle_click); - REGISTER_CALLBACK (serv, "/midi_panic", "", midi_panic); - REGISTER_CALLBACK (serv, "/midi_panic", "f", midi_panic); - REGISTER_CALLBACK (serv, "/toggle_roll", "", toggle_roll); - REGISTER_CALLBACK (serv, "/toggle_roll", "f", toggle_roll); - REGISTER_CALLBACK (serv, "/stop_forget", "", stop_forget); - REGISTER_CALLBACK (serv, "/stop_forget", "f", stop_forget); - REGISTER_CALLBACK (serv, "/set_punch_range", "", set_punch_range); - REGISTER_CALLBACK (serv, "/set_punch_range", "f", set_punch_range); - REGISTER_CALLBACK (serv, "/set_loop_range", "", set_loop_range); - REGISTER_CALLBACK (serv, "/set_loop_range", "f", set_loop_range); - REGISTER_CALLBACK (serv, "/set_session_range", "", set_session_range); - REGISTER_CALLBACK (serv, "/set_session_range", "f", set_session_range); - REGISTER_CALLBACK (serv, "/toggle_monitor_mute", "", toggle_monitor_mute); - REGISTER_CALLBACK (serv, "/toggle_monitor_mute", "f", toggle_monitor_mute); - REGISTER_CALLBACK (serv, "/toggle_monitor_dim", "", toggle_monitor_dim); - REGISTER_CALLBACK (serv, "/toggle_monitor_dim", "f", toggle_monitor_dim); - REGISTER_CALLBACK (serv, "/toggle_monitor_mono", "", toggle_monitor_mono); - REGISTER_CALLBACK (serv, "/toggle_monitor_mono", "f", toggle_monitor_mono); - REGISTER_CALLBACK (serv, "/quick_snapshot_switch", "", quick_snapshot_switch); - REGISTER_CALLBACK (serv, "/quick_snapshot_switch", "f", quick_snapshot_switch); - REGISTER_CALLBACK (serv, "/quick_snapshot_stay", "", quick_snapshot_stay); - REGISTER_CALLBACK (serv, "/quick_snapshot_stay", "f", quick_snapshot_stay); - REGISTER_CALLBACK (serv, "/fit_1_track", "", fit_1_track); - REGISTER_CALLBACK (serv, "/fit_1_track", "f", fit_1_track); - REGISTER_CALLBACK (serv, "/fit_2_tracks", "", fit_2_tracks); - REGISTER_CALLBACK (serv, "/fit_2_tracks", "f", fit_2_tracks); - REGISTER_CALLBACK (serv, "/fit_4_tracks", "", fit_4_tracks); - REGISTER_CALLBACK (serv, "/fit_4_tracks", "f", fit_4_tracks); - REGISTER_CALLBACK (serv, "/fit_8_tracks", "", fit_8_tracks); - REGISTER_CALLBACK (serv, "/fit_8_tracks", "f", fit_8_tracks); - REGISTER_CALLBACK (serv, "/fit_16_tracks", "", fit_16_tracks); - REGISTER_CALLBACK (serv, "/fit_16_tracks", "f", fit_16_tracks); - REGISTER_CALLBACK (serv, "/fit_32_tracks", "", fit_32_tracks); - REGISTER_CALLBACK (serv, "/fit_32_tracks", "f", fit_32_tracks); - REGISTER_CALLBACK (serv, "/fit_all_tracks", "", fit_all_tracks); - REGISTER_CALLBACK (serv, "/fit_all_tracks", "f", fit_all_tracks); - REGISTER_CALLBACK (serv, "/zoom_100_ms", "", zoom_100_ms); - REGISTER_CALLBACK (serv, "/zoom_100_ms", "f", zoom_100_ms); - REGISTER_CALLBACK (serv, "/zoom_1_sec", "", zoom_1_sec); - REGISTER_CALLBACK (serv, "/zoom_1_sec", "f", zoom_1_sec); - REGISTER_CALLBACK (serv, "/zoom_10_sec", "", zoom_10_sec); - REGISTER_CALLBACK (serv, "/zoom_10_sec", "f", zoom_10_sec); - REGISTER_CALLBACK (serv, "/zoom_1_min", "", zoom_1_min); - REGISTER_CALLBACK (serv, "/zoom_1_min", "f", zoom_1_min); - REGISTER_CALLBACK (serv, "/zoom_5_min", "", zoom_5_min); - REGISTER_CALLBACK (serv, "/zoom_5_min", "f", zoom_5_min); - REGISTER_CALLBACK (serv, "/zoom_10_min", "", zoom_10_min); - REGISTER_CALLBACK (serv, "/zoom_10_min", "f", zoom_10_min); - REGISTER_CALLBACK (serv, "/zoom_to_session", "", zoom_to_session); - REGISTER_CALLBACK (serv, "/zoom_to_session", "f", zoom_to_session); - REGISTER_CALLBACK (serv, "/temporal_zoom_in", "f", temporal_zoom_in); - REGISTER_CALLBACK (serv, "/temporal_zoom_in", "", temporal_zoom_in); - REGISTER_CALLBACK (serv, "/temporal_zoom_out", "", temporal_zoom_out); - REGISTER_CALLBACK (serv, "/temporal_zoom_out", "f", temporal_zoom_out); - REGISTER_CALLBACK (serv, "/scroll_up_1_track", "f", scroll_up_1_track); - REGISTER_CALLBACK (serv, "/scroll_up_1_track", "", scroll_up_1_track); - REGISTER_CALLBACK (serv, "/scroll_dn_1_track", "f", scroll_dn_1_track); - REGISTER_CALLBACK (serv, "/scroll_dn_1_track", "", scroll_dn_1_track); - REGISTER_CALLBACK (serv, "/scroll_up_1_page", "f", scroll_up_1_page); - REGISTER_CALLBACK (serv, "/scroll_up_1_page", "", scroll_up_1_page); - REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "f", scroll_dn_1_page); - REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "", scroll_dn_1_page); - REGISTER_CALLBACK (serv, "/bank_up", "", bank_up); - 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, X_("/locate"), "ii", locate); + REGISTER_CALLBACK (serv, X_("/save_state"), "", save_state); + REGISTER_CALLBACK (serv, X_("/save_state"), "f", save_state); + REGISTER_CALLBACK (serv, X_("/prev_marker"), "", prev_marker); + REGISTER_CALLBACK (serv, X_("/prev_marker"), "f", prev_marker); + REGISTER_CALLBACK (serv, X_("/next_marker"), "", next_marker); + REGISTER_CALLBACK (serv, X_("/next_marker"), "f", next_marker); + REGISTER_CALLBACK (serv, X_("/undo"), "", undo); + REGISTER_CALLBACK (serv, X_("/undo"), "f", undo); + REGISTER_CALLBACK (serv, X_("/redo"), "", redo); + REGISTER_CALLBACK (serv, X_("/redo"), "f", redo); + REGISTER_CALLBACK (serv, X_("/toggle_punch_in"), "", toggle_punch_in); + REGISTER_CALLBACK (serv, X_("/toggle_punch_in"), "f", toggle_punch_in); + REGISTER_CALLBACK (serv, X_("/toggle_punch_out"), "", toggle_punch_out); + REGISTER_CALLBACK (serv, X_("/toggle_punch_out"), "f", toggle_punch_out); + REGISTER_CALLBACK (serv, X_("/rec_enable_toggle"), "", rec_enable_toggle); + REGISTER_CALLBACK (serv, X_("/rec_enable_toggle"), "f", rec_enable_toggle); + REGISTER_CALLBACK (serv, X_("/toggle_all_rec_enables"), "", toggle_all_rec_enables); + REGISTER_CALLBACK (serv, X_("/toggle_all_rec_enables"), "f", toggle_all_rec_enables); + REGISTER_CALLBACK (serv, X_("/all_tracks_rec_in"), "f", all_tracks_rec_in); + REGISTER_CALLBACK (serv, X_("/all_tracks_rec_out"), "f", all_tracks_rec_out); + REGISTER_CALLBACK (serv, X_("/cancel_all_solos"), "f", cancel_all_solos); + REGISTER_CALLBACK (serv, X_("/remove_marker"), "", remove_marker_at_playhead); + REGISTER_CALLBACK (serv, X_("/remove_marker"), "f", remove_marker_at_playhead); + REGISTER_CALLBACK (serv, X_("/jump_bars"), "f", jump_by_bars); + REGISTER_CALLBACK (serv, X_("/jump_seconds"), "f", jump_by_seconds); + REGISTER_CALLBACK (serv, X_("/mark_in"), "", mark_in); + REGISTER_CALLBACK (serv, X_("/mark_in"), "f", mark_in); + REGISTER_CALLBACK (serv, X_("/mark_out"), "", mark_out); + REGISTER_CALLBACK (serv, X_("/mark_out"), "f", mark_out); + REGISTER_CALLBACK (serv, X_("/toggle_click"), "", toggle_click); + REGISTER_CALLBACK (serv, X_("/toggle_click"), "f", toggle_click); + REGISTER_CALLBACK (serv, X_("/click/level"), "f", click_level); + REGISTER_CALLBACK (serv, X_("/midi_panic"), "", midi_panic); + REGISTER_CALLBACK (serv, X_("/midi_panic"), "f", midi_panic); + REGISTER_CALLBACK (serv, X_("/toggle_roll"), "", toggle_roll); + REGISTER_CALLBACK (serv, X_("/toggle_roll"), "f", toggle_roll); + REGISTER_CALLBACK (serv, X_("/stop_forget"), "", stop_forget); + REGISTER_CALLBACK (serv, X_("/stop_forget"), "f", stop_forget); + REGISTER_CALLBACK (serv, X_("/set_punch_range"), "", set_punch_range); + REGISTER_CALLBACK (serv, X_("/set_punch_range"), "f", set_punch_range); + REGISTER_CALLBACK (serv, X_("/set_loop_range"), "", set_loop_range); + REGISTER_CALLBACK (serv, X_("/set_loop_range"), "f", set_loop_range); + REGISTER_CALLBACK (serv, X_("/set_session_range"), "", set_session_range); + REGISTER_CALLBACK (serv, X_("/set_session_range"), "f", set_session_range); + REGISTER_CALLBACK (serv, X_("/toggle_monitor_mute"), "", toggle_monitor_mute); + REGISTER_CALLBACK (serv, X_("/toggle_monitor_mute"), "f", toggle_monitor_mute); + REGISTER_CALLBACK (serv, X_("/toggle_monitor_dim"), "", toggle_monitor_dim); + REGISTER_CALLBACK (serv, X_("/toggle_monitor_dim"), "f", toggle_monitor_dim); + REGISTER_CALLBACK (serv, X_("/toggle_monitor_mono"), "", toggle_monitor_mono); + REGISTER_CALLBACK (serv, X_("/toggle_monitor_mono"), "f", toggle_monitor_mono); + REGISTER_CALLBACK (serv, X_("/quick_snapshot_switch"), "", quick_snapshot_switch); + REGISTER_CALLBACK (serv, X_("/quick_snapshot_switch"), "f", quick_snapshot_switch); + REGISTER_CALLBACK (serv, X_("/quick_snapshot_stay"), "", quick_snapshot_stay); + REGISTER_CALLBACK (serv, X_("/quick_snapshot_stay"), "f", quick_snapshot_stay); + REGISTER_CALLBACK (serv, X_("/session_name"), "s", name_session); + REGISTER_CALLBACK (serv, X_("/fit_1_track"), "", fit_1_track); + REGISTER_CALLBACK (serv, X_("/fit_1_track"), "f", fit_1_track); + REGISTER_CALLBACK (serv, X_("/fit_2_tracks"), "", fit_2_tracks); + REGISTER_CALLBACK (serv, X_("/fit_2_tracks"), "f", fit_2_tracks); + REGISTER_CALLBACK (serv, X_("/fit_4_tracks"), "", fit_4_tracks); + REGISTER_CALLBACK (serv, X_("/fit_4_tracks"), "f", fit_4_tracks); + REGISTER_CALLBACK (serv, X_("/fit_8_tracks"), "", fit_8_tracks); + REGISTER_CALLBACK (serv, X_("/fit_8_tracks"), "f", fit_8_tracks); + REGISTER_CALLBACK (serv, X_("/fit_16_tracks"), "", fit_16_tracks); + REGISTER_CALLBACK (serv, X_("/fit_16_tracks"), "f", fit_16_tracks); + REGISTER_CALLBACK (serv, X_("/fit_32_tracks"), "", fit_32_tracks); + REGISTER_CALLBACK (serv, X_("/fit_32_tracks"), "f", fit_32_tracks); + REGISTER_CALLBACK (serv, X_("/fit_all_tracks"), "", fit_all_tracks); + REGISTER_CALLBACK (serv, X_("/fit_all_tracks"), "f", fit_all_tracks); + REGISTER_CALLBACK (serv, X_("/zoom_100_ms"), "", zoom_100_ms); + REGISTER_CALLBACK (serv, X_("/zoom_100_ms"), "f", zoom_100_ms); + REGISTER_CALLBACK (serv, X_("/zoom_1_sec"), "", zoom_1_sec); + REGISTER_CALLBACK (serv, X_("/zoom_1_sec"), "f", zoom_1_sec); + REGISTER_CALLBACK (serv, X_("/zoom_10_sec"), "", zoom_10_sec); + REGISTER_CALLBACK (serv, X_("/zoom_10_sec"), "f", zoom_10_sec); + REGISTER_CALLBACK (serv, X_("/zoom_1_min"), "", zoom_1_min); + REGISTER_CALLBACK (serv, X_("/zoom_1_min"), "f", zoom_1_min); + REGISTER_CALLBACK (serv, X_("/zoom_5_min"), "", zoom_5_min); + REGISTER_CALLBACK (serv, X_("/zoom_5_min"), "f", zoom_5_min); + REGISTER_CALLBACK (serv, X_("/zoom_10_min"), "", zoom_10_min); + REGISTER_CALLBACK (serv, X_("/zoom_10_min"), "f", zoom_10_min); + REGISTER_CALLBACK (serv, X_("/zoom_to_session"), "", zoom_to_session); + REGISTER_CALLBACK (serv, X_("/zoom_to_session"), "f", zoom_to_session); + REGISTER_CALLBACK (serv, X_("/temporal_zoom_in"), "f", temporal_zoom_in); + REGISTER_CALLBACK (serv, X_("/temporal_zoom_in"), "", temporal_zoom_in); + REGISTER_CALLBACK (serv, X_("/temporal_zoom_out"), "", temporal_zoom_out); + REGISTER_CALLBACK (serv, X_("/temporal_zoom_out"), "f", temporal_zoom_out); + REGISTER_CALLBACK (serv, X_("/scroll_up_1_track"), "f", scroll_up_1_track); + REGISTER_CALLBACK (serv, X_("/scroll_up_1_track"), "", scroll_up_1_track); + REGISTER_CALLBACK (serv, X_("/scroll_dn_1_track"), "f", scroll_dn_1_track); + REGISTER_CALLBACK (serv, X_("/scroll_dn_1_track"), "", scroll_dn_1_track); + REGISTER_CALLBACK (serv, X_("/scroll_up_1_page"), "f", scroll_up_1_page); + REGISTER_CALLBACK (serv, X_("/scroll_up_1_page"), "", scroll_up_1_page); + REGISTER_CALLBACK (serv, X_("/scroll_dn_1_page"), "f", scroll_dn_1_page); + REGISTER_CALLBACK (serv, X_("/scroll_dn_1_page"), "", scroll_dn_1_page); + REGISTER_CALLBACK (serv, X_("/bank_up"), "", bank_up); + REGISTER_CALLBACK (serv, X_("/bank_up"), "f", bank_delta); + REGISTER_CALLBACK (serv, X_("/bank_down"), "", bank_down); + REGISTER_CALLBACK (serv, X_("/bank_down"), "f", bank_down); + REGISTER_CALLBACK (serv, X_("/use_group"), "f", use_group); // controls for "special" strips - REGISTER_CALLBACK (serv, "/master/gain", "f", master_set_gain); - 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", "f", monitor_set_fader); - REGISTER_CALLBACK (serv, "/monitor/mute", "i", monitor_set_mute); - REGISTER_CALLBACK (serv, "/monitor/dim", "i", monitor_set_dim); - REGISTER_CALLBACK (serv, "/monitor/mono", "i", monitor_set_mono); + REGISTER_CALLBACK (serv, X_("/master/gain"), "f", master_set_gain); + REGISTER_CALLBACK (serv, X_("/master/fader"), "f", master_set_fader); + REGISTER_CALLBACK (serv, X_("/master/db_delta"), "f", master_delta_gain); + REGISTER_CALLBACK (serv, X_("/master/mute"), "i", master_set_mute); + REGISTER_CALLBACK (serv, X_("/master/trimdB"), "f", master_set_trim); + REGISTER_CALLBACK (serv, X_("/master/pan_stereo_position"), "f", master_set_pan_stereo_position); + REGISTER_CALLBACK (serv, X_("/master/select"), "f", master_select); + REGISTER_CALLBACK (serv, X_("/monitor/gain"), "f", monitor_set_gain); + REGISTER_CALLBACK (serv, X_("/monitor/fader"), "f", monitor_set_fader); + REGISTER_CALLBACK (serv, X_("/monitor/db_delta"), "f", monitor_delta_gain); + REGISTER_CALLBACK (serv, X_("/monitor/mute"), "i", monitor_set_mute); + REGISTER_CALLBACK (serv, X_("/monitor/dim"), "i", monitor_set_dim); + REGISTER_CALLBACK (serv, X_("/monitor/mono"), "i", monitor_set_mono); // Controls for the Selected strip - REGISTER_CALLBACK (serv, "/select/recenable", "i", sel_recenable); - REGISTER_CALLBACK (serv, "/select/record_safe", "i", sel_recsafe); - REGISTER_CALLBACK (serv, "/select/mute", "i", sel_mute); - REGISTER_CALLBACK (serv, "/select/solo", "i", sel_solo); - REGISTER_CALLBACK (serv, "/select/solo_iso", "i", sel_solo_iso); - REGISTER_CALLBACK (serv, "/select/solo_safe", "i", sel_solo_safe); - REGISTER_CALLBACK (serv, "/select/monitor_input", "i", sel_monitor_input); - REGISTER_CALLBACK (serv, "/select/monitor_disk", "i", sel_monitor_disk); - REGISTER_CALLBACK (serv, "/select/polarity", "i", sel_phase); - REGISTER_CALLBACK (serv, "/select/gain", "f", sel_gain); - REGISTER_CALLBACK (serv, "/select/fader", "f", sel_fader); - REGISTER_CALLBACK (serv, "/select/trimdB", "f", sel_trim); - REGISTER_CALLBACK (serv, "/select/pan_stereo_position", "f", sel_pan_position); - REGISTER_CALLBACK (serv, "/select/pan_stereo_width", "f", sel_pan_width); - 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/master_send_enable", "i", sel_master_send_enable); - REGISTER_CALLBACK (serv, "/select/send_page", "f", sel_send_page); - REGISTER_CALLBACK (serv, "/select/plug_page", "f", sel_plug_page); - REGISTER_CALLBACK (serv, "/select/plugin", "f", sel_plugin); - 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/freq", "f", sel_eq_hpf_freq); - REGISTER_CALLBACK (serv, "/select/eq_hpf/enable", "f", sel_eq_hpf_enable); - REGISTER_CALLBACK (serv, "/select/eq_hpf/slope", "f", sel_eq_hpf_slope); - REGISTER_CALLBACK (serv, "/select/eq_lpf/freq", "f", sel_eq_lpf_freq); - REGISTER_CALLBACK (serv, "/select/eq_lpf/enable", "f", sel_eq_lpf_enable); - REGISTER_CALLBACK (serv, "/select/eq_lpf/slope", "f", sel_eq_lpf_slope); - 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); + REGISTER_CALLBACK (serv, X_("/select/recenable"), "i", sel_recenable); + REGISTER_CALLBACK (serv, X_("/select/record_safe"), "i", sel_recsafe); + REGISTER_CALLBACK (serv, X_("/select/name"), "s", sel_rename); + REGISTER_CALLBACK (serv, X_("/select/comment"), "s", sel_comment); + REGISTER_CALLBACK (serv, X_("/select/mute"), "i", sel_mute); + REGISTER_CALLBACK (serv, X_("/select/solo"), "i", sel_solo); + REGISTER_CALLBACK (serv, X_("/select/solo_iso"), "i", sel_solo_iso); + REGISTER_CALLBACK (serv, X_("/select/solo_safe"), "i", sel_solo_safe); + REGISTER_CALLBACK (serv, X_("/select/monitor_input"), "i", sel_monitor_input); + REGISTER_CALLBACK (serv, X_("/select/monitor_disk"), "i", sel_monitor_disk); + REGISTER_CALLBACK (serv, X_("/select/polarity"), "i", sel_phase); + REGISTER_CALLBACK (serv, X_("/select/gain"), "f", sel_gain); + REGISTER_CALLBACK (serv, X_("/select/fader"), "f", sel_fader); + REGISTER_CALLBACK (serv, X_("/select/db_delta"), "f", sel_dB_delta); + REGISTER_CALLBACK (serv, X_("/select/trimdB"), "f", sel_trim); + REGISTER_CALLBACK (serv, X_("/select/hide"), "i", sel_hide); + REGISTER_CALLBACK (serv, X_("/select/pan_stereo_position"), "f", sel_pan_position); + REGISTER_CALLBACK (serv, X_("/select/pan_stereo_width"), "f", sel_pan_width); + REGISTER_CALLBACK (serv, X_("/select/send_gain"), "if", sel_sendgain); + REGISTER_CALLBACK (serv, X_("/select/send_fader"), "if", sel_sendfader); + REGISTER_CALLBACK (serv, X_("/select/send_enable"), "if", sel_sendenable); + REGISTER_CALLBACK (serv, X_("/select/master_send_enable"), "i", sel_master_send_enable); + REGISTER_CALLBACK (serv, X_("/select/send_page"), "f", sel_send_page); + REGISTER_CALLBACK (serv, X_("/select/plug_page"), "f", sel_plug_page); + REGISTER_CALLBACK (serv, X_("/select/plugin"), "f", sel_plugin); + REGISTER_CALLBACK (serv, X_("/select/plugin/activate"), "f", sel_plugin_activate); + REGISTER_CALLBACK (serv, X_("/select/expand"), "i", sel_expand); + REGISTER_CALLBACK (serv, X_("/select/pan_elevation_position"), "f", sel_pan_elevation); + REGISTER_CALLBACK (serv, X_("/select/pan_frontback_position"), "f", sel_pan_frontback); + REGISTER_CALLBACK (serv, X_("/select/pan_lfe_control"), "f", sel_pan_lfe); + REGISTER_CALLBACK (serv, X_("/select/comp_enable"), "f", sel_comp_enable); + REGISTER_CALLBACK (serv, X_("/select/comp_threshold"), "f", sel_comp_threshold); + REGISTER_CALLBACK (serv, X_("/select/comp_speed"), "f", sel_comp_speed); + REGISTER_CALLBACK (serv, X_("/select/comp_mode"), "f", sel_comp_mode); + REGISTER_CALLBACK (serv, X_("/select/comp_makeup"), "f", sel_comp_makeup); + REGISTER_CALLBACK (serv, X_("/select/eq_enable"), "f", sel_eq_enable); + REGISTER_CALLBACK (serv, X_("/select/eq_hpf/freq"), "f", sel_eq_hpf_freq); + REGISTER_CALLBACK (serv, X_("/select/eq_hpf/enable"), "f", sel_eq_hpf_enable); + REGISTER_CALLBACK (serv, X_("/select/eq_hpf/slope"), "f", sel_eq_hpf_slope); + REGISTER_CALLBACK (serv, X_("/select/eq_lpf/freq"), "f", sel_eq_lpf_freq); + REGISTER_CALLBACK (serv, X_("/select/eq_lpf/enable"), "f", sel_eq_lpf_enable); + REGISTER_CALLBACK (serv, X_("/select/eq_lpf/slope"), "f", sel_eq_lpf_slope); + REGISTER_CALLBACK (serv, X_("/select/eq_gain"), "if", sel_eq_gain); + REGISTER_CALLBACK (serv, X_("/select/eq_freq"), "if", sel_eq_freq); + REGISTER_CALLBACK (serv, X_("/select/eq_q"), "if", sel_eq_q); + REGISTER_CALLBACK (serv, X_("/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/solo", "ii", route_solo); - REGISTER_CALLBACK (serv, "/strip/solo_iso", "ii", route_solo_iso); - REGISTER_CALLBACK (serv, "/strip/solo_safe", "ii", route_solo_safe); - REGISTER_CALLBACK (serv, "/strip/recenable", "ii", route_recenable); - 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/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/trimdB", "if", route_set_trim_dB); - REGISTER_CALLBACK (serv, "/strip/pan_stereo_position", "if", route_set_pan_stereo_position); - REGISTER_CALLBACK (serv, "/strip/pan_stereo_width", "if", route_set_pan_stereo_width); - REGISTER_CALLBACK (serv, "/strip/plugin/parameter", "iiif", route_plugin_parameter); + REGISTER_CALLBACK (serv, X_("/strip/mute"), "ii", route_mute); + REGISTER_CALLBACK (serv, X_("/strip/solo"), "ii", route_solo); + REGISTER_CALLBACK (serv, X_("/strip/solo_iso"), "ii", route_solo_iso); + REGISTER_CALLBACK (serv, X_("/strip/solo_safe"), "ii", route_solo_safe); + REGISTER_CALLBACK (serv, X_("/strip/recenable"), "ii", route_recenable); + REGISTER_CALLBACK (serv, X_("/strip/record_safe"), "ii", route_recsafe); + REGISTER_CALLBACK (serv, X_("/strip/monitor_input"), "ii", route_monitor_input); + REGISTER_CALLBACK (serv, X_("/strip/monitor_disk"), "ii", route_monitor_disk); + REGISTER_CALLBACK (serv, X_("/strip/expand"), "ii", strip_expand); + REGISTER_CALLBACK (serv, X_("/strip/hide"), "ii", strip_hide); + REGISTER_CALLBACK (serv, X_("/strip/select"), "ii", strip_gui_select); + REGISTER_CALLBACK (serv, X_("/strip/polarity"), "ii", strip_phase); + REGISTER_CALLBACK (serv, X_("/strip/gain"), "if", route_set_gain_dB); + REGISTER_CALLBACK (serv, X_("/strip/fader"), "if", route_set_gain_fader); + REGISTER_CALLBACK (serv, X_("/strip/trimdB"), "if", route_set_trim_dB); + REGISTER_CALLBACK (serv, X_("/strip/pan_stereo_position"), "if", route_set_pan_stereo_position); + REGISTER_CALLBACK (serv, X_("/strip/pan_stereo_width"), "if", route_set_pan_stereo_width); + REGISTER_CALLBACK (serv, X_("/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/plugin/activate", "ii", route_plugin_activate); - REGISTER_CALLBACK (serv, "/strip/plugin/deactivate", "ii", route_plugin_deactivate); - 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); - REGISTER_CALLBACK(serv, "/strip/name", "is", route_rename); - REGISTER_CALLBACK(serv, "/strip/sends", "i", route_get_sends); - REGISTER_CALLBACK(serv, "/strip/receives", "i", route_get_receives); - REGISTER_CALLBACK(serv, "/strip/plugin/list", "i", route_plugin_list); - REGISTER_CALLBACK(serv, "/strip/plugin/descriptor", "ii", route_plugin_descriptor); - REGISTER_CALLBACK(serv, "/strip/plugin/reset", "ii", route_plugin_reset); + REGISTER_CALLBACK (serv, X_("/strip/plugin/parameter/print"), "iii", route_plugin_parameter_print); + REGISTER_CALLBACK (serv, X_("/strip/plugin/activate"), "ii", route_plugin_activate); + REGISTER_CALLBACK (serv, X_("/strip/plugin/deactivate"), "ii", route_plugin_deactivate); + REGISTER_CALLBACK (serv, X_("/strip/send/gain"), "iif", route_set_send_gain_dB); + REGISTER_CALLBACK (serv, X_("/strip/send/fader"), "iif", route_set_send_fader); + REGISTER_CALLBACK (serv, X_("/strip/send/enable"), "iif", route_set_send_enable); + REGISTER_CALLBACK (serv, X_("/strip/name"), "is", route_rename); + REGISTER_CALLBACK (serv, X_("/strip/group"), "is", strip_group); + REGISTER_CALLBACK (serv, X_("/strip/sends"), "i", route_get_sends); + REGISTER_CALLBACK (serv, X_("/strip/receives"), "i", route_get_receives); + REGISTER_CALLBACK (serv, X_("/strip/plugin/list"), "i", route_plugin_list); + REGISTER_CALLBACK (serv, X_("/strip/plugin/descriptor"), "ii", route_plugin_descriptor); + REGISTER_CALLBACK (serv, X_("/strip/plugin/reset"), "ii", route_plugin_reset); /* still not-really-standardized query interface */ //REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value); @@ -633,7 +660,7 @@ OSC::register_callbacks() /* this is a special catchall handler, * register at the end so this is only called if no - * other handler matches (used for debug) */ + * other handler matches (also used for debug) */ lo_server_add_method (serv, 0, 0, _catchall, this); } } @@ -688,99 +715,6 @@ OSC::gui_changed () session->set_dirty(); } -void -OSC::listen_to_route (boost::shared_ptr strip, lo_address addr) -{ - if (!strip) { - return; - } - /* avoid duplicate listens */ - - for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); ++x) { - - OSCRouteObserver* ro; - - if ((ro = dynamic_cast(*x)) != 0) { - - int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr)); - - if (ro->strip() == strip && res == 0) { - return; - } - } - } - - OSCSurface *s = get_surface(addr); - uint32_t ssid = get_sid (strip, addr); - OSCRouteObserver* o = new OSCRouteObserver (strip, addr, ssid, s); - route_observers.push_back (o); - - strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::route_lost, this, boost::weak_ptr (strip)), this); -} - -void -OSC::route_lost (boost::weak_ptr wr) -{ - tick = false; - drop_route (wr); - bank_dirty = true; -} - -void -OSC::drop_route (boost::weak_ptr wr) -{ - boost::shared_ptr r = wr.lock (); - - if (!r) { - return; - } - - for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) { - - OSCRouteObserver* rc; - - if ((rc = dynamic_cast(*x)) != 0) { - - if (rc->strip() == r) { - delete *x; - x = route_observers.erase (x); - } else { - ++x; - } - } else { - ++x; - } - } -} - -void -OSC::end_listen (boost::shared_ptr r, lo_address addr) -{ - RouteObservers::iterator x; - - // Remove the route observers - for (x = route_observers.begin(); x != route_observers.end();) { - - OSCRouteObserver* ro; - - if ((ro = dynamic_cast(*x)) != 0) { - - int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr)); - - if (ro->strip() == r && res == 0) { - delete *x; - x = route_observers.erase (x); - } - else { - ++x; - } - } - else { - ++x; - } - } -} - void OSC::current_value_query (const char* path, size_t len, lo_arg **argv, int argc, lo_message msg) { @@ -818,7 +752,7 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m lo_message_add_string (reply, "not found"); } else { - if (strcmp (path, "/strip/state") == 0) { + if (strcmp (path, X_("/strip/state")) == 0) { if (boost::dynamic_pointer_cast(r)) { lo_message_add_string (reply, "AT"); @@ -834,11 +768,11 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m lo_message_add_int32 (reply, r->muted()); lo_message_add_int32 (reply, r->soloed()); - } else if (strcmp (path, "/strip/mute") == 0) { + } else if (strcmp (path, X_("/strip/mute")) == 0) { lo_message_add_int32 (reply, (float) r->muted()); - } else if (strcmp (path, "/strip/solo") == 0) { + } else if (strcmp (path, X_("/strip/solo")) == 0) { lo_message_add_int32 (reply, r->soloed()); } @@ -847,9 +781,9 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m OSCSurface *sur = get_surface(get_address (msg)); if (sur->feedback[14]) { - lo_send_message (get_address (msg), "/reply", reply); + lo_send_message (get_address (msg), X_("/reply"), reply); } else { - lo_send_message (get_address (msg), "#reply", reply); + lo_send_message (get_address (msg), X_("#reply"), reply); } lo_message_free (reply); } @@ -872,32 +806,41 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ /* 15 for /#current_value plus 2 for / */ len = strlen (path); - OSCSurface *sur = get_surface(get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg), true); + LinkSet *set; + uint32_t ls = sur->linkset; - if (strstr (path, "/automation")) { + if (ls) { + set = &(link_sets[ls]); + sur->custom_mode = set->custom_mode; + sur->custom_strips = set->custom_strips; + sur->temp_strips = set->temp_strips; + } + + if (strstr (path, X_("/automation"))) { ret = set_automation (path, types, argv, argc, msg); } else - if (strstr (path, "/touch")) { + if (strstr (path, X_("/touch"))) { ret = touch_detect (path, types, argv, argc, msg); } else - if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) { + if (len >= 17 && !strcmp (&path[len-15], X_("/#current_value"))) { current_value_query (path, len, argv, argc, msg); ret = 0; } else - if (!strncmp (path, "/cue/", 5)) { + if (!strncmp (path, X_("/cue/"), 5)) { ret = cue_parse (path, types, argv, argc, msg); } else - if (!strncmp (path, "/select/plugin/parameter", 24)) { + if (!strncmp (path, X_("/select/plugin/parameter"), 24)) { ret = select_plugin_parameter (path, types, argv, argc, msg); } else - if (!strncmp (path, "/access_action/", 15)) { + if (!strncmp (path, X_("/access_action/"), 15)) { check_surface (msg); if (!(argc && !argv[0]->i)) { std::string action_path = path; @@ -907,67 +850,69 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ ret = 0; } else - if (strcmp (path, "/strip/listen") == 0) { - check_surface (msg); - - cerr << "set up listener\n"; - - lo_message reply = lo_message_new (); - + if (strcmp (path, X_("/strip/listen")) == 0) { if (argc <= 0) { - lo_message_add_string (reply, "syntax error"); + PBD::warning << "OSC: Wrong number of parameters." << endmsg; + } else if (sur->custom_mode) { + PBD::warning << "OSC: Can't add strips with custom enabled." << endmsg; } else { for (int n = 0; n < argc; ++n) { - - boost::shared_ptr r = session->get_remote_nth_route (argv[n]->i); - - if (!r) { - lo_message_add_string (reply, "not found"); - cerr << "no such route\n"; - break; - } else { - cerr << "add listener\n"; - listen_to_route (r, get_address (msg)); - lo_message_add_int32 (reply, argv[n]->i); + boost::shared_ptr s = boost::shared_ptr(); + if (types[n] == 'f') { + s = get_strip ((uint32_t) argv[n]->f, get_address (msg)); + } else if (types[n] == 'i') { + s = get_strip (argv[n]->i, get_address (msg)); + } + if (s) { + sur->custom_strips.push_back (s); } } + if (ls) { + set->custom_strips = sur->custom_strips; + } } - - if (sur->feedback[14]) { - lo_send_message (get_address (msg), "/reply", reply); - } else { - lo_send_message (get_address (msg), "#reply", reply); - } - lo_message_free (reply); - ret = 0; - } else - if (strcmp (path, "/strip/ignore") == 0) { - check_surface (msg); - - for (int n = 0; n < argc; ++n) { - - boost::shared_ptr r = session->get_remote_nth_route (argv[n]->i); - - if (r) { - end_listen (r, get_address (msg)); + if (strcmp (path, X_("/strip/ignore")) == 0) { + if (argc <= 0) { + PBD::warning << "OSC: Wrong number of parameters." << endmsg; + } else if (!sur->custom_mode) { + PBD::warning << "OSC: Can't remove strips without custom enabled." << endmsg; + } else { + for (int n = 0; n < argc; ++n) { + uint32_t st_no = 0; + if (types[n] == 'f') { + st_no = (uint32_t) argv[n]->f; + } else if (types[n] == 'i') { + st_no = (uint32_t) argv[n]->i; + } + if (st_no && st_no <= sur->custom_strips.size ()) { + sur->custom_strips[argv[n]->i - 1] = boost::shared_ptr(); + } + } + if (ls) { + set->custom_strips = sur->custom_strips; } + ret = set_bank (sur->bank, msg); } ret = 0; } else - if (!strncmp (path, "/strip/gain/", 12) && strlen (path) > 12) { + if (strstr (path, X_("/strip")) && (argc != 1)) { + // All of the strip commands below require 1 parameter + PBD::warning << "OSC: Wrong number of parameters." << endmsg; + } else + if (!strncmp (path, X_("/strip/gain/"), 12) && strlen (path) > 12) { // in dB int ssid = atoi (&path[12]); ret = route_set_gain_dB (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/strip/fader/", 13) && strlen (path) > 13) { + else if (!strncmp (path, X_("/strip/fader/"), 13) && strlen (path) > 13) { // in fader position int ssid = atoi (&path[13]); ret = route_set_gain_fader (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/strip/db_delta", 15)) { + else if (!strncmp (path, X_("/strip/db_delta"), 15)) { // in db delta int ssid; int ar_off = 0; @@ -991,77 +936,94 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ } ret = strip_db_delta (ssid, delta, msg); } - else if (!strncmp (path, "/strip/trimdB/", 14) && strlen (path) > 14) { + else if (!strncmp (path, X_("/strip/trimdB/"), 14) && strlen (path) > 14) { int ssid = atoi (&path[14]); ret = route_set_trim_dB (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/strip/pan_stereo_position/", 27) && strlen (path) > 27) { + else if (!strncmp (path, X_("/strip/pan_stereo_position/"), 27) && strlen (path) > 27) { int ssid = atoi (&path[27]); ret = route_set_pan_stereo_position (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/strip/mute/", 12) && strlen (path) > 12) { + else if (!strncmp (path, X_("/strip/mute/"), 12) && strlen (path) > 12) { int ssid = atoi (&path[12]); ret = route_mute (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/solo/", 12) && strlen (path) > 12) { + else if (!strncmp (path, X_("/strip/solo/"), 12) && strlen (path) > 12) { int ssid = atoi (&path[12]); ret = route_solo (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/monitor_input/", 21) && strlen (path) > 21) { + else if (!strncmp (path, X_("/strip/monitor_input/"), 21) && strlen (path) > 21) { int ssid = atoi (&path[21]); ret = route_monitor_input (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/monitor_disk/", 20) && strlen (path) > 20) { + else if (!strncmp (path, X_("/strip/monitor_disk/"), 20) && strlen (path) > 20) { int ssid = atoi (&path[20]); ret = route_monitor_disk (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/recenable/", 17) && strlen (path) > 17) { + else if (!strncmp (path, X_("/strip/recenable/"), 17) && strlen (path) > 17) { int ssid = atoi (&path[17]); ret = route_recenable (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/record_safe/", 19) && strlen (path) > 19) { + else if (!strncmp (path, X_("/strip/record_safe/"), 19) && strlen (path) > 19) { int ssid = atoi (&path[19]); ret = route_recsafe (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/expand/", 14) && strlen (path) > 14) { + else if (!strncmp (path, X_("/strip/expand/"), 14) && strlen (path) > 14) { int ssid = atoi (&path[14]); ret = strip_expand (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) { + else if (!strncmp (path, X_("/strip/hide/"), 12) && strlen (path) > 12) { + int ssid = atoi (&path[12]); + ret = strip_hide (ssid, argv[0]->i, msg); + } + else if (!strncmp (path, X_("/strip/select/"), 14) && strlen (path) > 14) { int ssid = atoi (&path[14]); ret = strip_gui_select (ssid, argv[0]->i, msg); } - else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) { + else if (strstr (path, X_("/select/group"))) { + ret = parse_sel_group (path, types, argv, argc, msg); + } + else if (strstr (path, X_("/select")) && (argc != 1)) { + // All of the select commands below require 1 parameter + PBD::warning << "OSC: Wrong number of parameters." << endmsg; + } + else if (!strncmp (path, X_("/select/send_gain/"), 18) && strlen (path) > 18) { int ssid = atoi (&path[18]); ret = sel_sendgain (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) { + else if (!strncmp (path, X_("/select/send_fader/"), 19) && strlen (path) > 19) { int ssid = atoi (&path[19]); ret = sel_sendfader (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/select/send_enable/", 20) && strlen (path) > 20) { + else if (!strncmp (path, X_("/select/send_enable/"), 20) && strlen (path) > 20) { int ssid = atoi (&path[20]); ret = sel_sendenable (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/select/eq_gain/", 16) && strlen (path) > 16) { + else if (!strncmp (path, X_("/select/eq_gain/"), 16) && strlen (path) > 16) { int ssid = atoi (&path[16]); ret = sel_eq_gain (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/select/eq_freq/", 16) && strlen (path) > 16) { + else if (!strncmp (path, X_("/select/eq_freq/"), 16) && strlen (path) > 16) { int ssid = atoi (&path[16]); ret = sel_eq_freq (ssid, argv[0]->f , msg); } - else if (!strncmp (path, "/select/eq_q/", 13) && strlen (path) > 13) { + else if (!strncmp (path, X_("/select/eq_q/"), 13) && strlen (path) > 13) { int ssid = atoi (&path[13]); ret = sel_eq_q (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/select/eq_shape/", 17) && strlen (path) > 17) { + else if (!strncmp (path, X_("/select/eq_shape/"), 17) && strlen (path) > 17) { int ssid = atoi (&path[17]); ret = sel_eq_shape (ssid, argv[0]->f, msg); } - else if (!strncmp (path, "/set_surface", 12)) { + else if (!strncmp (path, X_("/marker"), 7)) { + ret = set_marker (types, argv, argc, msg); + } + else if (!strncmp (path, X_("/set_surface"), 12)) { ret = surface_parse (path, types, argv, argc, msg); } + else if (strstr (path, X_("/link"))) { + ret = parse_link (path, types, argv, argc, msg); + } if (ret) { check_surface (msg); } @@ -1145,7 +1107,7 @@ void OSC::session_exported (std::string path, std::string name) { lo_address listener = lo_address_new (NULL, "7770"); - lo_send (listener, "/session/exported", "ss", path.c_str(), name.c_str()); + lo_send (listener, X_("/session/exported"), "ss", path.c_str(), name.c_str()); lo_address_free (listener); } @@ -1169,40 +1131,40 @@ OSC::current_value (const char */*path*/, const char */*types*/, lo_arg **/*argv const char *retpath = argv[2]->s; - if (strcmp (argv[0]->s, "transport_frame") == 0) { + if (strcmp (argv[0]->s, X_("transport_frame")) == 0) { if (session) { - lo_send (addr, retpath, "i", session->transport_frame()); + lo_send (addr, retpath, "i", session->transport_sample()); } - } else if (strcmp (argv[0]->s, "transport_speed") == 0) { + } else if (strcmp (argv[0]->s, X_("transport_speed")) == 0) { if (session) { - lo_send (addr, retpath, "i", session->transport_frame()); + lo_send (addr, retpath, "i", session->transport_sample()); } - } else if (strcmp (argv[0]->s, "transport_locked") == 0) { + } else if (strcmp (argv[0]->s, X_("transport_locked")) == 0) { if (session) { - lo_send (addr, retpath, "i", session->transport_frame()); + lo_send (addr, retpath, "i", session->transport_sample()); } - } else if (strcmp (argv[0]->s, "punch_in") == 0) { + } else if (strcmp (argv[0]->s, X_("punch_in")) == 0) { if (session) { - lo_send (addr, retpath, "i", session->transport_frame()); + lo_send (addr, retpath, "i", session->transport_sample()); } - } else if (strcmp (argv[0]->s, "punch_out") == 0) { + } else if (strcmp (argv[0]->s, X_("punch_out")) == 0) { if (session) { - lo_send (addr, retpath, "i", session->transport_frame()); + lo_send (addr, retpath, "i", session->transport_sample()); } - } else if (strcmp (argv[0]->s, "rec_enable") == 0) { + } else if (strcmp (argv[0]->s, X_("rec_enable")) == 0) { if (session) { - lo_send (addr, retpath, "i", session->transport_frame()); + lo_send (addr, retpath, "i", session->transport_sample()); } } else { @@ -1219,8 +1181,7 @@ OSC::routes_list (lo_message msg) if (!session) { return; } - OSCSurface *sur = get_surface(get_address (msg)); - sur->no_clear = true; + OSCSurface *sur = get_surface(get_address (msg), true); for (int n = 0; n < (int) sur->nstrips; ++n) { @@ -1232,23 +1193,29 @@ OSC::routes_list (lo_message msg) lo_message reply = lo_message_new (); - if (s->presentation_info().flags() & PresentationInfo::AudioTrack) { + if (boost::dynamic_pointer_cast(s)) { lo_message_add_string (reply, "AT"); - } else if (s->presentation_info().flags() & PresentationInfo::MidiTrack) { + } else if (boost::dynamic_pointer_cast(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 if (boost::dynamic_pointer_cast(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(s) && !boost::dynamic_pointer_cast(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 { - // this is an Aux out - lo_message_add_string (reply, "AX"); + lo_message_add_string (reply, "MB"); } - } else if (s->presentation_info().flags() & PresentationInfo::MidiBus) { - lo_message_add_string (reply, "MB"); - } else if (s->presentation_info().flags() & PresentationInfo::VCA) { - lo_message_add_string (reply, "V"); } lo_message_add_string (reply, s->name().c_str()); @@ -1275,14 +1242,10 @@ OSC::routes_list (lo_message msg) if (s->rec_enable_control()) { lo_message_add_int32 (reply, s->rec_enable_control()->get_value()); } - - //Automatically listen to stripables listed - listen_to_route(s, get_address (msg)); - if (sur->feedback[14]) { - lo_send_message (get_address (msg), "/reply", reply); + lo_send_message (get_address (msg), X_("/reply"), reply); } else { - lo_send_message (get_address (msg), "#reply", reply); + lo_send_message (get_address (msg), X_("#reply"), reply); } lo_message_free (reply); } @@ -1291,9 +1254,9 @@ OSC::routes_list (lo_message msg) // Send end of listing message lo_message reply = lo_message_new (); - lo_message_add_string (reply, "end_route_list"); - lo_message_add_int64 (reply, session->frame_rate()); - lo_message_add_int64 (reply, session->current_end_frame()); + lo_message_add_string (reply, X_("end_route_list")); + lo_message_add_int64 (reply, session->sample_rate()); + lo_message_add_int64 (reply, session->current_end_sample()); if (session->monitor_out()) { // this session has a monitor section lo_message_add_int32 (reply, 1); @@ -1302,12 +1265,149 @@ OSC::routes_list (lo_message msg) } if (sur->feedback[14]) { - lo_send_message (get_address (msg), "/reply", reply); + lo_send_message (get_address (msg), X_("/reply"), reply); } else { - lo_send_message (get_address (msg), "#reply", reply); + lo_send_message (get_address (msg), X_("#reply"), reply); } lo_message_free (reply); + // send feedback for newly created control surface + strip_feedback (sur, true); + global_feedback (sur); + _strip_select (boost::shared_ptr(), get_address (msg)); + +} + +void +OSC::surface_list (lo_message msg) +{ + get_surfaces (); +} + +void +OSC::get_surfaces () +{ + + /* this function is for debugging and prints lots of + * information about what surfaces Ardour knows about and their + * internal parameters. It is best accessed by sending: + * /surface/list from oscsend. This command does not create + * a surface entry. + */ + + PBD::info << string_compose ("\nList of known Surfaces (%1):\n", _surface.size()); + + Glib::Threads::Mutex::Lock lm (surfaces_lock); + for (uint32_t it = 0; it < _surface.size(); it++) { + OSCSurface* sur = &_surface[it]; + char *chost = lo_url_get_hostname (sur->remote_url.c_str()); + string host = chost; + free (chost); + string port = get_port (host); + if (port != "auto") { + port = "Manual port"; + } else { + port = "Auto port"; + } + PBD::info << string_compose ("\n Surface: %1 - URL: %2 %3\n", it, sur->remote_url, port); + PBD::info << string_compose (" Number of strips: %1 Bank size: %2 Current Bank %3\n", sur->nstrips, sur->bank_size, sur->bank); + PBD::info << string_compose (" Use Custom: %1 Custom Strips: %2\n", sur->custom_mode, sur->custom_strips.size ()); + bool ug = false; + if (sur->usegroup == PBD::Controllable::UseGroup) { + ug = true; + } + PBD::info << string_compose (" Strip Types: %1 Feedback: %2 No_clear flag: %3 Gain mode: %4 Use groups flag %5\n", \ + sur->strip_types.to_ulong(), sur->feedback.to_ulong(), sur->no_clear, sur->gainmode, ug); + PBD::info << string_compose (" Using plugin: %1 of %2 plugins, with %3 params. Page size: %4 Page: %5\n", \ + sur->plugin_id, sur->plugins.size(), sur->plug_params.size(), sur->plug_page_size, sur->plug_page); + PBD::info << string_compose (" Send page size: %1 Page: %2\n", sur->send_page_size, sur->send_page); + PBD::info << string_compose (" Expanded flag %1 Track: %2 Jogmode: %3\n", sur->expand_enable, sur->expand, sur->jogmode); + PBD::info << string_compose (" Personal monitor flag %1, Aux master: %2, Number of sends: %3\n", sur->cue, sur->aux, sur->sends.size()); + PBD::info << string_compose (" Linkset: %1 Device Id: %2\n", sur->linkset, sur->linkid); + } + PBD::info << string_compose ("\nList of LinkSets (%1):\n", link_sets.size()); + std::map::iterator it; + for (it = link_sets.begin(); it != link_sets.end(); it++) { + if (!(*it).first) { + continue; + } + uint32_t devices = 0; + LinkSet* set = &(*it).second; + if (set->urls.size()) { + devices = set->urls.size() - 1; + } + PBD::info << string_compose ("\n Linkset %1 has %2 devices and sees %3 strips\n", (*it).first, devices, set->strips.size()); + PBD::info << string_compose (" Bank size: %1 Current bank: %2 Strip Types: %3\n", set->banksize, set->bank, set->strip_types.to_ulong()); + PBD::info << string_compose (" Auto bank sizing: %1 Linkset not ready flag: %2\n", set->autobank, set->not_ready); + PBD::info << string_compose (" Use Custom: %1 Number of Custom Strips: %2\n", set->custom_mode, set->custom_strips.size ()); + } + PBD::info << endmsg; +} + +int +OSC::custom_clear (lo_message msg) +{ + if (!session) { + return 0; + } + OSCSurface *sur = get_surface(get_address (msg), true); + sur->custom_mode = 0; + sur->custom_strips.clear (); + sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, false, sur->custom_strips); + sur->nstrips = sur->strips.size(); + LinkSet *set; + uint32_t ls = sur->linkset; + if (ls) { + set = &(link_sets[ls]); + set->custom_mode = 0; + set->custom_strips.clear (); + set->strips = sur->strips; + } + return set_bank (1, msg); +} + +int +OSC::custom_mode (float state, lo_message msg) +{ + if (!session) { + return 0; + } + OSCSurface *sur = get_surface(get_address (msg), true); + LinkSet *set; + uint32_t ls = sur->linkset; + + if (ls) { + set = &(link_sets[ls]); + sur->custom_mode = set->custom_mode; + sur->custom_strips = set->custom_strips; + } + if (state > 0){ + if (sur->custom_strips.size () == 0) { + PBD::warning << "No custom strips set to enable" << endmsg; + sur->custom_mode = 0; + if (ls) { + set->custom_mode = 0; + } + return -1; + } else { + if (sur->bank_size) { + sur->custom_mode = (uint32_t) state | 0x4; + } else { + sur->custom_mode = (uint32_t) state; + } + sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, sur->custom_mode, sur->custom_strips); + sur->nstrips = sur->custom_strips.size(); + } + } else { + sur->custom_mode = 0; + sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 0, sur->custom_strips); + sur->nstrips = sur->strips.size(); + } + if (ls) { + set->custom_mode = sur->custom_mode; + set->strips = sur->strips; + } + return set_bank (1, msg); } int @@ -1320,135 +1420,377 @@ OSC::cancel_all_solos () lo_address OSC::get_address (lo_message msg) { + lo_address addr = lo_message_get_source (msg); + string host = lo_address_get_hostname (addr); + string port = lo_address_get_port (addr); + int protocol = lo_address_get_protocol (addr); + string saved_port = get_port (host); + if (saved_port != "") { + if (saved_port != "auto") { + port = saved_port; + return lo_address_new_with_proto (protocol, host.c_str(), port.c_str()); + } else { + return lo_message_get_source (msg); + } + } + + // if we get here we need to add a new entry for this surface + PortAdd new_port; + new_port.host = host; 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); + new_port.port = remote_port; + _ports.push_back (new_port); return lo_address_new_with_proto (protocol, host.c_str(), remote_port.c_str()); } else { + new_port.port = "auto"; + _ports.push_back (new_port); return lo_message_get_source (msg); } } +string +OSC::get_port (string host) +{ + for (uint32_t i = 0; i < _ports.size (); i++) { + if (_ports[i].host == host) { + return _ports[i].port; + } + } + return ""; +} + int OSC::refresh_surface (lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + OSCSurface *s = get_surface(get_address (msg), true); + uint32_t bs = s->bank_size; + uint32_t st = (uint32_t) s->strip_types.to_ulong(); + uint32_t fb = (uint32_t) s->feedback.to_ulong(); + uint32_t gm = (uint32_t) s->gainmode; + uint32_t sp = s->send_page_size; + uint32_t pp = s->plug_page_size; + + surface_destroy (s); // 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, (uint32_t) s->send_page_size, (uint32_t) s->plug_page_size, msg); + set_surface (bs, st, fb, gm, sp, pp, msg); return 0; } void OSC::clear_devices () { - for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) { - - OSCRouteObserver* rc; - - if ((rc = dynamic_cast(*x)) != 0) { - delete *x; - x = route_observers.erase (x); - } else { - ++x; - } - // slow devices need time to clear buffers - usleep ((uint32_t) 10); - } - // Should maybe do global_observers too - for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) { - - OSCGlobalObserver* gc; - - if ((gc = dynamic_cast(*x)) != 0) { - delete *x; - x = global_observers.erase (x); - } else { - ++x; - } - } - // delete select observers + tick = false; + observer_busy = true; + session_connections.drop_connections (); + // clear out surfaces for (uint32_t it = 0; it < _surface.size(); ++it) { OSCSurface* sur = &_surface[it]; - OSCSelectObserver* so; - if ((so = dynamic_cast(sur->sel_obs)) != 0) { - delete so; - } - } - // delete cue observers - for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end();) { - OSCCueObserver* co; - if ((co = dynamic_cast(*x)) != 0) { - delete *x; - x = cue_observers.erase (x); - } else { - ++x; - } + surface_destroy (sur); } - - // clear out surfaces _surface.clear(); + link_sets.clear (); + _ports.clear (); + + PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); + + observer_busy = false; + tick = true; } int -OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) +OSC::parse_link (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) { int ret = 1; /* unhandled */ - OSCSurface *sur = get_surface(get_address (msg)); - int pi_page = sur->plug_page_size; - int se_page = sur->send_page_size; - int fadermode = sur->gainmode; - int feedback = sur->feedback.to_ulong(); - int strip_types = sur->strip_types.to_ulong(); - int bank_size = sur->bank_size; - - - if (!strncmp (path, "/set_surface/feedback", 21)) { - if (types[0] == 'f') { - ret = set_surface_feedback ((int)argv[0]->f, msg); - } else { - ret = set_surface_feedback (argv[0]->i, msg); - } + int set = 0; + if (!argc) { + PBD::warning << "OSC: /link/* needs at least one parameter" << endmsg; + return ret; } - else if (!strncmp (path, "/set_surface/bank_size", 22)) { - if (types[0] == 'f') { - ret = set_surface_bank_size ((int)argv[0]->f, msg); - } else { - ret = set_surface_bank_size (argv[0]->i, msg); - } + float data = 0; + if (types[argc - 1] == 'f') { + data = argv[argc - 1]->f; + } else { + data = argv[argc - 1]->i; } - else if (!strncmp (path, "/set_surface/gainmode", 21)) { + if (isdigit(strrchr (path, '/')[1])) { + set = atoi (&(strrchr (path, '/')[1])); + } else if (argc == 2) { if (types[0] == 'f') { - ret = set_surface_gainmode ((int)argv[0]->f, msg); + set = (int) argv[0]->f; } else { - ret = set_surface_gainmode (argv[0]->i, msg); + set = argv[0]->i; } + } else { + PBD::warning << "OSC: wrong number of parameters." << endmsg; + return ret; } - else if (!strncmp (path, "/set_surface/strip_types", 24)) { - if (types[0] == 'f') { - ret = set_surface_strip_types ((int)argv[0]->f, msg); + LinkSet *ls = get_linkset (set, get_address (msg)); + + if (!set) { + return 0; + } + if (!strncmp (path, X_("/link/bank_size"), 15)) { + ls->banksize = (uint32_t) data; + ls->autobank = false; + ls->not_ready = link_check (set); + if (ls->not_ready) { + ls->bank = 1; + surface_link_state (ls); } else { - ret = set_surface_strip_types (argv[0]->i, msg); + _set_bank (ls->bank, get_address (msg)); } + ret = 0; + + } else if (!strncmp (path, X_("/link/set"), 9)) { + ret = set_link (set, (uint32_t) data, get_address (msg)); } - else if (!strncmp (path, "/set_surface/send_page_size", 27)) { + + return ret; +} + +OSC::LinkSet * +OSC::get_linkset (uint32_t set, lo_address addr) +{ + OSCSurface *sur = get_surface(addr); + LinkSet *ls = 0; + + if (set) { + // need to check if set is wanted + std::map::iterator it; + it = link_sets.find(set); + if (it == link_sets.end()) { + // no such linkset make it + LinkSet new_ls; + new_ls.banksize = 0; + new_ls.bank = 1; + new_ls.autobank = true; + new_ls.not_ready = true; + new_ls.strip_types = sur->strip_types; + new_ls.strips = sur->strips; + new_ls.custom_strips = sur->custom_strips; + new_ls.custom_mode = sur->custom_mode; + new_ls.urls.resize (2); + link_sets[set] = new_ls; + } + ls = &link_sets[set]; + + } else { + // User expects this surface to be removed from any sets + uint32_t oldset = sur->linkset; + if (oldset) { + uint32_t oldid = sur->linkid; + sur->linkid = 1; + sur->linkset = 0; + LinkSet *ols = &link_sets[oldset]; + if (ols) { + ols->not_ready = oldid; + ols->urls[oldid] = ""; + surface_link_state (ols); + } + } + } + return ls; +} + +int +OSC::set_link (uint32_t set, uint32_t id, lo_address addr) +{ + OSCSurface *sur = get_surface(addr, true); + sur->linkset = set; + sur->linkid = id; + LinkSet *ls = get_linkset (set, addr); + if (ls->urls.size() <= (uint32_t) id) { + ls->urls.resize ((int) id + 1); + } + ls->urls[(uint32_t) id] = sur->remote_url; + ls->not_ready = link_check (set); + if (ls->not_ready) { + surface_link_state (ls); + } else { + _set_bank (1, addr); + } + return 0; +} + +void +OSC::link_strip_types (uint32_t linkset, uint32_t striptypes) +{ + LinkSet *ls = 0; + + if (!linkset) { + return; + } + std::map::iterator it; + it = link_sets.find(linkset); + if (it == link_sets.end()) { + // this should never happen... but + return; + } + ls = &link_sets[linkset]; + ls->strip_types = striptypes; + for (uint32_t dv = 1; dv < ls->urls.size(); dv++) { + OSCSurface *su; + + if (ls->urls[dv] != "") { + string url = ls->urls[dv]; + su = get_surface (lo_address_new_from_url (url.c_str()), true); + if (su->linkset == linkset) { + su->strip_types = striptypes; + if (su->strip_types[10]) { + su->usegroup = PBD::Controllable::UseGroup; + } else { + su->usegroup = PBD::Controllable::NoGroup; + } + } else { + ls->urls[dv] = ""; + } + } + } +} + +void +OSC::surface_link_state (LinkSet * set) +{ + for (uint32_t dv = 1; dv < set->urls.size(); dv++) { + + if (set->urls[dv] != "") { + string url = set->urls[dv]; + OSCSurface *sur = get_surface (lo_address_new_from_url (url.c_str()), true); + for (uint32_t i = 0; i < sur->observers.size(); i++) { + sur->observers[i]->set_link_ready (set->not_ready); + } + } + } +} + +int +OSC::link_check (uint32_t set) +{ + LinkSet *ls = 0; + + if (!set) { + return 1; + } + std::map::iterator it; + it = link_sets.find(set); + if (it == link_sets.end()) { + // this should never happen... but + return 1; + } + ls = &link_sets[set]; + uint32_t bank_total = 0; + for (uint32_t dv = 1; dv < ls->urls.size(); dv++) { + OSCSurface *su; + + if (ls->urls[dv] != "") { + string url = ls->urls[dv]; + su = get_surface (lo_address_new_from_url (url.c_str()), true); + } else { + return dv; + } + if (su->linkset == set) { + bank_total = bank_total + su->bank_size; + } else { + ls->urls[dv] = ""; + return dv; + } + if (ls->autobank) { + ls->banksize = bank_total; + } else { + if (bank_total != ls->banksize) { + return ls->urls.size(); + } + } + } + return 0; +} + +int +OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) +{ + int ret = 1; /* unhandled */ + OSCSurface *sur = get_surface(get_address (msg), true); + int pi_page = sur->plug_page_size; + int se_page = sur->send_page_size; + int fadermode = sur->gainmode; + int feedback = sur->feedback.to_ulong(); + int strip_types = sur->strip_types.to_ulong(); + int bank_size = sur->bank_size; + int linkset = sur->linkset; + int linkid = sur->linkid; + string host = lo_url_get_hostname(sur->remote_url.c_str()); + int port = atoi (get_port (host).c_str()); + + if (argc == 1 && !strncmp (path, X_("/set_surface/feedback"), 21)) { + if (types[0] == 'f') { + ret = set_surface_feedback ((int)argv[0]->f, msg); + } else { + ret = set_surface_feedback (argv[0]->i, msg); + } + } + else if (argc == 1 && !strncmp (path, X_("/set_surface/bank_size"), 22)) { + if (types[0] == 'f') { + ret = set_surface_bank_size ((int)argv[0]->f, msg); + } else { + ret = set_surface_bank_size (argv[0]->i, msg); + } + } + else if (argc == 1 && !strncmp (path, X_("/set_surface/gainmode"), 21)) { + if (types[0] == 'f') { + ret = set_surface_gainmode ((int)argv[0]->f, msg); + } else { + ret = set_surface_gainmode (argv[0]->i, msg); + } + } + else if (argc == 1 && !strncmp (path, X_("/set_surface/strip_types"), 24)) { + if (types[0] == 'f') { + ret = set_surface_strip_types ((int)argv[0]->f, msg); + } else { + ret = set_surface_strip_types (argv[0]->i, msg); + } + } + else if (argc == 1 && !strncmp (path, X_("/set_surface/send_page_size"), 27)) { if (types[0] == 'f') { ret = sel_send_pagesize ((int)argv[0]->f, msg); } else { ret = sel_send_pagesize (argv[0]->i, msg); } } - else if (!strncmp (path, "/set_surface/plugin_page_size", 29)) { + else if (argc == 1 && !strncmp (path, X_("/set_surface/plugin_page_size"), 29)) { if (types[0] == 'f') { ret = sel_plug_pagesize ((int)argv[0]->f, msg); } else { ret = sel_plug_pagesize (argv[0]->i, msg); } + } + else if (argc == 1 && !strncmp (path, X_("/set_surface/port"), 17)) { + if (types[0] == 'f') { + ret = set_surface_port ((int)argv[0]->f, msg); + } else { + ret = set_surface_port (argv[0]->i, msg); + } } else if (strlen(path) == 12) { // command is in /set_surface iii form switch (argc) { + case 9: + if (types[8] == 'f') { + linkid = (int) argv[8]->f; + } else { + linkid = argv[8]->i; + } + case 8: + if (types[7] == 'f') { + linkset = (int) argv[7]->f; + } else { + linkset = argv[7]->i; + } + case 7: + if (types[6] == 'f') { + port = (int) argv[6]->f; + } else { + port = argv[6]->i; + } case 6: if (types[5] == 'f') { pi_page = (int) argv[5]->f; @@ -1485,7 +1827,11 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc } else { bank_size = argv[0]->i; } + set_surface_port (port, msg); ret = set_surface (bank_size, strip_types, feedback, fadermode, se_page, pi_page, msg); + if ((uint32_t) linkset != sur->linkset) { + set_link (linkset, linkid, get_address (msg)); + } break; case 0: // send current setup @@ -1497,7 +1843,10 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc lo_message_add_int32 (reply, fadermode); lo_message_add_int32 (reply, se_page); lo_message_add_int32 (reply, pi_page); - lo_send_message (get_address (msg), "/set_surface", reply); + lo_message_add_int32 (reply, (int) linkset); + lo_message_add_int32 (reply, (int) linkid); + lo_message_add_int32 (reply, (int) port); + lo_send_message (get_address (msg), X_("/set_surface"), reply); lo_message_free (reply); return 0; } @@ -1526,6 +1875,36 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc const char * pp = strstr (&sp[1], "/"); if (pp) { pi_page = atoi (&pp[1]); + const char * po = strstr (&pp[1], "/"); + if (po) { + port = atoi (&po[1]); + const char * ls = strstr (&po[1], "/"); + if (ls) { + linkset = atoi (&ls[1]); + const char * li = strstr (&ls[1], "/"); + if (li) { + linkid = atoi (&li[1]); + } else { + if (types[0] == 'f') { + linkid = (int) argv[0]->f; + } else if (types[0] == 'i') { + linkid = argv[0]->i; + } + } + } else { + if (types[0] == 'f') { + linkset = (int) argv[0]->f; + } else if (types[0] == 'i') { + linkset = argv[0]->i; + } + } + } else { + if (types[0] == 'f') { + port = (int) argv[0]->f; + } else if (types[0] == 'i') { + port = argv[0]->i; + } + } } else { if (types[0] == 'f') { pi_page = (int) argv[0]->f; @@ -1561,7 +1940,11 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc strip_types = argv[0]->i; } } + set_surface_port (port, msg); ret = set_surface (bank_size, strip_types, feedback, fadermode, se_page, pi_page, msg); + if ((uint32_t) linkset != sur->linkset) { + set_link (linkset, linkid, get_address (msg)); + } } return ret; } @@ -1569,18 +1952,34 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc int OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, uint32_t se_size, uint32_t pi_size, lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + if (observer_busy) { + return -1; + } + OSCSurface *s = get_surface(get_address (msg), true); s->bank_size = b_size; + if (s->custom_mode && b_size) { + s->custom_mode = s->custom_mode | 0x4; + } 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); - recalcbanks (); + if (s->linkset) { + set_link (s->linkset, s->linkid, get_address (msg)); + link_strip_types (s->linkset, s->strip_types.to_ulong()); + } else { + // set bank and strip feedback + strip_feedback(s, true); + _set_bank (1, get_address (msg)); + } - global_feedback (s->feedback, get_address (msg), s->gainmode); + global_feedback (s); sel_send_pagesize (se_size, msg); sel_plug_pagesize (pi_size, msg); return 0; @@ -1589,22 +1988,42 @@ OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, ui int OSC::set_surface_bank_size (uint32_t bs, lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + if (observer_busy) { + return -1; + } + OSCSurface *s = get_surface(get_address (msg), true); s->bank_size = bs; - - // set bank and strip feedback - set_bank(s->bank, msg); + if (s->custom_mode && bs) { + s->custom_mode = s->custom_mode | 0x4; + } + if (s->linkset) { + set_link (s->linkset, s->linkid, get_address (msg)); + } else { + // set bank and strip feedback + _set_bank (1, get_address (msg)); + } return 0; } int OSC::set_surface_strip_types (uint32_t st, lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + if (observer_busy) { + return -1; + } + OSCSurface *s = get_surface(get_address (msg), true); s->strip_types = st; + if (s->strip_types[10]) { + s->usegroup = PBD::Controllable::UseGroup; + } else { + s->usegroup = PBD::Controllable::NoGroup; + } + if (s->linkset) { + link_strip_types (s->linkset, st); + } // set bank and strip feedback - set_bank(s->bank, msg); + _set_bank (1, get_address (msg)); return 0; } @@ -1612,31 +2031,89 @@ OSC::set_surface_strip_types (uint32_t st, lo_message msg) int OSC::set_surface_feedback (uint32_t fb, lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + if (observer_busy) { + return -1; + } + OSCSurface *s = get_surface(get_address (msg), true); s->feedback = fb; - // set bank and strip feedback - set_bank(s->bank, msg); - - // Set global/master feedback - global_feedback (s->feedback, get_address (msg), s->gainmode); + strip_feedback (s, true); + global_feedback (s); + _strip_select (boost::shared_ptr(), get_address (msg)); return 0; } int OSC::set_surface_gainmode (uint32_t gm, lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + if (observer_busy) { + return -1; + } + OSCSurface *s = get_surface(get_address (msg), true); s->gainmode = gm; - // set bank and strip feedback - set_bank(s->bank, msg); - - // Set global/master feedback - global_feedback (s->feedback, get_address (msg), s->gainmode); + strip_feedback (s, true); + global_feedback (s); + _strip_select (boost::shared_ptr(), get_address (msg)); return 0; } +int +OSC::set_surface_port (uint32_t po, lo_message msg) +{ + string new_port; + if (!po) { + new_port = "auto"; + } else if (po > 1024) { + new_port = string_compose ("%1", po); + } else { + PBD::warning << "Port value must be greater than 1024" << endmsg; + return -1; + } + OSCSurface *sur = get_surface(get_address (msg), true); + lo_address addr = lo_message_get_source (msg); + string host = lo_address_get_hostname (addr); + string port = lo_address_get_port (addr); + int protocol = lo_address_get_protocol (addr); + for (uint32_t i = 0; i < _ports.size (); i++) { + if (_ports[i].host == host) { + if (_ports[i].port == new_port) { + // no change - do nothing + return 0; + } else { + lo_address new_addr; + _ports[i].port = new_port; + if (new_port == "auto") { + new_addr = addr; + } else { + new_addr = lo_address_new_with_proto (protocol, host.c_str(), new_port.c_str()); + } + char * rurl; + rurl = lo_address_get_url (new_addr); + sur->remote_url = rurl; + free (rurl); + for (uint32_t it = 0; it < _surface.size();) { + if (&_surface[it] == sur) { + it++; + continue; + } + char *sur_host = lo_url_get_hostname(_surface[it].remote_url.c_str()); + if (strstr (sur_host, host.c_str())) { + surface_destroy (&_surface[it]); + _surface.erase (_surface.begin() + it); + } else { + it++; + } + } + refresh_surface (msg); + return 0; + } + } + } + // should not get here + return -1; +} + int OSC::check_surface (lo_message msg) { @@ -1648,21 +2125,15 @@ OSC::check_surface (lo_message msg) } OSC::OSCSurface * -OSC::get_surface (lo_address addr) +OSC::get_surface (lo_address addr , bool quiet) { 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); for (uint32_t it = 0; it < _surface.size(); ++it) { - //find setup for this server + //find setup for this surface if (!_surface[it].remote_url.find(r_url)){ return &_surface[it]; } @@ -1672,70 +2143,117 @@ OSC::get_surface (lo_address addr) OSCSurface s; s.remote_url = r_url; s.no_clear = false; - s.jogmode = JOG; + s.jogmode = 0; 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.observers.clear(); + s.sel_obs = 0; + s.global_obs = 0; + s.strip_types = default_strip; s.feedback = default_feedback; s.gainmode = default_gainmode; + s.usegroup = PBD::Controllable::NoGroup; + s.custom_strips.clear (); + s.custom_mode = 0; s.sel_obs = 0; s.expand = 0; s.expand_enable = false; s.cue = false; s.aux = 0; - s.strips = get_sorted_stripables(s.strip_types, s.cue); + s.cue_obs = 0; + s.strips = get_sorted_stripables(s.strip_types, s.cue, false, s.custom_strips); s.send_page = 1; s.send_page_size = default_send_size; s.plug_page = 1; s.plug_page_size = default_plugin_size; s.plugin_id = 1; + s.linkset = 0; + s.linkid = 1; s.nstrips = s.strips.size(); - _surface.push_back (s); - // moved this down here as selection may need s. set - if (!_select || (_select != ControlProtocol::first_selected_stripable())) { - gui_selection_changed(); + { + _surface.push_back (s); } - // set bank and strip feedback - //_set_bank(s.bank, addr); - recalcbanks (); - - // Set global/master feedback - global_feedback (s.feedback, addr, s.gainmode); + if (!quiet) { + strip_feedback (&s, true); + global_feedback (&s); + _strip_select (boost::shared_ptr(), 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) { - // first destroy global observer for this surface - GlobalObservers::iterator x; - for (x = global_observers.begin(); x != global_observers.end();) { + OSCGlobalObserver* o = sur->global_obs; + delete o; + if (sur->feedback[4] || sur->feedback[3] || sur->feedback[5] || sur->feedback[6]) { - OSCGlobalObserver* ro; + // create a new Global Observer for this surface + OSCGlobalObserver* o = new OSCGlobalObserver (*this, *session, sur); + sur->global_obs = o; + o->jog_mode (sur->jogmode); + } +} - if ((ro = dynamic_cast(*x)) != 0) { +void +OSC::strip_feedback (OSCSurface* sur, bool new_bank_size) +{ + LinkSet *set; + uint32_t ls = sur->linkset; - int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr)); + if (ls) { + set = &(link_sets[ls]); + if (set->not_ready) { + return; + } + sur->custom_mode = set->custom_mode; + sur->custom_strips = set->custom_strips; + sur->temp_strips = set->temp_strips; + } + if (sur->custom_mode < 7) { + sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, sur->custom_mode, sur->custom_strips); + } else { + sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 1, sur->temp_strips); + } + sur->nstrips = sur->strips.size(); + if (ls) { + set->strips = sur->strips; + } - if (res == 0) { - delete *x; - x = global_observers.erase (x); - } else { - ++x; + if (new_bank_size || (!sur->feedback[0] && !sur->feedback[1])) { + // delete old observers + for (uint32_t i = 0; i < sur->observers.size(); i++) { + if (!sur->bank_size) { + sur->observers[i]->clear_strip (); + } + delete sur->observers[i]; + } + sur->observers.clear(); + + uint32_t bank_size = sur->bank_size; + if (!bank_size) { + bank_size = sur->nstrips; + } + + if (sur->feedback[0] || sur->feedback[1]) { + for (uint32_t i = 0; i < bank_size; i++) { + OSCRouteObserver* o = new OSCRouteObserver (*this, i + 1, sur); + sur->observers.push_back (o); + } + } + } else { + if (sur->feedback[0] || sur->feedback[1]) { + for (uint32_t i = 0; i < sur->observers.size(); i++) { + boost::shared_ptr str = get_strip (i + 1, lo_address_new_from_url (sur->remote_url.c_str())); + sur->observers[i]->refresh_strip(str, true); } - } else { - ++x; } } - 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); - global_observers.push_back (o); - } + bank_leds (sur); } void @@ -1762,40 +2280,43 @@ OSC::recalcbanks () void OSC::_recalcbanks () { - if (!_select || (_select != ControlProtocol::first_selected_stripable())) { - _select = ControlProtocol::first_selected_stripable(); + if (observer_busy) { + return; } - - // do a set_bank for each surface we know about. + /* + * We have two different ways of working here: + * 1) banked: The controller has a bank of strips and only can deal + * with banksize strips. We start banksize observers which run until + * either banksize is changed or Ardour exits. + * + * 2) banksize is 0 or unlimited and so is the same size as the number + * of strips. For a recalc, We want to tear down all strips but not send + * a reset value for any of the controls and then rebuild all observers. + * this is easier than detecting change in "bank" size and deleting or + * adding just a few. + */ + + // refresh each surface we know about. for (uint32_t it = 0; it < _surface.size(); ++it) { OSCSurface* sur = &_surface[it]; // find lo_address lo_address addr = lo_address_new_from_url (sur->remote_url.c_str()); if (sur->cue) { _cue_set (sur->aux, addr); - } else { - _set_bank (sur->bank, addr); - } - if (sur->no_clear) { + } else if (!sur->bank_size) { + strip_feedback (sur, true); // This surface uses /strip/list tell it routes have changed lo_message reply; reply = lo_message_new (); - lo_send_message (addr, "/strip/list", reply); + lo_send_message (addr, X_("/strip/list"), reply); lo_message_free (reply); + } else { + strip_feedback (sur, false); } + _strip_select (boost::shared_ptr(), addr); } } -/* - * This gets called not only when bank changes but also: - * - bank size change - * - feedback change - * - strip types changes - * - fadermode changes - * - stripable creation/deletion/flag - * - to refresh what is "displayed" - * Basically any time the bank needs to be rebuilt - */ int OSC::set_bank (uint32_t bank_start, lo_message msg) { @@ -1809,101 +2330,143 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr) if (!session) { return -1; } - // no nstripables yet if (!session->nroutes()) { return -1; } - OSCSurface *s = get_surface (addr); + OSCSurface *s = get_surface (addr, true); - // revert any expand to select - s->expand = 0; - s->expand_enable = false; - _strip_select (ControlProtocol::first_selected_stripable(), addr); + Sorted striplist = s->strips; + uint32_t nstrips = s->nstrips; - // undo all listeners for this url - StripableList stripables; - session->get_stripables (stripables); - for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { + LinkSet *set; + uint32_t ls = s->linkset; - boost::shared_ptr stp = *it; - if (stp) { - end_listen (stp, addr); + if (ls) { + //we have a linkset... deal with each surface + set = &(link_sets[ls]); + if (set->not_ready) { + return 1; } - // slow devices need time to clear buffers - usleep ((uint32_t) 10); + uint32_t d_count = set->urls.size(); + set->strips = striplist; + bank_start = bank_limits_check (bank_start, set->banksize, nstrips); + set->bank = bank_start; + uint32_t not_ready = 0; + for (uint32_t dv = 1; dv < d_count; dv++) { + if (set->urls[dv] != "") { + string url = set->urls[dv]; + OSCSurface *sur = get_surface (lo_address_new_from_url (url.c_str())); + if (sur->linkset != ls) { + set->urls[dv] = ""; + not_ready = dv; + } else { + lo_address sur_addr = lo_address_new_from_url (sur->remote_url.c_str()); + + sur->bank = bank_start; + bank_start = bank_start + sur->bank_size; + strip_feedback (sur, false); + _strip_select (boost::shared_ptr(), sur_addr); + bank_leds (sur); + lo_address_free (sur_addr); + } + } else { + not_ready = dv; + } + if (not_ready) { + if (!set->not_ready) { + set->not_ready = not_ready; + } + set->bank = 1; + break; + } + } + if (not_ready) { + surface_link_state (set); + } + + } else { + + s->bank = bank_limits_check (bank_start, s->bank_size, nstrips); + strip_feedback (s, true); + _strip_select (boost::shared_ptr(), addr); + bank_leds (s); } - s->strips = get_sorted_stripables(s->strip_types, s->cue); - s->nstrips = s->strips.size(); + bank_dirty = false; + tick = true; + return 0; +} + +uint32_t +OSC::bank_limits_check (uint32_t bank, uint32_t size, uint32_t total) +{ uint32_t b_size; - if (!s->bank_size) { + if (!size) { // no banking - bank includes all stripables - b_size = s->nstrips; + b_size = total; } else { - b_size = s->bank_size; + b_size = size; } - // 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)) { + if (bank < 1) bank = 1; + if (b_size >= total) { + bank = 1; + } else if (bank > ((total - 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); + bank = (uint32_t)((total - b_size) + 1); } - //save bank after bank limit checks - s->bank = bank_start; - - if (s->feedback[0] || s->feedback[1]) { - - for (uint32_t n = bank_start; n < (min ((b_size + bank_start), s->nstrips + 1)); ++n) { - if (n <= s->strips.size()) { - boost::shared_ptr stp = s->strips[n - 1]; + return bank; +} - if (stp) { - listen_to_route(stp, addr); - } - } - // slow devices need time to clear buffers - usleep ((uint32_t) 20); +void +OSC::bank_leds (OSCSurface* s) +{ + uint32_t bank = 0; + uint32_t size = 0; + uint32_t total = 0; + // light bankup or bankdown buttons if it is possible to bank in that direction + lo_address addr = lo_address_new_from_url (s->remote_url.c_str()); + if (s->linkset) { + LinkSet *set; + set = &(link_sets[s->linkset]); + bank = set->bank; + size = set->banksize; + total = s->nstrips; + if (set->not_ready) { + total = 1; } + } else { + bank = s->bank; + size = s->bank_size; + total = s->nstrips; } - // light bankup or bankdown buttons if it is possible to bank in that direction - if (s->feedback[4] && !s->no_clear) { + if (size && (s->feedback[0] || s->feedback[1] || s->feedback[4])) { lo_message reply; reply = lo_message_new (); - if ((s->bank > (s->nstrips - s->bank_size)) || (s->nstrips < s->bank_size)) { + if ((total <= size) || (bank > (total - size))) { lo_message_add_int32 (reply, 0); } else { lo_message_add_int32 (reply, 1); } - lo_send_message (addr, "/bank_up", reply); + lo_send_message (addr, X_("/bank_up"), reply); lo_message_free (reply); reply = lo_message_new (); - if (s->bank > 1) { + if (bank > 1) { lo_message_add_int32 (reply, 1); } else { lo_message_add_int32 (reply, 0); } - lo_send_message (addr, "/bank_down", reply); + lo_send_message (addr, X_("/bank_down"), reply); lo_message_free (reply); } - bank_dirty = false; - tick = true; - return 0; } int OSC::bank_up (lo_message msg) { - if (!session) { - return -1; - } - OSCSurface *s = get_surface(get_address (msg)); - set_bank (s->bank + s->bank_size, msg); - return 0; + return bank_delta (1.0, msg); } int @@ -1912,12 +2475,34 @@ OSC::bank_delta (float delta, lo_message msg) if (!session) { return -1; } + // only do deltas of -1 0 or 1 + if (delta > 0) { + delta = 1; + } else if (delta < 0) { + delta = -1; + } else { + // 0 key release ignore + return 0; + } OSCSurface *s = get_surface(get_address (msg)); - uint32_t new_bank = s->bank + (s->bank_size * (int) delta); + if (!s->bank_size) { + // bank size of 0 means use all strips no banking + return 0; + } + uint32_t old_bank = 0; + uint32_t bank_size = 0; + if (s->linkset) { + old_bank = link_sets[s->linkset].bank; + bank_size = link_sets[s->linkset].banksize; + } else { + old_bank = s->bank; + bank_size = s->bank_size; + } + uint32_t new_bank = old_bank + (bank_size * (int) delta); if ((int)new_bank < 1) { new_bank = 1; } - if (new_bank != s->bank) { + if (new_bank != old_bank) { set_bank (new_bank, msg); } return 0; @@ -1925,19 +2510,153 @@ OSC::bank_delta (float delta, lo_message msg) int OSC::bank_down (lo_message msg) +{ + return bank_delta (-1.0, msg); +} + +int +OSC::use_group (float value, lo_message msg) { if (!session) { return -1; } OSCSurface *s = get_surface(get_address (msg)); - if (s->bank < s->bank_size) { - set_bank (1, msg); + if (value) { + s->usegroup = PBD::Controllable::UseGroup; } else { - set_bank (s->bank - s->bank_size, msg); + s->usegroup = PBD::Controllable::NoGroup; } return 0; } +// this gets called for anything that starts with /select/group +int +OSC::parse_sel_group (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + int ret = 1; /* unhandled */ + if (s) { + if (!strncmp (path, X_("/select/group"), 13)) { + if (argc == 1) { + if (types[0] == 's') { + return strip_select_group (s, &argv[0]->s); + } + } + } + boost::shared_ptr rt = boost::dynamic_pointer_cast (s); + if (!rt) { + PBD::warning << "OSC: VCAs can not be part of a group." << endmsg; + return ret; + } + RouteGroup *rg = rt->route_group(); + if (!rg) { + PBD::warning << "OSC: This strip is not part of a group." << endmsg; + return ret; + } + float value = 0; + if (argc == 1) { + if (types[0] == 'f') { + value = (uint32_t) argv[0]->f; + } else if (types[0] == 'i') { + value = (uint32_t) argv[0]->i; + } + } + if (!strncmp (path, X_("/select/group/enable"), 20)) { + if (argc == 1) { + rg->set_active (value, this); + ret = 0; + } + } + else if (!strncmp (path, X_("/select/group/only"), 18)) { + if ((argc == 1 && value) || !argc) { + // fill sur->strips with routes from this group and hit bank1 + sur->temp_strips.clear(); + boost::shared_ptr rl = rg->route_list(); + for (RouteList::iterator it = rl->begin(); it != rl->end(); ++it) { + boost::shared_ptr r = *it; + boost::shared_ptr s = boost::dynamic_pointer_cast (r); + sur->temp_strips.push_back(s); + } + sur->custom_mode = 7; + set_bank (1, msg); + ret = 0; + } else { + // key off is ignored + ret = 0; + } + } + else if (!strncmp (path, X_("/select/group/sharing"), 21)) { + if (argc == 9) { + if (rg->is_gain() != (bool) argv[0]->i) { + rg->set_gain ((bool) argv[0]->i); + } + if (rg->is_relative() != (bool) argv[1]->i) { + rg->set_relative ((bool) argv[1]->i, this); + } + if (rg->is_mute() != (bool) argv[2]->i) { + rg->set_mute ((bool) argv[2]->i); + } + if (rg->is_solo() != (bool) argv[3]->i) { + rg->set_solo ((bool) argv[3]->i); + } + if (rg->is_recenable() != (bool) argv[4]->i) { + rg->set_recenable ((bool) argv[4]->i); + } + if (rg->is_select() != (bool) argv[5]->i) { + rg->set_select ((bool) argv[5]->i); + } + if (rg->is_route_active() != (bool) argv[6]->i) { + rg->set_route_active ((bool) argv[6]->i); + } + if (rg->is_color() != (bool) argv[7]->i) { + rg->set_color ((bool) argv[7]->i); + } + if (rg->is_monitoring() != (bool) argv[8]->i) { + rg->set_monitoring ((bool) argv[8]->i); + } + ret = 0; + } else { + PBD::warning << "OSC: Sharing can only be set if all 9 parameters are sent." << endmsg; + } + } + } + return ret; + } + +int +OSC::name_session (char *n, lo_message msg) +{ + if (!session) { + return -1; + } + string new_name = n; + char illegal = Session::session_name_is_legal (new_name); + + if (illegal) { + PBD::warning << (string_compose (_("To ensure compatibility with various systems\n" + "session names may not contain a '%1' character"), illegal)) << endmsg; + return -1; + } + switch (session->rename (new_name)) { + case -1: + PBD::warning << (_("That name is already in use by another directory/folder. Please try again.")) << endmsg; + break; + case 0: + return 0; + break; + default: + PBD::warning << (_("Renaming this session failed.\nThings could be seriously messed up at this point")) << endmsg; + break; + } + return -1; +} + uint32_t OSC::get_sid (boost::shared_ptr strip, lo_address addr) { @@ -1984,7 +2703,7 @@ OSC::sel_send_pagesize (uint32_t size, lo_message msg) OSCSurface *s = get_surface(get_address (msg)); if (size != s->send_page_size) { s->send_page_size = size; - s->sel_obs->renew_sends(); + s->sel_obs->set_send_size(size); } return 0; } @@ -1993,8 +2712,18 @@ int OSC::sel_send_page (int page, lo_message msg) { OSCSurface *s = get_surface(get_address (msg)); + uint32_t send_size = s->send_page_size; + if (!send_size) { + send_size = s->nsends; + } + uint32_t max_page = (uint32_t)(s->nsends / send_size) + 1; s->send_page = s->send_page + page; - s->sel_obs->renew_sends(); + if (s->send_page < 1) { + s->send_page = 1; + } else if ((uint32_t)s->send_page > max_page) { + s->send_page = max_page; + } + s->sel_obs->set_send_page (s->send_page); return 0; } @@ -2004,7 +2733,7 @@ OSC::sel_plug_pagesize (uint32_t size, lo_message msg) OSCSurface *s = get_surface(get_address (msg)); if (size != s->plug_page_size) { s->plug_page_size = size; - s->sel_obs->renew_plugin(); + s->sel_obs->set_plugin_size(size); } return 0; } @@ -2012,15 +2741,35 @@ OSC::sel_plug_pagesize (uint32_t size, lo_message msg) int OSC::sel_plug_page (int page, lo_message msg) { + if (!page) { + return 0; + } + int new_page = 0; OSCSurface *s = get_surface(get_address (msg)); - s->plug_page = s->plug_page + page; - s->sel_obs->renew_plugin(); + if (page > 0) { + new_page = s->plug_page + s->plug_page_size; + if ((uint32_t) new_page > s->plug_params.size ()) { + new_page = s->plug_page; + } + } else { + new_page = s->plug_page - s->plug_page_size; + if (new_page < 1) { + new_page = 1; + } + } + if (new_page != s->plug_page) { + s->plug_page = new_page; + s->sel_obs->set_plugin_page(s->plug_page); + } return 0; } int OSC::sel_plugin (int delta, lo_message msg) { + if (!delta) { + return 0; + } OSCSurface *sur = get_surface(get_address (msg)); return _sel_plugin (sur->plugin_id + delta, get_address (msg)); } @@ -2029,12 +2778,7 @@ int OSC::_sel_plugin (int id, lo_address addr) { OSCSurface *sur = get_surface(addr); - boost::shared_ptr s; - if (sur->expand_enable) { - s = get_strip (sur->expand, addr); - } else { - s = _select; - } + boost::shared_ptr s = sur->select; if (s) { boost::shared_ptr r = boost::dynamic_pointer_cast(s); if (!r) { @@ -2058,24 +2802,28 @@ OSC::_sel_plugin (int id, lo_address addr) if (!pi->is_channelstrip()) { #endif sur->plugins.push_back (nplugs); + nplugs++; #ifdef MIXBUS } } #endif } plugs = true; - nplugs++; } } while (plugs); // limit plugin_id to actual plugins - if (!sur->plugins.size()) { + if (sur->plugins.size() < 1) { sur->plugin_id = 0; + sur->plug_page = 1; + if (sur->sel_obs) { + sur->sel_obs->set_plugin_id(-1, 1); + } return 0; + } else if (id < 1) { + sur->plugin_id = 1; } else if (sur->plugins.size() < (uint32_t) id) { sur->plugin_id = sur->plugins.size(); - } else if (sur->plugins.size() && !id) { - sur->plugin_id = 1; } else { sur->plugin_id = id; } @@ -2105,7 +2853,7 @@ OSC::_sel_plugin (int id, lo_address addr) sur->plug_page = 1; if (sur->sel_obs) { - sur->sel_obs->renew_plugin(); + sur->sel_obs->set_plugin_id(sur->plugins[sur->plugin_id - 1], sur->plug_page); } return 0; } @@ -2113,18 +2861,18 @@ OSC::_sel_plugin (int id, lo_address addr) } void -OSC::transport_frame (lo_message msg) +OSC::transport_sample (lo_message msg) { if (!session) { return; } check_surface (msg); - framepos_t pos = session->transport_frame (); + samplepos_t pos = session->transport_sample (); lo_message reply = lo_message_new (); lo_message_add_int64 (reply, pos); - lo_send_message (get_address (msg), "/transport_frame", reply); + lo_send_message (get_address (msg), X_("/transport_frame"), reply); lo_message_free (reply); } @@ -2141,7 +2889,7 @@ OSC::transport_speed (lo_message msg) lo_message reply = lo_message_new (); lo_message_add_double (reply, ts); - lo_send_message (get_address (msg), "/transport_speed", reply); + lo_send_message (get_address (msg), X_("/transport_speed"), reply); lo_message_free (reply); } @@ -2158,7 +2906,7 @@ OSC::record_enabled (lo_message msg) lo_message reply = lo_message_new (); lo_message_add_int32 (reply, re); - lo_send_message (get_address (msg), "/record_enabled", reply); + lo_send_message (get_address (msg), X_("/record_enabled"), reply); lo_message_free (reply); } @@ -2169,7 +2917,7 @@ OSC::scrub (float delta, lo_message msg) if (!session) return -1; check_surface (msg); - scrub_place = session->transport_frame (); + scrub_place = session->transport_sample (); float speed; @@ -2195,7 +2943,7 @@ OSC::scrub (float delta, lo_message msg) if (speed == 1) { session->request_transport_speed (.5); } else { - session->request_transport_speed (1); + session->request_transport_speed (9.9); } } else if (speed < 0) { if (speed == -1) { @@ -2217,68 +2965,59 @@ OSC::jog (float delta, lo_message msg) OSCSurface *s = get_surface(get_address (msg)); - string path = "/jog/mode/name"; switch(s->jogmode) { - case JOG : - text_message (path, "Jog", get_address (msg)); + case 0: if (delta) { jump_by_seconds (delta / 5); } break; - case SCRUB: - text_message (path, "Scrub", get_address (msg)); + case 1: + if (delta > 0) { + access_action ("Common/nudge-playhead-forward"); + } else if (delta < 0) { + access_action ("Common/nudge-playhead-backward"); + } + break; + case 2: scrub (delta, msg); break; - case SHUTTLE: - text_message (path, "Shuttle", get_address (msg)); + case 3: if (delta) { double speed = get_transport_speed (); - set_transport_speed (speed + (delta / 8)); + set_transport_speed (speed + (delta / 8.1)); } else { set_transport_speed (0); } break; - case SCROLL: - text_message (path, "Scroll", get_address (msg)); + case 4: + if (delta > 0) { + next_marker (); + } else if (delta < 0) { + prev_marker (); + } + break; + case 5: 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)); + case 6: 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)); + case 7: 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; @@ -2293,58 +3032,160 @@ OSC::jog_mode (float mode, lo_message msg) if (!session) return -1; OSCSurface *s = get_surface(get_address (msg)); + if (get_transport_speed () != 1.0) { + set_transport_speed (0); + } + s->jogmode = (uint32_t) mode; + s->global_obs->jog_mode (mode); + return 0; +} - 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; +// two structs to help with going to markers +struct LocationMarker { + LocationMarker (const std::string& l, samplepos_t w) + : label (l), when (w) {} + std::string label; + samplepos_t when; +}; + +struct LocationMarkerSort { + bool operator() (const LocationMarker& a, const LocationMarker& b) { + return (a.when < b.when); + } +}; + +int +OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg) +{ + if (argc != 1) { + PBD::warning << "Wrong number of parameters, one only." << endmsg; + return -1; + } + const Locations::LocationList& ll (session->locations ()->list ()); + uint32_t marker = 0; + + switch (types[0]) { + case 's': + { + Location *cur_mark = 0; + for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) { + if ((*l)->is_mark ()) { + if (strcmp (&argv[0]->s, (*l)->name().c_str()) == 0) { + session->request_locate ((*l)->start (), false); + return 0; + } else if ((*l)->start () == session->transport_sample()) { + cur_mark = (*l); + } + } + } + if (cur_mark) { + cur_mark->set_name (&argv[0]->s); + return 0; + } + PBD::warning << string_compose ("Marker: \"%1\" - does not exist", &argv[0]->s) << endmsg; + return -1; + } break; - case NUDGE: - s->jogmode = NUDGE; + case 'i': + marker = (uint32_t) argv[0]->i - 1; break; - case MARKER: - s->jogmode = MARKER; + case 'f': + marker = (uint32_t) argv[0]->f - 1; break; default: - PBD::warning << "Jog Mode: " << mode << " is not valid." << endmsg; + return -1; 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); + } + std::vector lm; + // get Locations that are marks + for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) { + if ((*l)->is_mark ()) { + lm.push_back (LocationMarker((*l)->name(), (*l)->start ())); + } + } + // sort them by position + LocationMarkerSort location_marker_sort; + std::sort (lm.begin(), lm.end(), location_marker_sort); + // go there + if (marker < lm.size()) { + session->request_locate (lm[marker].when, false); + return 0; + } + // we were unable to deal with things + return -1; +} + +int +OSC::group_list (lo_message msg) +{ + return send_group_list (get_address (msg)); +} + +int +OSC::send_group_list (lo_address addr) +{ + lo_message reply; + reply = lo_message_new (); + + lo_message_add_string (reply, X_("none")); + std::list groups = session->route_groups (); + for (std::list::iterator i = groups.begin(); i != groups.end(); ++i) { + RouteGroup *rg = *i; + lo_message_add_string (reply, rg->name().c_str()); } - jog (0, msg); + lo_send_message (addr, X_("/group/list"), reply); + lo_message_free (reply); return 0; +} +int +OSC::click_level (float position) +{ + if (!session) return -1; + if (session->click_gain()->gain_control()) { + session->click_gain()->gain_control()->set_value (session->click_gain()->gain_control()->interface_to_internal (position), PBD::Controllable::NoGroup); + } + return 0; } // master and monitor calls int -OSC::master_set_gain (float dB) +OSC::master_set_gain (float dB) +{ + if (!session) return -1; + boost::shared_ptr s = session->master_out(); + if (s) { + if (dB < -192) { + s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); + } else { + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + } + } + return 0; +} + +int +OSC::master_delta_gain (float delta) { if (!session) return -1; boost::shared_ptr s = session->master_out(); if (s) { + float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; if (dB < -192) { s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); } else { - s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup); + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); } } return 0; @@ -2394,7 +3235,7 @@ OSC::master_set_pan_stereo_position (float position, lo_message msg) lo_message reply = lo_message_new (); lo_message_add_float (reply, endposition); - lo_send_message (get_address (msg), "/master/pan_stereo_position", reply); + lo_send_message (get_address (msg), X_("/master/pan_stereo_position"), reply); lo_message_free (reply); } @@ -2415,6 +3256,22 @@ OSC::master_set_mute (uint32_t state) 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 s = session->master_out(); + if (s) { + SetStripableSelection (s); + } + + return 0; +} + int OSC::monitor_set_gain (float dB) { @@ -2425,7 +3282,33 @@ OSC::monitor_set_gain (float dB) if (dB < -192) { s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); } else { - s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup); + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + } + } + return 0; +} + +int +OSC::monitor_delta_gain (float delta) +{ + if (!session) return -1; + boost::shared_ptr s = session->monitor_out(); + if (s) { + float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; + if (dB < -192) { + s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); + } else { + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); } } return 0; @@ -2521,7 +3404,7 @@ OSC::route_get_sends(lo_message msg) { } // if used dedicated message path to identify this reply in async operation. // Naming it #reply wont help the client to identify the content. - lo_send_message(get_address (msg), "/strip/sends", reply); + lo_send_message(get_address (msg), X_("/strip/sends"), reply); lo_message_free(reply); @@ -2552,6 +3435,7 @@ OSC::route_get_receives(lo_message msg) { boost::shared_ptr route_list = session->get_routes(); lo_message reply = lo_message_new(); + lo_message_add_int32(reply, rid); for (RouteList::iterator i = route_list->begin(); i != route_list->end(); ++i) { boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); @@ -2584,7 +3468,7 @@ OSC::route_get_receives(lo_message msg) { // I have used a dedicated message path to identify this reply in async operation. // Naming it #reply wont help the client to identify the content. - lo_send_message(get_address (msg), "/strip/receives", reply); + lo_send_message(get_address (msg), X_("/strip/receives"), reply); lo_message_free(reply); return 0; } @@ -2612,7 +3496,7 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg } //parse path first to find stripable - if (!strncmp (path, "/strip/", 7)) { + if (!strncmp (path, X_("/strip/"), 7)) { // find ssid and stripable if (argc > 1) { if (types[1] == 'f') { @@ -2626,11 +3510,11 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg strp = get_strip (ssid, get_address (msg)); } ctr = 7; - } else if (!strncmp (path, "/select/", 8)) { + } else if (!strncmp (path, X_("/select/"), 8)) { if (sur->expand_enable && sur->expand) { strp = get_strip (sur->expand, get_address (msg)); } else { - strp = ControlProtocol::first_selected_stripable(); + strp = _select; } ctr = 8; } else { @@ -2639,7 +3523,7 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg if (strp) { boost::shared_ptr control = boost::shared_ptr(); // other automatable controls can be added by repeating the next 6.5 lines - if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) { + if ((!strncmp (&path[ctr], X_("fader"), 5)) || (!strncmp (&path[ctr], X_("gain"), 4))) { if (strp->gain_control ()) { control = strp->gain_control (); } else { @@ -2698,7 +3582,7 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, } //parse path first to find stripable - if (!strncmp (path, "/strip/", 7)) { + if (!strncmp (path, X_("/strip/"), 7)) { // find ssid and stripable if (argc > 1) { if (types[0] == 'f') { @@ -2712,11 +3596,11 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, strp = get_strip (ssid, get_address (msg)); } ctr = 7; - } else if (!strncmp (path, "/select/", 8)) { + } else if (!strncmp (path, X_("/select/"), 8)) { if (sur->expand_enable && sur->expand) { strp = get_strip (sur->expand, get_address (msg)); } else { - strp = ControlProtocol::first_selected_stripable(); + strp = _select; } ctr = 8; } else { @@ -2725,7 +3609,7 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, if (strp) { boost::shared_ptr control = boost::shared_ptr(); // other automatable controls can be added by repeating the next 6.5 lines - if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) { + if ((!strncmp (&path[ctr], X_("fader"), 5)) || (!strncmp (&path[ctr], X_("gain"), 4))) { if (strp->gain_control ()) { control = strp->gain_control (); } else { @@ -2738,13 +3622,11 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, 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_sample()); ret = 0; } else { // end touch - control->stop_touch (true, control->session().transport_frame()); + control->stop_touch (control->session().transport_sample()); ret = 0; } // just in case some crazy surface starts sending control values before touch @@ -2764,7 +3646,7 @@ OSC::fake_touch (boost::shared_ptr ctrl) if (ctrl) { //start touch if (ctrl->automation_state() == Touch && !ctrl->touching ()) { - ctrl->start_touch (ctrl->session().transport_frame()); + ctrl->start_touch (ctrl->session().transport_sample()); _touch_timeout[ctrl] = 10; } } @@ -2777,15 +3659,16 @@ OSC::route_mute (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; } } - return route_send_fail ("mute", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/mute"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -2804,7 +3687,7 @@ OSC::sel_mute (uint32_t yn, lo_message msg) return 0; } } - return sel_fail ("mute", 0, get_address (msg)); + return float_message(X_("/select/mute"), 0, get_address (msg)); } int @@ -2812,14 +3695,15 @@ OSC::route_solo (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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); } } - return route_send_fail ("solo", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/solo"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -2827,15 +3711,16 @@ OSC::route_solo_iso (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; } } - return route_send_fail ("solo_iso", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/solo_iso"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -2843,15 +3728,16 @@ OSC::route_solo_safe (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; } } - return route_send_fail ("solo_safe", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/solo_safe"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -2869,7 +3755,7 @@ OSC::sel_solo (uint32_t yn, lo_message msg) session->set_control (s->solo_control(), yn ? 1.0 : 0.0, PBD::Controllable::NoGroup); } } - return sel_fail ("solo", 0, get_address (msg)); + return float_message(X_("/select/solo"), 0, get_address (msg)); } int @@ -2888,7 +3774,7 @@ OSC::sel_solo_iso (uint32_t yn, lo_message msg) return 0; } } - return sel_fail ("solo_iso", 0, get_address (msg)); + return float_message(X_("/select/solo_iso"), 0, get_address (msg)); } int @@ -2907,7 +3793,7 @@ OSC::sel_solo_safe (uint32_t yn, lo_message msg) return 0; } } - return sel_fail ("solo_safe", 0, get_address (msg)); + return float_message(X_("/select/solo_safe"), 0, get_address (msg)); } int @@ -2928,7 +3814,7 @@ OSC::sel_recenable (uint32_t yn, lo_message msg) } } } - return sel_fail ("recenable", 0, get_address (msg)); + return float_message(X_("/select/recenable"), 0, get_address (msg)); } int @@ -2936,31 +3822,156 @@ OSC::route_recenable (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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::UseGroup); + s->rec_enable_control()->set_value (yn, sur->usegroup); if (s->rec_enable_control()->get_value()) { return 0; } } } - return route_send_fail ("recenable", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/recenable"), ssid, 0, sur->feedback[2], get_address (msg)); +} + +int +OSC::route_rename (int ssid, char *newname, lo_message msg) { + if (!session) { + return -1; + } + + boost::shared_ptr s = get_strip(ssid, get_address(msg)); + + if (s) { + s->set_name(std::string(newname)); + } + + return 0; +} + +int +OSC::sel_rename (char *newname, lo_message msg) { + if (!session) { + return -1; + } + + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + s->set_name(std::string(newname)); + } + + return 0; +} + +int +OSC::sel_comment (char *newcomment, lo_message msg) { + if (!session) { + return -1; + } + + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + boost::shared_ptr rt = boost::dynamic_pointer_cast (s); + if (!rt) { + PBD::warning << "OSC: can not set comment on VCAs." << endmsg; + return -1; + } + rt->set_comment (newcomment, this); + } + + return 0; } int -OSC::route_rename(int ssid, char *newname, lo_message msg) { - if (!session) { - return -1; - } +OSC::strip_group (int ssid, char *group, lo_message msg) { + if (!session) { + return -1; + } + boost::shared_ptr s = get_strip(ssid, get_address(msg)); + return strip_select_group (s, group); +} - boost::shared_ptr s = get_strip(ssid, get_address(msg)); +int +OSC::sel_group (char *group, lo_message msg) { + if (!session) { + return -1; + } + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + return strip_select_group (s, group); +} - if (s) { - s->set_name(std::string(newname)); - } +int +OSC::strip_select_group (boost::shared_ptr s, char *group) +{ + string grp = group; + if (grp == "" || grp == " ") { + grp = "none"; + } - return 0; + if (s) { + boost::shared_ptr rt = boost::dynamic_pointer_cast (s); + if (!rt) { + PBD::warning << "OSC: VCAs can not be part of a group." << endmsg; + return -1; + } + RouteGroup *rg = rt->route_group(); + RouteGroup* new_rg = session->route_group_by_name (grp); + if (rg) { + string old_group = rg->name(); + if (grp == "none") { + if (rg->size () == 1) { + session->remove_route_group (*rg); + } else { + rg->remove (rt); + } + } else if (grp != old_group) { + if (new_rg) { + // group exists switch to it + if (rg->size () == 1) { + session->remove_route_group (rg); + } else { + rg->remove (rt); + } + new_rg->add (rt); + } else { + rg->set_name (grp); + } + } else { + return 0; + } + } else { + if (grp == "none") { + return 0; + } else if (new_rg) { + new_rg->add (rt); + } else { + // create new group with this strip in it + RouteGroup* new_rg = new RouteGroup (*session, grp); + session->add_route_group (new_rg); + new_rg->add (rt); + } + } + } + return 0; } int @@ -2981,7 +3992,7 @@ OSC::sel_recsafe (uint32_t yn, lo_message msg) } } } - return sel_fail ("record_safe", 0, get_address (msg)); + return float_message(X_("/select/record_safe"), 0, get_address (msg)); } int @@ -2989,15 +4000,16 @@ OSC::route_recsafe (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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::UseGroup); + s->rec_safe_control()->set_value (yn, sur->usegroup); if (s->rec_safe_control()->get_value()) { return 0; } } } - return route_send_fail ("record_safe", ssid, 0,get_address (msg)); + return float_message_with_id (X_("/strip/record_safe"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3005,18 +4017,21 @@ OSC::route_monitor_input (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr s = get_strip (ssid, get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg)); if (s) { boost::shared_ptr track = boost::dynamic_pointer_cast (s); if (track) { if (track->monitoring_control()) { - track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup); + std::bitset<32> value = track->monitoring_control()->get_value (); + value[0] = yn ? 1 : 0; + track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup); return 0; } } } - return route_send_fail ("monitor_input", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/monitor_input"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3033,12 +4048,14 @@ OSC::sel_monitor_input (uint32_t yn, lo_message msg) boost::shared_ptr track = boost::dynamic_pointer_cast (s); if (track) { if (track->monitoring_control()) { - track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup); + std::bitset<32> value = track->monitoring_control()->get_value (); + value[0] = yn ? 1 : 0; + track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup); return 0; } } } - return sel_fail ("monitor_input", 0, get_address (msg)); + return float_message(X_("/select/monitor_input"), 0, get_address (msg)); } int @@ -3046,18 +4063,21 @@ OSC::route_monitor_disk (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr s = get_strip (ssid, get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg)); if (s) { boost::shared_ptr track = boost::dynamic_pointer_cast (s); if (track) { if (track->monitoring_control()) { - track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup); + std::bitset<32> value = track->monitoring_control()->get_value (); + value[1] = yn ? 1 : 0; + track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup); return 0; } } } - return route_send_fail ("monitor_disk", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/monitor_disk"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3074,12 +4094,14 @@ OSC::sel_monitor_disk (uint32_t yn, lo_message msg) boost::shared_ptr track = boost::dynamic_pointer_cast (s); if (track) { if (track->monitoring_control()) { - track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup); + std::bitset<32> value = track->monitoring_control()->get_value (); + value[1] = yn ? 1 : 0; + track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup); return 0; } } } - return sel_fail ("monitor_disk", 0, get_address (msg)); + return float_message(X_("/select/monitor_disk"), 0, get_address (msg)); } @@ -3088,15 +4110,16 @@ OSC::strip_phase (int ssid, int yn, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; } } - return route_send_fail ("polarity", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/polarity"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3115,7 +4138,7 @@ OSC::sel_phase (uint32_t yn, lo_message msg) return 0; } } - return sel_fail ("polarity", 0, get_address (msg)); + return float_message(X_("/select/polarity"), 0, get_address (msg)); } int @@ -3128,104 +4151,97 @@ OSC::strip_expand (int ssid, int yn, lo_message msg) if (yn) { s = get_strip (ssid, get_address (msg)); } else { - s = ControlProtocol::first_selected_stripable(); + s = _select; } return _strip_select (s, get_address (msg)); } +int +OSC::strip_hide (int ssid, int state, lo_message msg) +{ + boost::shared_ptr s = get_strip (ssid, get_address (msg)); + + if (s) { + if (state != s->is_hidden ()) { + s->presentation_info().set_hidden ((bool) state); + } + } + return 0; +} + int OSC::_strip_select (boost::shared_ptr s, lo_address addr) { if (!session) { return -1; } - OSCSurface *sur = get_surface(addr); - if (sur->sel_obs) { - delete sur->sel_obs; - sur->sel_obs = 0; - } - bool feedback_on = sur->feedback.to_ulong(); - if (s && feedback_on) { - OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur); - s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); - sur->sel_obs = sel_fb; - } else if (sur->expand_enable) { + OSCSurface *sur = get_surface(addr, true); + if (!s) { // expand doesn't point to a stripable, turn it off and use select sur->expand = 0; sur->expand_enable = false; - if (_select && feedback_on) { - s = _select; - OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur); - s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); - sur->sel_obs = sel_fb; + if (ControlProtocol::first_selected_stripable()) { + s = ControlProtocol::first_selected_stripable(); + } else { + s = session->master_out (); } - } else if (feedback_on) { - route_send_fail ("select", sur->expand, 0 , addr); - } - // need to set monitor for processor changed signal - // detecting processor changes requires cast to route - boost::shared_ptr r = boost::dynamic_pointer_cast(s); - if (r) { - r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, addr), this); - processor_changed (addr); - } - - if (!feedback_on) { - return 0; - } - //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; + _select = s; } - for (int i = 1; i <= b_s; i++) { - 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 << "/" << i; - path = os.str(); - } else { - ostringstream os; - os << "/strip/" << path; - path = os.str(); - lo_message_add_int32 (reply, i); - } - lo_message_add_float (reply, (float) 1); + sur->select = s; + bool sends; + uint32_t nsends = 0; + do { + sends = false; + if (s->send_level_controllable (nsends)) { + sends = true; + nsends++; + } + } while (sends); + sur->nsends = nsends; - 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); + s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); + OSCSelectObserver* so = dynamic_cast(sur->sel_obs); + if (sur->feedback[13]) { + if (so != 0) { + so->refresh_strip (s, nsends, sur->gainmode, true); } 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); + OSCSelectObserver* sel_fb = new OSCSelectObserver (*this, *session, sur); + sur->sel_obs = sel_fb; + } + sur->sel_obs->set_expand (sur->expand_enable); + uint32_t obs_expand = 0; + if (sur->expand_enable) { + obs_expand = sur->expand; + } else { + obs_expand = 0; + } + for (uint32_t i = 0; i < sur->observers.size(); i++) { + sur->observers[i]->set_expand (obs_expand); + } + } else { + if (so != 0) { + delete so; + sur->sel_obs = 0; } } - 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); + // need to set monitor for processor changed signal (for paging) + string address = lo_address_get_url (addr); + boost::shared_ptr r = boost::dynamic_pointer_cast(s); + if (r) { + r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, address), this); + _sel_plugin (sur->plugin_id, addr); } return 0; } void -OSC::processor_changed (lo_address addr) +OSC::processor_changed (string address) { + lo_address addr = lo_address_new_from_url (address.c_str()); OSCSurface *sur = get_surface (addr); - sur->proc_connection.disconnect (); _sel_plugin (sur->plugin_id, addr); if (sur->sel_obs) { sur->sel_obs->renew_sends (); @@ -3249,7 +4265,7 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg) SetStripableSelection (s); } else { if ((int) (sur->feedback.to_ulong())) { - route_send_fail ("select", ssid, 0, get_address (msg)); + float_message_with_id (X_("/strip/select"), ssid, 0, sur->feedback[2], get_address (msg)); } } @@ -3261,57 +4277,77 @@ OSC::sel_expand (uint32_t state, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); boost::shared_ptr s; - sur->expand_enable = (bool) state; if (state && sur->expand) { + sur->expand_enable = (bool) state; s = get_strip (sur->expand, get_address (msg)); } else { - s = ControlProtocol::first_selected_stripable(); + sur->expand_enable = false; + s = _select; } return _strip_select (s, get_address (msg)); } int -OSC::route_set_gain_abs (int ssid, float level, lo_message msg) +OSC::route_set_gain_dB (int ssid, float dB, lo_message msg) { - if (!session) return -1; + if (!session) { + return -1; + } + OSCSurface *sur = get_surface(get_address (msg)); boost::shared_ptr s = get_strip (ssid, get_address (msg)); - if (s) { + float abs; if (s->gain_control()) { + if (dB < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + } fake_touch (s->gain_control()); - s->gain_control()->set_value (level, PBD::Controllable::NoGroup); - } else { - return 1; + s->gain_control()->set_value (abs, sur->usegroup); + return 0; } - } else { - return 1; } - - return 0; + return float_message_with_id (X_("/strip/gain"), ssid, -193, sur->feedback[2], get_address (msg)); } int -OSC::route_set_gain_dB (int ssid, float dB, lo_message msg) +OSC::sel_gain (float val, lo_message msg) { - if (!session) { - route_send_fail ("gain", ssid, -193, get_address (msg)); - return -1; - } - int ret; - if (dB < -192) { - ret = route_set_gain_abs (ssid, 0.0, msg); + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); } else { - ret = route_set_gain_abs (ssid, dB_to_coefficient (dB), msg); + s = _select; } - if (ret != 0) { - return route_send_fail ("gain", ssid, -193, get_address (msg)); + if (s) { + float abs; + if (s->gain_control()) { + if (val < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (val); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + } + fake_touch (s->gain_control()); + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + return 0; + } } - return 0; + return float_message(X_("/select/gain"), -193, get_address (msg)); } int -OSC::sel_gain (float val, lo_message msg) +OSC::sel_dB_delta (float delta, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); boost::shared_ptr s; @@ -3321,19 +4357,24 @@ OSC::sel_gain (float val, lo_message msg) s = _select; } if (s) { - float abs; - if (val < -192) { - abs = 0; - } else { - abs = dB_to_coefficient (val); - } if (s->gain_control()) { + float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; + float abs; + if (dB < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + } fake_touch (s->gain_control()); s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); return 0; } } - return sel_fail ("gain", -193, get_address (msg)); + return float_message(X_("/select/gain"), -193, get_address (msg)); } int @@ -3343,16 +4384,17 @@ OSC::route_set_gain_fader (int ssid, float pos, lo_message msg) return -1; } boost::shared_ptr 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)); + return float_message_with_id (X_("/strip/fader"), ssid, 0, sur->feedback[2], get_address (msg)); } } else { - return route_send_fail ("fader", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/fader"), ssid, 0, sur->feedback[2], get_address (msg)); } return 0; } @@ -3362,6 +4404,7 @@ OSC::strip_db_delta (int ssid, float delta, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; @@ -3369,8 +4412,12 @@ OSC::strip_db_delta (int ssid, float delta, lo_message msg) abs = 0; } else { abs = dB_to_coefficient (db); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } } - s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + s->gain_control()->set_value (abs, sur->usegroup); return 0; } return -1; @@ -3393,7 +4440,7 @@ OSC::sel_fader (float val, lo_message msg) return 0; } } - return sel_fail ("fader", 0, get_address (msg)); + return float_message(X_("/select/fader"), 0, get_address (msg)); } int @@ -3401,10 +4448,11 @@ OSC::route_set_trim_abs (int ssid, float level, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; } @@ -3416,10 +4464,11 @@ OSC::route_set_trim_abs (int ssid, float level, lo_message msg) int OSC::route_set_trim_dB (int ssid, float dB, lo_message msg) { + OSCSurface *sur = get_surface(get_address (msg)); int ret; ret = route_set_trim_abs(ssid, dB_to_coefficient (dB), msg); if (ret != 0) { - return route_send_fail ("trimdB", ssid, 0, get_address (msg)); + return float_message_with_id (X_("/strip/trimdB"), ssid, 0, sur->feedback[2], get_address (msg)); } return 0; @@ -3441,7 +4490,25 @@ OSC::sel_trim (float val, lo_message msg) return 0; } } - return sel_fail ("trimdB", 0, get_address (msg)); + return float_message(X_("/select/trimdB"), 0, get_address (msg)); +} + +int +OSC::sel_hide (uint32_t state, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (state != s->is_hidden ()) { + s->presentation_info().set_hidden ((bool) state); + } + } + return 0; } int @@ -3460,7 +4527,7 @@ OSC::sel_pan_position (float val, lo_message msg) return 0; } } - return sel_fail ("pan_stereo_position", 0.5, get_address (msg)); + return float_message(X_("/select/pan_stereo_position"), 0.5, get_address (msg)); } int @@ -3479,7 +4546,7 @@ OSC::sel_pan_width (float val, lo_message msg) return 0; } } - return sel_fail ("pan_stereo_width", 1, get_address (msg)); + return float_message(X_("/select/pan_stereo_width"), 1, get_address (msg)); } int @@ -3487,15 +4554,16 @@ OSC::route_set_pan_stereo_position (int ssid, float pos, lo_message msg) { if (!session) return -1; boost::shared_ptr 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; } } - return route_send_fail ("pan_stereo_position", ssid, 0.5, get_address (msg)); + return float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, sur->feedback[2], get_address (msg)); } int @@ -3503,15 +4571,16 @@ OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg) { if (!session) return -1; boost::shared_ptr 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 route_send_fail ("pan_stereo_width", ssid, 1, get_address (msg)); + return float_message_with_id (X_("/strip/pan_stereo_width"), ssid, 1, sur->feedback[2], get_address (msg)); } int @@ -3521,6 +4590,7 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg) return -1; } boost::shared_ptr s = get_strip (ssid, get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg)); float abs; if (s) { if (id > 0) { @@ -3536,7 +4606,7 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg) } #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; } } @@ -3550,6 +4620,7 @@ OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg) return -1; } boost::shared_ptr s = get_strip (ssid, get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg)); float abs; if (s) { @@ -3559,7 +4630,7 @@ OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg) 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; } } @@ -3571,7 +4642,7 @@ OSC::sel_sendgain (int id, float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); if (sur->send_page_size && (id > (int)sur->send_page_size)) { - return sel_send_fail ("send_gain", id, -193, get_address (msg)); + return float_message_with_id (X_("/select/send_gain"), id, -193, sur->feedback[2], get_address (msg)); } boost::shared_ptr s; if (sur->expand_enable) { @@ -3580,7 +4651,7 @@ OSC::sel_sendgain (int id, float val, lo_message msg) s = _select; } float abs; - int send_id; + int send_id = 0; if (s) { if (id > 0) { send_id = id - 1; @@ -3602,7 +4673,7 @@ OSC::sel_sendgain (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("send_gain", id, -193, get_address (msg)); + return float_message_with_id (X_("/select/send_gain"), id, -193, sur->feedback[2], get_address (msg)); } int @@ -3610,7 +4681,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); if (sur->send_page_size && (id > (int)sur->send_page_size)) { - return sel_send_fail ("send_fader", id, 0, get_address (msg)); + return float_message_with_id (X_("/select/send_fader"), id, 0, sur->feedback[2], get_address (msg)); } boost::shared_ptr s; if (sur->expand_enable) { @@ -3619,7 +4690,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg) s = _select; } float abs; - int send_id; + int send_id = 0; if (s) { if (id > 0) { @@ -3635,7 +4706,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("send_fader", id, 0, get_address (msg)); + return float_message_with_id (X_("/select/send_fader"), id, 0, sur->feedback[2], get_address (msg)); } int @@ -3645,6 +4716,7 @@ OSC::route_set_send_enable (int ssid, int sid, float val, lo_message msg) return -1; } boost::shared_ptr s = get_strip (ssid, get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg)); if (s) { @@ -3655,7 +4727,7 @@ OSC::route_set_send_enable (int ssid, int sid, float val, lo_message msg) } 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; } @@ -3685,7 +4757,7 @@ OSC::sel_sendenable (int id, float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); if (sur->send_page_size && (id > (int)sur->send_page_size)) { - return sel_send_fail ("send_enable", id, 0, get_address (msg)); + return float_message_with_id (X_("/select/send_enable"), id, 0, sur->feedback[2], get_address (msg)); } boost::shared_ptr s; if (sur->expand_enable) { @@ -3693,7 +4765,7 @@ OSC::sel_sendenable (int id, float val, lo_message msg) } else { s = _select; } - int send_id; + int send_id = 0; if (s) { if (id > 0) { send_id = id - 1; @@ -3709,7 +4781,7 @@ OSC::sel_sendenable (int id, float val, lo_message msg) boost::shared_ptr r = boost::dynamic_pointer_cast (s); if (!r) { // should never get here - return sel_send_fail ("send_enable", id, 0, get_address (msg)); + return float_message_with_id (X_("/select/send_enable"), id, 0, sur->feedback[2], get_address (msg)); } boost::shared_ptr snd = boost::dynamic_pointer_cast (r->nth_send(send_id)); if (snd) { @@ -3722,7 +4794,7 @@ OSC::sel_sendenable (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("send_enable", id, 0, get_address (msg)); + return float_message_with_id (X_("/select/send_enable"), id, 0, sur->feedback[2], get_address (msg)); } int @@ -3741,14 +4813,14 @@ OSC::sel_master_send_enable (int state, lo_message msg) return 0; } } - return cue_float_message ("/select/master_send_enable", 0, get_address(msg)); + return float_message (X_("/select/master_send_enable"), 0, get_address(msg)); } int OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); int paid; - int piid = sur->plugin_id; + uint32_t piid = sur->plugin_id; float value = 0; if (argc > 1) { // no inline args @@ -3794,20 +4866,13 @@ OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv PBD::warning << "OSC: Must have parameters." << endmsg; return -1; } - if (piid != sur->plugin_id) { - // if the user is sending to a non-existant plugin, don't adjust one we do have - PBD::warning << "OSC: plugin: " << piid << " out of range" << endmsg; - return -1; + if (!piid || piid > sur->plugins.size ()) { + return float_message_with_id (X_("/select/plugin/parameter"), paid, 0, sur->feedback[2], get_address (msg)); } if (sur->plug_page_size && (paid > (int)sur->plug_page_size)) { - return sel_send_fail ("plugin/parameter", paid, 0, get_address (msg)); - } - boost::shared_ptr s; - if (sur->expand_enable) { - s = get_strip (sur->expand, get_address (msg)); - } else { - s = _select; + return float_message_with_id (X_("/select/plugin/parameter"), paid, 0, sur->feedback[2], get_address (msg)); } + boost::shared_ptr s = sur->select; boost::shared_ptr r = boost::dynamic_pointer_cast(s); if (!r) { return 1; @@ -3820,10 +4885,10 @@ OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv } boost::shared_ptr pip = pi->plugin(); // paid is paged parameter convert to absolute - int parid = paid + (int)(sur->plug_page_size * (sur->plug_page - 1)); + int parid = paid + (int)sur->plug_page - 1; if (parid > (int) sur->plug_params.size ()) { if (sur->feedback[13]) { - sel_send_fail ("plugin/parameter", paid, 0, get_address (msg)); + float_message_with_id (X_("/select/plugin/parameter"), paid, 0, sur->feedback[2], get_address (msg)); } return 0; } @@ -3853,6 +4918,38 @@ OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv return 1; } +int +OSC::sel_plugin_activate (float state, lo_message msg) +{ + if (!session) { + return -1; + } + OSCSurface *sur = get_surface(get_address (msg)); + if (sur->plugins.size() > 0) { + boost::shared_ptr s = sur->select; + + boost::shared_ptr r = boost::dynamic_pointer_cast (s); + + if (r) { + boost::shared_ptr redi=r->nth_plugin (sur->plugins[sur->plugin_id -1]); + if (redi) { + boost::shared_ptr pi; + if ((pi = boost::dynamic_pointer_cast(redi))) { + if(state > 0) { + pi->activate(); + } else { + pi->deactivate(); + } + return 0; + } + } + } + } + float_message (X_("/select/plugin/activate"), 0, get_address (msg)); + PBD::warning << "OSC: Select has no Plugin." << endmsg; + return 0; +} + int OSC::route_plugin_list (int ssid, lo_message msg) { if (!session) { @@ -3887,11 +4984,12 @@ OSC::route_plugin_list (int ssid, lo_message msg) { boost::shared_ptr pip = pi->plugin(); lo_message_add_string (reply, pip->name()); + lo_message_add_int32(reply, redi->enabled() ? 1 : 0); piid++; } - lo_send_message (get_address (msg), "/strip/plugin/list", reply); + lo_send_message (get_address (msg), X_("/strip/plugin/list"), reply); lo_message_free (reply); return 0; } @@ -3926,58 +5024,99 @@ OSC::route_plugin_descriptor (int ssid, int piid, lo_message msg) { boost::shared_ptr 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_string (reply, pip->name()); for ( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) { uint32_t controlid = pip->nth_parameter(ppi, ok); if (!ok) { continue; } - if ( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) { - boost::shared_ptr c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid)); - - lo_message_add_int32 (reply, ppi + 1); - ParameterDescriptor pd; - pi->plugin()->get_parameter_descriptor(controlid, pd); - lo_message_add_string (reply, pd.label.c_str()); - - // I've combined those binary descriptor parts in a bit-field to reduce lilo message elements - int flags = 0; - flags |= pd.enumeration ? 1 : 0; - flags |= pd.integer_step ? 2 : 0; - flags |= pd.logarithmic ? 4 : 0; - flags |= pd.sr_dependent ? 32 : 0; - flags |= pd.toggled ? 64 : 0; - flags |= c != NULL ? 128 : 0; // bit 7 indicates in input control - lo_message_add_int32 (reply, flags); - - lo_message_add_int32 (reply, pd.datatype); - 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_string (reply, ((std::string)i->first).c_str()); - } - } - else { - lo_message_add_int32 (reply, 0); - } - if ( c ) { - lo_message_add_double (reply, c->get_value()); - } - else { - lo_message_add_double (reply, 0); + boost::shared_ptr 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); + lo_message_add_string (reply, pd.label.c_str()); + + // I've combined those binary descriptor parts in a bit-field to reduce lilo message elements + int flags = 0; + flags |= pd.enumeration ? 1 : 0; + flags |= pd.integer_step ? 2 : 0; + 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) { + case ARDOUR::Variant::BEATS: + lo_message_add_string(reply, _("BEATS")); + break; + case ARDOUR::Variant::BOOL: + lo_message_add_string(reply, _("BOOL")); + break; + case ARDOUR::Variant::DOUBLE: + lo_message_add_string(reply, _("DOUBLE")); + break; + case ARDOUR::Variant::FLOAT: + lo_message_add_string(reply, _("FLOAT")); + break; + case ARDOUR::Variant::INT: + lo_message_add_string(reply, _("INT")); + break; + case ARDOUR::Variant::LONG: + lo_message_add_string(reply, _("LONG")); + break; + case ARDOUR::Variant::NOTHING: + lo_message_add_string(reply, _("NOTHING")); + break; + case ARDOUR::Variant::PATH: + lo_message_add_string(reply, _("PATH")); + break; + case ARDOUR::Variant::STRING: + lo_message_add_string(reply, _("STRING")); + break; + case ARDOUR::Variant::URI: + lo_message_add_string(reply, _("URI")); + break; + default: + 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_float (reply, i->second); + lo_message_add_string (reply, ((std::string)i->first).c_str()); } } + else { + lo_message_add_int32 (reply, 0); + } + if ( c ) { + lo_message_add_double (reply, c->get_value()); + } + else { + lo_message_add_double (reply, 0); + } + + lo_send_message (get_address (msg), X_("/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), X_("/strip/plugin/descriptor_end"), reply); lo_message_free (reply); return 0; @@ -4214,7 +5353,7 @@ OSC::sel_pan_elevation (float val, lo_message msg) return 0; } } - return sel_fail ("pan_elevation_position", 0, get_address (msg)); + return float_message(X_("/select/pan_elevation_position"), 0, get_address (msg)); } int @@ -4233,7 +5372,7 @@ OSC::sel_pan_frontback (float val, lo_message msg) return 0; } } - return sel_fail ("pan_frontback_position", 0.5, get_address (msg)); + return float_message(X_("/select/pan_frontback_position"), 0.5, get_address (msg)); } int @@ -4252,7 +5391,7 @@ OSC::sel_pan_lfe (float val, lo_message msg) return 0; } } - return sel_fail ("pan_lfe_control", 0, get_address (msg)); + return float_message(X_("/select/pan_lfe_control"), 0, get_address (msg)); } // compressor control @@ -4272,7 +5411,7 @@ OSC::sel_comp_enable (float val, lo_message msg) return 0; } } - return sel_fail ("comp_enable", 0, get_address (msg)); + return float_message(X_("/select/comp_enable"), 0, get_address (msg)); } int @@ -4291,7 +5430,7 @@ OSC::sel_comp_threshold (float val, lo_message msg) return 0; } } - return sel_fail ("comp_threshold", 0, get_address (msg)); + return float_message(X_("/select/comp_threshold"), 0, get_address (msg)); } int @@ -4310,7 +5449,7 @@ OSC::sel_comp_speed (float val, lo_message msg) return 0; } } - return sel_fail ("comp_speed", 0, get_address (msg)); + return float_message(X_("/select/comp_speed"), 0, get_address (msg)); } int @@ -4329,7 +5468,7 @@ OSC::sel_comp_mode (float val, lo_message msg) return 0; } } - return sel_fail ("comp_mode", 0, get_address (msg)); + return float_message(X_("/select/comp_mode"), 0, get_address (msg)); } int @@ -4348,7 +5487,7 @@ OSC::sel_comp_makeup (float val, lo_message msg) return 0; } } - return sel_fail ("comp_makeup", 0, get_address (msg)); + return float_message(X_("/select/comp_makeup"), 0, get_address (msg)); } // EQ control @@ -4369,7 +5508,7 @@ OSC::sel_eq_enable (float val, lo_message msg) return 0; } } - return sel_fail ("eq_enable", 0, get_address (msg)); + return float_message(X_("/select/eq_enable"), 0, get_address (msg)); } int @@ -4388,7 +5527,7 @@ OSC::sel_eq_hpf_freq (float val, lo_message msg) return 0; } } - return sel_fail ("eq_hpf/freq", 0, get_address (msg)); + return float_message(X_("/select/eq_hpf/freq"), 0, get_address (msg)); } int @@ -4407,7 +5546,7 @@ OSC::sel_eq_lpf_freq (float val, lo_message msg) return 0; } } - return sel_fail ("eq_lpf/freq", 0, get_address (msg)); + return float_message(X_("/select/eq_lpf/freq"), 0, get_address (msg)); } int @@ -4426,7 +5565,7 @@ OSC::sel_eq_hpf_enable (float val, lo_message msg) return 0; } } - return sel_fail ("eq_hpf/enable", 0, get_address (msg)); + return float_message(X_("/select/eq_hpf/enable"), 0, get_address (msg)); } int @@ -4445,7 +5584,7 @@ OSC::sel_eq_lpf_enable (float val, lo_message msg) return 0; } } - return sel_fail ("eq_lpf/enable", 0, get_address (msg)); + return float_message(X_("/select/eq_lpf/enable"), 0, get_address (msg)); } int @@ -4464,7 +5603,7 @@ OSC::sel_eq_hpf_slope (float val, lo_message msg) return 0; } } - return sel_fail ("eq_hpf/slope", 0, get_address (msg)); + return float_message(X_("/select/eq_hpf/slope"), 0, get_address (msg)); } int @@ -4483,7 +5622,7 @@ OSC::sel_eq_lpf_slope (float val, lo_message msg) return 0; } } - return sel_fail ("eq_lpf/slope", 0, get_address (msg)); + return float_message(X_("/select/eq_lpf/slope"), 0, get_address (msg)); } int @@ -4505,7 +5644,7 @@ OSC::sel_eq_gain (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("eq_gain", id + 1, 0, get_address (msg)); + return float_message_with_id (X_("/select/eq_gain"), id + 1, 0, sur->feedback[2], get_address (msg)); } int @@ -4527,7 +5666,7 @@ OSC::sel_eq_freq (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("eq_freq", id + 1, 0, get_address (msg)); + return float_message_with_id (X_("/select/eq_freq"), id + 1, 0, sur->feedback[2], get_address (msg)); } int @@ -4549,7 +5688,7 @@ OSC::sel_eq_q (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("eq_q", id + 1, 0, get_address (msg)); + return float_message_with_id (X_("/select/eq_q"), id + 1, 0, sur->feedback[2], get_address (msg)); } int @@ -4571,37 +5710,22 @@ OSC::sel_eq_shape (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("eq_shape", id + 1, 0, get_address (msg)); -} - -void -OSC::gui_selection_changed () -{ - boost::shared_ptr strip = ControlProtocol::first_selected_stripable(); - - if (strip) { - _select = strip; - for (uint32_t it = 0; it < _surface.size(); ++it) { - OSCSurface* sur = &_surface[it]; - if(!sur->expand_enable) { - lo_address addr = lo_address_new_from_url (sur->remote_url.c_str()); - _strip_select (strip, addr); - } - } - } + return float_message_with_id (X_("/select/eq_shape"), id + 1, 0, sur->feedback[2], get_address (msg)); } // timer callbacks bool OSC::periodic (void) { + if (observer_busy) { + return true; + } 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_feedback (sur); } global_init = false; tick = true; @@ -4611,6 +5735,7 @@ OSC::periodic (void) bank_dirty = false; tick = true; } + return true; } if (scrub_speed != 0) { @@ -4624,44 +5749,34 @@ OSC::periodic (void) session->request_locate (scrub_place, false); } } - - for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end(); x++) { - - OSCGlobalObserver* go; - - if ((go = dynamic_cast(*x)) != 0) { - go->tick(); - } - } - for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); x++) { - - OSCRouteObserver* ro; - - if ((ro = dynamic_cast(*x)) != 0) { - ro->tick(); - } - } for (uint32_t it = 0; it < _surface.size(); it++) { OSCSurface* sur = &_surface[it]; OSCSelectObserver* so; if ((so = dynamic_cast(sur->sel_obs)) != 0) { - so->tick(); + so->tick (); } - } - for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end(); x++) { - OSCCueObserver* co; - - if ((co = dynamic_cast(*x)) != 0) { - co->tick(); + if ((co = dynamic_cast(sur->cue_obs)) != 0) { + co->tick (); } + OSCGlobalObserver* go; + if ((go = dynamic_cast(sur->global_obs)) != 0) { + go->tick (); + } + for (uint32_t i = 0; i < sur->observers.size(); i++) { + OSCRouteObserver* ro; + if ((ro = dynamic_cast(sur->observers[i])) != 0) { + ro->tick (); + } + } + } for (FakeTouchMap::iterator x = _touch_timeout.begin(); x != _touch_timeout.end();) { _touch_timeout[(*x).first] = (*x).second - 1; if (!(*x).second) { boost::shared_ptr ctrl = (*x).first; // turn touch off - ctrl->stop_touch (true, ctrl->session().transport_frame()); + ctrl->stop_touch (ctrl->session().transport_sample()); _touch_timeout.erase (x++); } else { x++; @@ -4670,91 +5785,19 @@ OSC::periodic (void) return true; } -int -OSC::route_send_fail (string path, uint32_t ssid, float val, lo_address addr) -{ - OSCSurface *sur = get_surface(addr); - - ostringstream os; - lo_message reply; - if (ssid) { - reply = lo_message_new (); - if (sur->feedback[2]) { - os << "/strip/" << path << "/" << ssid; - } else { - os << "/strip/" << path; - lo_message_add_int32 (reply, ssid); - } - string str_pth = os.str(); - lo_message_add_float (reply, (float) val); - - lo_send_message (addr, str_pth.c_str(), reply); - lo_message_free (reply); - } - if ((_select == get_strip (ssid, addr)) || ((sur->expand == ssid) && (sur->expand_enable))) { - os.str(""); - os << "/select/" << path; - string sel_pth = os.str(); - 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_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) -{ - OSCSurface *sur = get_surface(addr); - - ostringstream os; - lo_message reply; - reply = lo_message_new (); - if (sur->feedback[2]) { - os << "/select/" << path << "/" << id; - } else { - os << "/select/" << path; - lo_message_add_int32 (reply, id); - } - string str_pth = os.str(); - lo_message_add_float (reply, (float) val); - - lo_send_message (addr, str_pth.c_str(), reply); - lo_message_free (reply); - - return 0; -} - XMLNode& OSC::get_state () { XMLNode& node (ControlProtocol::get_state()); - node.set_property ("debugmode", (int32_t) _debugmode); // TODO: enum2str - node.set_property ("address-only", address_only); - node.set_property ("remote-port", remote_port); - node.set_property ("banksize", default_banksize); - node.set_property ("striptypes", default_strip); - node.set_property ("feedback", default_feedback); - node.set_property ("gainmode", default_gainmode); - node.set_property ("send-page-size", default_send_size); - node.set_property ("plug-page-size", default_plugin_size); + node.set_property (X_("debugmode"), (int32_t) _debugmode); // TODO: enum2str + node.set_property (X_("address-only"), address_only); + node.set_property (X_("remote-port"), remote_port); + node.set_property (X_("banksize"), default_banksize); + node.set_property (X_("striptypes"), default_strip); + node.set_property (X_("feedback"), default_feedback); + node.set_property (X_("gainmode"), default_gainmode); + node.set_property (X_("send-page-size"), default_send_size); + node.set_property (X_("plug-page-size"), default_plugin_size); return node; } @@ -4804,70 +5847,111 @@ struct StripableByPresentationOrder }; OSC::Sorted -OSC::get_sorted_stripables(std::bitset<32> types, bool cue) +OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sorted my_list) { Sorted sorted; - - // fetch all stripables StripableList stripables; + StripableList custom_list; + // fetch all stripables session->get_stripables (stripables); - + if (custom) { + uint32_t nstps = my_list.size (); + // check each custom strip to see if it still exists + boost::shared_ptr s; + for (uint32_t i = 0; i < nstps; i++) { + bool exists = false; + s = my_list[i]; + for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { + boost::shared_ptr sl = *it; + if (s == sl) { + exists = true; + break; + } + } + if(!exists) { + my_list[i] = boost::shared_ptr(); + } else { + custom_list.push_back (s); + } + } + if (custom == 1) { + return my_list; + } else { + stripables = custom_list; + } + } // Look for stripables that match bit in sur->strip_types for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { boost::shared_ptr s = *it; + if (!s) { + break; + } + if (custom == 2) { + // banking off use all valid custom strips + sorted.push_back (s); + } else 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(s)) { + sorted.push_back (s); + } else if (types[1] && boost::dynamic_pointer_cast(s)) { + sorted.push_back (s); + } else if (types[4] && boost::dynamic_pointer_cast(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 r = boost::dynamic_pointer_cast (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(s) && !boost::dynamic_pointer_cast(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(s) && !boost::dynamic_pointer_cast(s)) { + boost::shared_ptr r = boost::dynamic_pointer_cast(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()); - // Master/Monitor might be anywhere... we put them at the end - Sorry ;) - if (types[5]) { - sorted.push_back (session->master_out()); + if (!custom || (custom & 0x2)) { + sort (sorted.begin(), sorted.end(), StripableByPresentationOrder()); } - if (types[6]) { - sorted.push_back (session->monitor_out()); + if (!custom) { + // Master/Monitor might be anywhere... we put them at the end - Sorry ;) + if (types[5]) { + sorted.push_back (session->master_out()); + } + if (types[6]) { + if (session->monitor_out()) { + sorted.push_back (session->monitor_out()); + } + } } return sorted; } @@ -4875,43 +5959,72 @@ OSC::get_sorted_stripables(std::bitset<32> types, bool cue) int OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) { + OSCSurface *s = get_surface(get_address (msg), true); + s->bank_size = 0; + float value = 0; + if (argc == 1) { + if (types[0] == 'f') { + value = argv[0]->f; + } else if (types[0] == 'i') { + value = (float) argv[0]->i; + } + } int ret = 1; /* unhandled */ - - if (!strncmp (path, "/cue/aux", 8)) { + if (!strncmp (path, X_("/cue/aux"), 8)) { // set our Aux bus - ret = cue_set (argv[0]->i, msg); + if (argc) { + if (value) { + ret = cue_set ((uint32_t) value, msg); + } else { + ret = 0; + } + } } - else if (!strncmp (path, "/cue/connect", 12)) { + else if (!strncmp (path, X_("/cue/connect"), 12)) { // Connect to default Aux bus - if ((!argc) || argv[0]->i) { + if ((!argc) || argv[0]->f || argv[0]->i) { ret = cue_set (1, msg); + } else { + ret = 0; } } - else if (!strncmp (path, "/cue/next_aux", 13)) { + else if (!strncmp (path, X_("/cue/next_aux"), 13)) { // switch to next Aux bus - if ((!argc) || argv[0]->i) { + if ((!argc) || argv[0]->f || argv[0]->i) { ret = cue_next (msg); + } else { + ret = 0; } } - else if (!strncmp (path, "/cue/previous_aux", 17)) { + else if (!strncmp (path, X_("/cue/previous_aux"), 17)) { // switch to previous Aux bus - if ((!argc) || argv[0]->i) { + if ((!argc) || argv[0]->f || argv[0]->i) { ret = cue_previous (msg); + } else { + ret = 0; } } - else if (!strncmp (path, "/cue/send/fader/", 16) && strlen (path) > 16) { - int id = atoi (&path[16]); - ret = cue_send_fader (id, argv[0]->f, msg); + else if (!strncmp (path, X_("/cue/send/fader/"), 16) && strlen (path) > 16) { + if (argc == 1) { + int id = atoi (&path[16]); + ret = cue_send_fader (id, value, msg); + } } - else if (!strncmp (path, "/cue/send/enable/", 17) && strlen (path) > 17) { - int id = atoi (&path[17]); - ret = cue_send_enable (id, argv[0]->f, msg); + else if (!strncmp (path, X_("/cue/send/enable/"), 17) && strlen (path) > 17) { + if (argc == 1) { + int id = atoi (&path[17]); + ret = cue_send_enable (id, value, msg); + } } - else if (!strncmp (path, "/cue/fader", 10)) { - ret = cue_aux_fader (argv[0]->f, msg); + else if (!strncmp (path, X_("/cue/fader"), 10)) { + if (argc == 1) { + ret = cue_aux_fader (value, msg); + } } - else if (!strncmp (path, "/cue/mute", 9)) { - ret = cue_aux_mute (argv[0]->f, msg); + else if (!strncmp (path, X_("/cue/mute"), 9)) { + if (argc == 1) { + ret = cue_aux_mute (value, msg); + } } return ret; @@ -4920,6 +6033,7 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo int OSC::cue_set (uint32_t aux, lo_message msg) { + return _cue_set (aux, get_address (msg)); } @@ -4927,13 +6041,13 @@ int OSC::_cue_set (uint32_t aux, lo_address addr) { int ret = 1; - OSCSurface *s = get_surface(addr); + OSCSurface *s = get_surface(addr, true); s->bank_size = 0; s->strip_types = 128; s->feedback = 0; s->gainmode = 1; s->cue = true; - s->strips = get_sorted_stripables(s->strip_types, s->cue); + s->strips = get_sorted_stripables(s->strip_types, s->cue, false, s->custom_strips); s->nstrips = s->strips.size(); @@ -4943,44 +6057,24 @@ OSC::_cue_set (uint32_t aux, lo_address addr) aux = s->nstrips; } s->aux = aux; - - // get rid of any old CueObsevers for this address - //cueobserver_connections.drop_connections (); - CueObservers::iterator x; - for (x = cue_observers.begin(); x != cue_observers.end();) { - - OSCCueObserver* co; - - if ((co = dynamic_cast(*x)) != 0) { - - int res = strcmp(lo_address_get_url(co->address()), lo_address_get_url(addr)); - - if (res == 0) { - delete *x; - x = cue_observers.erase (x); - } else { - ++x; - } - } else { - ++x; - } - } - // get a list of Auxes for (uint32_t n = 0; n < s->nstrips; ++n) { boost::shared_ptr stp = s->strips[n]; if (stp) { - text_message (string_compose ("/cue/name/%1", n+1), stp->name(), addr); + text_message (string_compose (X_("/cue/name/%1"), n+1), stp->name(), addr); if (aux == n+1) { // aux must be at least one - // need a signal if aux vanishes - stp->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::_cue_set, this, aux, addr), this); + stp->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::_cue_set, this, aux, addr), this); // make a list of stripables with sends that go to this bus s->sends = cue_get_sorted_stripables(stp, aux, addr); - // start cue observer - OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr); - cue_observers.push_back (co); + if (s->cue_obs) { + s->cue_obs->refresh_strip (stp, s->sends, true); + } else { + // start cue observer + OSCCueObserver* co = new OSCCueObserver (*this, s); + s->cue_obs = co; + } ret = 0; } @@ -4993,7 +6087,7 @@ OSC::_cue_set (uint32_t aux, lo_address addr) int OSC::cue_next (lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + OSCSurface *s = get_surface(get_address (msg), true); int ret = 1; if (!s->cue) { @@ -5010,13 +6104,15 @@ OSC::cue_next (lo_message msg) int OSC::cue_previous (lo_message msg) { - OSCSurface *s = get_surface(get_address (msg)); + OSCSurface *s = get_surface(get_address (msg), true); int ret = 1; if (!s->cue) { ret = cue_set (1, msg); } if (s->aux > 1) { ret = cue_set (s->aux - 1, msg); + } else { + ret = cue_set (1, msg); } return ret; } @@ -5024,7 +6120,7 @@ OSC::cue_previous (lo_message msg) boost::shared_ptr OSC::cue_get_send (uint32_t id, lo_address addr) { - OSCSurface *s = get_surface(addr); + OSCSurface *s = get_surface(addr, true); if (id && s->aux > 0 && id <= s->sends.size()) { boost::shared_ptr r = boost::dynamic_pointer_cast (s->sends[id - 1]); boost::shared_ptr aux = get_strip (s->aux, addr); @@ -5041,7 +6137,7 @@ OSC::cue_aux_fader (float position, lo_message msg) { if (!session) return -1; - OSCSurface *sur = get_surface(get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg), true); if (sur->cue) { if (sur->aux) { boost::shared_ptr s = get_strip (sur->aux, get_address (msg)); @@ -5054,7 +6150,7 @@ OSC::cue_aux_fader (float position, lo_message msg) } } } - cue_float_message ("/cue/fader", 0, get_address (msg)); + float_message (X_("/cue/fader"), 0, get_address (msg)); return -1; } @@ -5063,7 +6159,7 @@ OSC::cue_aux_mute (float state, lo_message msg) { if (!session) return -1; - OSCSurface *sur = get_surface(get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg), true); if (sur->cue) { if (sur->aux) { boost::shared_ptr s = get_strip (sur->aux, get_address (msg)); @@ -5075,7 +6171,7 @@ OSC::cue_aux_mute (float state, lo_message msg) } } } - cue_float_message ("/cue/mute", 0, get_address (msg)); + float_message (X_("/cue/mute"), 0, get_address (msg)); return -1; } @@ -5092,7 +6188,7 @@ OSC::cue_send_fader (uint32_t id, float val, lo_message msg) return 0; } } - cue_float_message (string_compose ("/cue/send/fader/%1", id), 0, get_address (msg)); + float_message (string_compose (X_("/cue/send/fader/%1"), id), 0, get_address (msg)); return -1; } @@ -5110,12 +6206,13 @@ OSC::cue_send_enable (uint32_t id, float state, lo_message msg) } return 0; } - cue_float_message (string_compose ("/cue/send/enable/%1", id), 0, get_address (msg)); + float_message (string_compose (X_("/cue/send/enable/%1"), id), 0, get_address (msg)); return -1; } +// generic send message int -OSC::cue_float_message (string path, float val, lo_address addr) +OSC::float_message (string path, float val, lo_address addr) { lo_message reply; @@ -5128,6 +6225,52 @@ OSC::cue_float_message (string path, float val, lo_address addr) return 0; } +int +OSC::float_message_with_id (std::string path, uint32_t ssid, float value, bool in_line, lo_address addr) +{ + lo_message msg = lo_message_new (); + if (in_line) { + path = string_compose ("%1/%2", path, ssid); + } else { + lo_message_add_int32 (msg, ssid); + } + lo_message_add_float (msg, value); + + lo_send_message (addr, path.c_str(), msg); + lo_message_free (msg); + return 0; +} + +int +OSC::int_message (string path, int val, lo_address addr) +{ + + lo_message reply; + reply = lo_message_new (); + lo_message_add_int32 (reply, (float) val); + + lo_send_message (addr, path.c_str(), reply); + lo_message_free (reply); + + return 0; +} + +int +OSC::int_message_with_id (std::string path, uint32_t ssid, int value, bool in_line, lo_address addr) +{ + lo_message msg = lo_message_new (); + if (in_line) { + path = string_compose ("%1/%2", path, ssid); + } else { + lo_message_add_int32 (msg, ssid); + } + lo_message_add_int32 (msg, value); + + lo_send_message (addr, path.c_str(), msg); + lo_message_free (msg); + return 0; +} + int OSC::text_message (string path, string val, lo_address addr) { @@ -5142,6 +6285,22 @@ OSC::text_message (string path, string val, lo_address addr) return 0; } +int +OSC::text_message_with_id (std::string path, uint32_t ssid, std::string val, bool in_line, lo_address addr) +{ + lo_message msg = lo_message_new (); + if (in_line) { + path = string_compose ("%1/%2", path, ssid); + } else { + lo_message_add_int32 (msg, ssid); + } + + lo_message_add_string (msg, val.c_str()); + + lo_send_message (addr, path.c_str(), msg); + lo_message_free (msg); + return 0; +} // we have to have a sorted list of stripables that have sends pointed at our aux // we can use the one in osc.cc to get an aux list @@ -5149,7 +6308,6 @@ OSC::Sorted OSC::cue_get_sorted_stripables(boost::shared_ptr aux, uint32_t id, lo_message msg) { Sorted sorted; - cueobserver_connections.drop_connections (); // fetch all stripables StripableList stripables;