X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.cc;h=7c46f5bf6c14daf727d567466e2dd5e5b15b01b1;hb=7b42c7e361bbfa1e7e461cce16409cdfeb9e4dde;hp=905fbf87ef4ee84e66b2ff28a1119111d9fcdd95;hpb=34a926fc510ebe356d8212ec3d0070124e16eb08;p=ardour.git diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 905fbf87ef..7c46f5bf6c 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -29,6 +29,7 @@ #include #include "pbd/control_math.h" +#include "pbd/controllable.h" #include #include #include @@ -37,6 +38,7 @@ #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" @@ -44,6 +46,8 @@ #include "ardour/dB.h" #include "ardour/filesystem_paths.h" #include "ardour/panner.h" +#include "ardour/panner_shell.h" +#include "ardour/pannable.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/presentation_info.h" @@ -411,233 +415,244 @@ 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, "/strip/custom/mode", "f", custom_mode); - REGISTER_CALLBACK (serv, "/strip/custom/clear", "f", custom_clear); - REGISTER_CALLBACK (serv, "/strip/custom/clear", "", custom_clear); - REGISTER_CALLBACK (serv, "/surface/list", "", surface_list); - REGISTER_CALLBACK (serv, "/surface/list", "f", surface_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_sample); - 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, "/click/level", "f", click_level); - 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, "/use_group", "f", use_group); + 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/db_delta", "f", master_delta_gain); - REGISTER_CALLBACK (serv, "/master/mute", "i", master_set_mute); - REGISTER_CALLBACK (serv, "/master/trimdB", "f", master_set_trim); - REGISTER_CALLBACK (serv, "/master/pan_stereo_position", "f", master_set_pan_stereo_position); - REGISTER_CALLBACK (serv, "/master/select", "f", master_select); - REGISTER_CALLBACK (serv, "/monitor/gain", "f", monitor_set_gain); - REGISTER_CALLBACK (serv, "/monitor/fader", "f", monitor_set_fader); - REGISTER_CALLBACK (serv, "/monitor/db_delta", "f", monitor_delta_gain); - 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/db_delta", "f", sel_dB_delta); - 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/plugin/activate", "f", sel_plugin_activate); - 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/bus/only"), "f", sel_bus_only); + REGISTER_CALLBACK (serv, X_("/select/bus/only"), "", sel_bus_only); + 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/db_delta"), "if", strip_db_delta); + 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); @@ -743,7 +758,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"); @@ -759,11 +774,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()); } @@ -772,9 +787,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); } @@ -805,32 +820,33 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ 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, "/automation")) { + 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; @@ -840,10 +856,10 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ ret = 0; } else - if (strcmp (path, "/strip/listen") == 0) { + if (strcmp (path, X_("/strip/listen")) == 0) { if (argc <= 0) { PBD::warning << "OSC: Wrong number of parameters." << endmsg; - } else if (sur->custom_mode) { + } else if (sur->custom_mode && (sur->custom_mode < GroupOnly)) { PBD::warning << "OSC: Can't add strips with custom enabled." << endmsg; } else { for (int n = 0; n < argc; ++n) { @@ -863,10 +879,10 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ } ret = 0; } else - if (strcmp (path, "/strip/ignore") == 0) { + if (strcmp (path, X_("/strip/ignore")) == 0) { if (argc <= 0) { PBD::warning << "OSC: Wrong number of parameters." << endmsg; - } else if (!sur->custom_mode) { + } else if (!sur->custom_mode || (sur->custom_mode >= GroupOnly)) { PBD::warning << "OSC: Can't remove strips without custom enabled." << endmsg; } else { for (int n = 0; n < argc; ++n) { @@ -888,21 +904,21 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ ret = 0; } else - if (strstr (path, "/strip") && (argc != 1)) { + 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, "/strip/gain/", 12) && strlen (path) > 12) { + 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; @@ -926,85 +942,95 @@ 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 (strstr (path, "/select") && (argc != 1)) { + } + else if (strstr (path, X_("/select/group"))) { + ret = parse_sel_group (path, types, argv, argc, msg); + } + else if (strstr (path, X_("/select/vca"))) { + ret = parse_sel_vca (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, "/select/send_gain/", 18) && strlen (path) > 18) { + 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, "/marker", 7)) { + else if (!strncmp (path, X_("/marker"), 7)) { ret = set_marker (types, argv, argc, msg); } - else if (!strncmp (path, "/set_surface", 12)) { + else if (!strncmp (path, X_("/set_surface"), 12)) { ret = surface_parse (path, types, argv, argc, msg); } - else if (strstr (path, "/link")) { + else if (strstr (path, X_("/link"))) { ret = parse_link (path, types, argv, argc, msg); } if (ret) { @@ -1090,7 +1116,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); } @@ -1114,37 +1140,37 @@ 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_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_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_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_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_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_sample()); @@ -1226,9 +1252,9 @@ OSC::routes_list (lo_message msg) lo_message_add_int32 (reply, s->rec_enable_control()->get_value()); } 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); } @@ -1237,7 +1263,7 @@ 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_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()) { @@ -1248,9 +1274,9 @@ 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); @@ -1283,7 +1309,16 @@ OSC::get_surfaces () Glib::Threads::Mutex::Lock lm (surfaces_lock); for (uint32_t it = 0; it < _surface.size(); it++) { OSCSurface* sur = &_surface[it]; - PBD::info << string_compose ("\n Surface: %1 - URL: %2\n", it, sur->remote_url); + 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; @@ -1325,7 +1360,7 @@ OSC::custom_clear (lo_message msg) return 0; } OSCSurface *sur = get_surface(get_address (msg), true); - sur->custom_mode = 0; + sur->custom_mode = CusOff; sur->custom_strips.clear (); sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, false, sur->custom_strips); sur->nstrips = sur->strips.size(); @@ -1333,7 +1368,7 @@ OSC::custom_clear (lo_message msg) uint32_t ls = sur->linkset; if (ls) { set = &(link_sets[ls]); - set->custom_mode = 0; + set->custom_mode = CusOff; set->custom_strips.clear (); set->strips = sur->strips; } @@ -1342,11 +1377,17 @@ OSC::custom_clear (lo_message msg) int OSC::custom_mode (float state, lo_message msg) +{ + return _custom_mode ((OSCCustomMode) (int)state, get_address (msg)); +} + +int +OSC::_custom_mode (OSCCustomMode state, lo_address addr) { if (!session) { return 0; } - OSCSurface *sur = get_surface(get_address (msg), true); + OSCSurface *sur = get_surface(addr, true); LinkSet *set; uint32_t ls = sur->linkset; @@ -1358,22 +1399,22 @@ OSC::custom_mode (float state, lo_message msg) if (state > 0){ if (sur->custom_strips.size () == 0) { PBD::warning << "No custom strips set to enable" << endmsg; - sur->custom_mode = 0; + sur->custom_mode = CusOff; if (ls) { - set->custom_mode = 0; + set->custom_mode = CusOff; } return -1; } else { if (sur->bank_size) { - sur->custom_mode = (uint32_t) state | 0x4; + sur->custom_mode = (OSCCustomMode) (state | 0x4); } else { - sur->custom_mode = (uint32_t) state; + sur->custom_mode = 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->custom_mode = CusOff; sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 0, sur->custom_strips); sur->nstrips = sur->strips.size(); } @@ -1381,7 +1422,7 @@ OSC::custom_mode (float state, lo_message msg) set->custom_mode = sur->custom_mode; set->strips = sur->strips; } - return set_bank (1, msg); + return _set_bank (1, addr); } int @@ -1394,16 +1435,45 @@ 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) { @@ -1434,6 +1504,7 @@ OSC::clear_devices () } _surface.clear(); link_sets.clear (); + _ports.clear (); PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); @@ -1473,7 +1544,7 @@ OSC::parse_link (const char *path, const char* types, lo_arg **argv, int argc, l if (!set) { return 0; } - if (!strncmp (path, "/link/bank_size", 15)) { + if (!strncmp (path, X_("/link/bank_size"), 15)) { ls->banksize = (uint32_t) data; ls->autobank = false; ls->not_ready = link_check (set); @@ -1485,7 +1556,7 @@ OSC::parse_link (const char *path, const char* types, lo_arg **argv, int argc, l } ret = 0; - } else if (!strncmp (path, "/link/set", 9)) { + } else if (!strncmp (path, X_("/link/set"), 9)) { ret = set_link (set, (uint32_t) data, get_address (msg)); } @@ -1662,64 +1733,78 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc 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, "/set_surface/feedback", 21)) { + 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, "/set_surface/bank_size", 22)) { + 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, "/set_surface/gainmode", 21)) { + 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, "/set_surface/strip_types", 24)) { + 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, "/set_surface/send_page_size", 27)) { + 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 (argc == 1 && !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') { - linkid = (int) argv[7]->f; + linkset = (int) argv[7]->f; } else { - linkid = argv[7]->i; + linkset = argv[7]->i; } case 7: if (types[6] == 'f') { - linkset = (int) argv[6]->f; + port = (int) argv[6]->f; } else { - linkset = argv[6]->i; + port = argv[6]->i; } case 6: if (types[5] == 'f') { @@ -1757,6 +1842,7 @@ 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)); @@ -1774,7 +1860,8 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc lo_message_add_int32 (reply, pi_page); lo_message_add_int32 (reply, (int) linkset); lo_message_add_int32 (reply, (int) linkid); - lo_send_message (get_address (msg), "/set_surface", reply); + lo_message_add_int32 (reply, (int) port); + lo_send_message (get_address (msg), X_("/set_surface"), reply); lo_message_free (reply); return 0; } @@ -1803,24 +1890,34 @@ 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 * ls = strstr (&pp[1], "/"); - if (ls) { - linkset = atoi (&ls[1]); - const char * li = strstr (&ls[1], "/"); - if (li) { - linkid = atoi (&li[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') { - linkid = (int) argv[0]->f; + linkset = (int) argv[0]->f; } else if (types[0] == 'i') { - linkid = argv[0]->i; + linkset = argv[0]->i; } } } else { if (types[0] == 'f') { - linkset = (int) argv[0]->f; + port = (int) argv[0]->f; } else if (types[0] == 'i') { - linkset = argv[0]->i; + port = argv[0]->i; } } } else { @@ -1858,6 +1955,7 @@ 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)); @@ -1874,9 +1972,7 @@ OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, ui } 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->custom_mode = CusOff; s->strip_types = strips; s->feedback = fb; s->gainmode = gm; @@ -1911,7 +2007,7 @@ OSC::set_surface_bank_size (uint32_t bs, lo_message msg) OSCSurface *s = get_surface(get_address (msg), true); s->bank_size = bs; if (s->custom_mode && bs) { - s->custom_mode = s->custom_mode | 0x4; + s->custom_mode = (OSCCustomMode) (s->custom_mode | 0x4); } if (s->linkset) { set_link (s->linkset, s->linkid, get_address (msg)); @@ -1930,6 +2026,7 @@ OSC::set_surface_strip_types (uint32_t st, lo_message msg) } OSCSurface *s = get_surface(get_address (msg), true); s->strip_types = st; + s->custom_mode = CusOff; if (s->strip_types[10]) { s->usegroup = PBD::Controllable::UseGroup; } else { @@ -1975,6 +2072,62 @@ OSC::set_surface_gainmode (uint32_t gm, lo_message 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) { @@ -1990,21 +2143,13 @@ 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 surface - if (!_surface[it].remote_url.find(r_url)){ - return &_surface[it]; - } + for (uint32_t it = 0; it < _surface.size(); ++it) { + //find setup for this surface + if (!_surface[it].remote_url.find(r_url)){ + return &_surface[it]; } } @@ -2012,7 +2157,7 @@ OSC::get_surface (lo_address addr , bool quiet) 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; s.observers.clear(); @@ -2023,7 +2168,7 @@ OSC::get_surface (lo_address addr , bool quiet) s.gainmode = default_gainmode; s.usegroup = PBD::Controllable::NoGroup; s.custom_strips.clear (); - s.custom_mode = 0; + s.custom_mode = CusOff; s.sel_obs = 0; s.expand = 0; s.expand_enable = false; @@ -2057,11 +2202,14 @@ OSC::get_surface (lo_address addr , bool quiet) void OSC::global_feedback (OSCSurface* sur) { + OSCGlobalObserver* o = sur->global_obs; + delete o; if (sur->feedback[4] || sur->feedback[3] || sur->feedback[5] || sur->feedback[6]) { // create a new Global Observer for this surface OSCGlobalObserver* o = new OSCGlobalObserver (*this, *session, sur); sur->global_obs = o; + o->jog_mode (sur->jogmode); } } @@ -2078,11 +2226,13 @@ OSC::strip_feedback (OSCSurface* sur, bool new_bank_size) } sur->custom_mode = set->custom_mode; sur->custom_strips = set->custom_strips; + sur->temp_strips = set->temp_strips; } - if (sur->custom_strips.size () == 0) { - sur->custom_mode = 0; + if (sur->custom_mode < GroupOnly) { + 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->strips = get_sorted_stripables(sur->strip_types, sur->cue, sur->custom_mode, sur->custom_strips); sur->nstrips = sur->strips.size(); if (ls) { set->strips = sur->strips; @@ -2107,6 +2257,14 @@ OSC::strip_feedback (OSCSurface* sur, bool new_bank_size) for (uint32_t i = 0; i < bank_size; i++) { OSCRouteObserver* o = new OSCRouteObserver (*this, i + 1, sur); sur->observers.push_back (o); + if (sur->custom_mode == BusOnly) { + boost::shared_ptr str = get_strip (i + 1, lo_address_new_from_url (sur->remote_url.c_str())); + boost::shared_ptr send = get_send (str, lo_address_new_from_url (sur->remote_url.c_str())); + if (send) { + o->refresh_send (send, true); + } + } + } } } else { @@ -2114,6 +2272,12 @@ OSC::strip_feedback (OSCSurface* sur, bool new_bank_size) 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); + if (sur->custom_mode == BusOnly) { + boost::shared_ptr send = get_send (str, lo_address_new_from_url (sur->remote_url.c_str())); + if (send) { + sur->observers[i]->refresh_send (send, true); + } + } } } } @@ -2172,7 +2336,7 @@ OSC::_recalcbanks () // 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); @@ -2218,17 +2382,25 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr) set->bank = bank_start; uint32_t not_ready = 0; for (uint32_t dv = 1; dv < d_count; dv++) { - OSCSurface *sur; if (set->urls[dv] != "") { string url = set->urls[dv]; - sur = get_surface (lo_address_new_from_url (url.c_str())); + 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 (sur->linkset != ls) { - set->urls[dv] = ""; - not_ready = dv; - } if (not_ready) { if (!set->not_ready) { set->not_ready = not_ready; @@ -2236,14 +2408,6 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr) set->bank = 1; break; } - 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); } if (not_ready) { surface_link_state (set); @@ -2314,7 +2478,7 @@ OSC::bank_leds (OSCSurface* s) } 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 (bank > 1) { @@ -2322,7 +2486,7 @@ OSC::bank_leds (OSCSurface* s) } 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); } } @@ -2393,6 +2557,335 @@ OSC::use_group (float value, lo_message msg) 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; + } + 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/only"), 18)) { + if (!rg) { + return ret; + } + 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 = GroupOnly; + set_bank (1, msg); + ret = 0; + } else { + // key off is ignored + ret = 0; + } + } + else if (!strncmp (path, X_("/select/group/enable"), 20)) { + if (rg) { + if (argc == 1) { + rg->set_active (value, this); + ret = 0; + } + } else { + int_message (X_("/select/group/enable"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/gain")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_gain ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/gain"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/relative")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_relative ((bool) value, this); + ret = 0; + } + } else { + int_message (X_("/select/group/relative"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/mute")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_mute ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/mute"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/solo")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_solo ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/solo"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/recenable")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_recenable ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/recenable"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/select")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_select ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/select"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/active")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_route_active ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/active"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/color")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_color ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/color"), 0, get_address (msg)); + } + } + else if (strcmp (path, X_("/select/group/monitoring")) == 0) { + if (rg) { + if (argc == 1) { + rg->set_monitoring ((bool) value); + ret = 0; + } + } else { + int_message (X_("/select/group/monitoring"), 0, get_address (msg)); + } + } + } + return ret; + } + +// this gets called for anything that starts with /select/vca +int +OSC::parse_sel_vca (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) { + string svalue = ""; + uint32_t ivalue = 1024; + if (strcmp (path, X_("/select/vca")) == 0) { + if (argc == 2) { + if (types[0] == 's') { + svalue = &argv[0]->s; + if (types[1] == 'i') { + ivalue = argv[1]->i; + } else if (types[1] == 'f') { + ivalue = (uint32_t) argv[1]->f; + } else { + return 1; + } + boost::shared_ptr vca = get_vca_by_name (svalue); + if (vca) { + boost::shared_ptr slv = boost::dynamic_pointer_cast (s); + if (ivalue) { + slv->assign (vca); + } else { + slv->unassign (vca); + } + ret = 0; + } + } + } else { + PBD::warning << "OSC: setting a vca needs both the vca name and it's state" << endmsg; + } + } + else if (!strncmp (path, X_("/select/vca/only"), 16)) { + if (argc == 1) { + if (types[0] == 'f') { + ivalue = (uint32_t) argv[0]->f; + } else if (types[0] == 'i') { + ivalue = (uint32_t) argv[0]->i; + } + } + boost::shared_ptr vca = boost::dynamic_pointer_cast (s); + if (vca) { + if ((argc == 1 && ivalue) || !argc) { + sur->temp_strips.clear(); + StripableList stripables; + session->get_stripables (stripables); + for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { + boost::shared_ptr st = *it; + if (st->slaved_to (vca)) { + sur->temp_strips.push_back(st); + } + } + sur->temp_strips.push_back(s); + sur->custom_mode = VCAOnly; + set_bank (1, msg); + ret = 0; + } else { + // key off is ignored + ret = 0; + } + } else { + PBD::warning << "OSC: Select is not a VCA right now" << endmsg; + } + } + } + return ret; +} + +boost::shared_ptr +OSC::get_vca_by_name (std::string vname) +{ + StripableList stripables; + session->get_stripables (stripables); + for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { + boost::shared_ptr s = *it; + boost::shared_ptr v = boost::dynamic_pointer_cast (s); + if (v) { + if (vname == v->name()) { + return v; + } + } + } + return boost::shared_ptr(); +} + +int +OSC::sel_bus_only (lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s = sur->select; + if (s) { + boost::shared_ptr rt = boost::dynamic_pointer_cast (s); + if (rt) { + if (!rt->is_track () && rt->can_solo () && rt->fed_by().size()) { + // this is a bus, but not master, monitor or audition + sur->temp_strips.clear(); + StripableList stripables; + session->get_stripables (stripables); + for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { + boost::shared_ptr st = *it; + boost::shared_ptr ri = boost::dynamic_pointer_cast (st); + bool sends = true; + if (ri && ri->direct_feeds_according_to_graph (rt, &sends)) { + sur->temp_strips.push_back(st); + } + } + sur->temp_strips.push_back(s); + sur->custom_mode = BusOnly; + set_bank (1, msg); + return 0; + } + } + } + return 1; +} + +boost::shared_ptr +OSC::get_send (boost::shared_ptr st, lo_address addr) +{ + OSCSurface *sur = get_surface(addr); + boost::shared_ptr s = sur->select; + if (st && s && (st != s)) { + boost::shared_ptr rt = boost::dynamic_pointer_cast (s); + boost::shared_ptr rst = boost::dynamic_pointer_cast (st); + //find what send number feeds s + return rst->internal_send_for (rt); + } + return boost::shared_ptr (); +} + +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) { @@ -2608,7 +3101,7 @@ OSC::transport_sample (lo_message msg) 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); } @@ -2625,7 +3118,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); } @@ -2642,7 +3135,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); } @@ -2701,21 +3194,24 @@ 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.1)); @@ -2723,46 +3219,34 @@ OSC::jog (float delta, lo_message msg) 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; @@ -2776,56 +3260,13 @@ 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); - } - - switch((uint32_t)mode) - { - case JOG : - text_message ("/jog/mode/name", "Jog", get_address (msg)); - s->jogmode = JOG; - break; - case SCRUB: - text_message ("/jog/mode/name", "Scrub", get_address (msg)); - s->jogmode = SCRUB; - break; - case SHUTTLE: - text_message ("/jog/mode/name", "Shuttle", get_address (msg)); - s->jogmode = SHUTTLE; - break; - case SCROLL: - text_message ("/jog/mode/name", "Scroll", get_address (msg)); - s->jogmode = SCROLL; - break; - case TRACK: - text_message ("/jog/mode/name", "Track", get_address (msg)); - s->jogmode = TRACK; - break; - case BANK: - text_message ("/jog/mode/name", "Bank", get_address (msg)); - s->jogmode = BANK; - break; - case NUDGE: - text_message ("/jog/mode/name", "Nudge", get_address (msg)); - s->jogmode = NUDGE; - break; - case MARKER: - text_message ("/jog/mode/name", "Marker", get_address (msg)); - s->jogmode = MARKER; - break; - default: - PBD::warning << "Jog Mode: " << mode << " is not valid." << endmsg; - break; - lo_message reply = lo_message_new (); - lo_message_add_int32 (reply, s->jogmode); - lo_send_message (get_address(msg), "/jog/mode", reply); - lo_message_free (reply); - + 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; - } // two structs to help with going to markers @@ -2854,13 +3295,24 @@ OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg) switch (types[0]) { case 's': - 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; + { + 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 'i': @@ -2892,6 +3344,30 @@ OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg) 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()); + } + lo_send_message (addr, X_("/group/list"), reply); + lo_message_free (reply); + return 0; +} + int OSC::click_level (float position) { @@ -2988,7 +3464,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); } @@ -3157,7 +3633,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); @@ -3221,7 +3697,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; } @@ -3239,6 +3715,7 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg uint32_t ctr = 0; uint32_t aut = 0; uint32_t ssid; + boost::shared_ptr send = boost::shared_ptr (); if (argc) { if (types[argc - 1] == 'f') { @@ -3249,7 +3726,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') { @@ -3262,13 +3739,10 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg ssid = atoi (&(strrchr (path, '/' ))[1]); strp = get_strip (ssid, get_address (msg)); } + send = get_send (strp, get_address (msg)); ctr = 7; - } else if (!strncmp (path, "/select/", 8)) { - if (sur->expand_enable && sur->expand) { - strp = get_strip (sur->expand, get_address (msg)); - } else { - strp = _select; - } + } else if (!strncmp (path, X_("/select/"), 8)) { + strp = sur->select; ctr = 8; } else { return ret; @@ -3276,12 +3750,15 @@ 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 { PBD::warning << "No fader for this strip" << endmsg; } + if (send) { + control = send->gain_control (); + } } else { PBD::warning << "Automation not available for " << path << endmsg; } @@ -3305,6 +3782,10 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg control->set_automation_state (ARDOUR::Touch); ret = 0; break; + case 4: + control->set_automation_state (ARDOUR::Latch); + ret = 0; + break; default: break; } @@ -3322,6 +3803,7 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, int ret = 1; OSCSurface *sur = get_surface(get_address (msg)); boost::shared_ptr strp = boost::shared_ptr(); + boost::shared_ptr send = boost::shared_ptr (); uint32_t ctr = 0; uint32_t touch = 0; uint32_t ssid; @@ -3335,7 +3817,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') { @@ -3348,8 +3830,9 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, ssid = atoi (&(strrchr (path, '/' ))[1]); strp = get_strip (ssid, get_address (msg)); } + send = get_send (strp, 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 { @@ -3362,12 +3845,15 @@ 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 { PBD::warning << "No fader for this strip" << endmsg; } + if (send) { + control = send->gain_control (); + } } else { PBD::warning << "Automation not available for " << path << endmsg; } @@ -3415,13 +3901,16 @@ OSC::route_mute (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/mute"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->mute_control()) { s->mute_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup); return 0; } } - return float_message_with_id ("/strip/mute", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/mute"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3440,7 +3929,7 @@ OSC::sel_mute (uint32_t yn, lo_message msg) return 0; } } - return float_message("/select/mute", 0, get_address (msg)); + return float_message(X_("/select/mute"), 0, get_address (msg)); } int @@ -3451,12 +3940,15 @@ OSC::route_solo (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/solo"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->solo_control()) { s->solo_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup); } } - return float_message_with_id ("/strip/solo", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/solo"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3467,13 +3959,16 @@ OSC::route_solo_iso (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/solo_iso"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->solo_isolate_control()) { s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup); return 0; } } - return float_message_with_id ("/strip/solo_iso", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/solo_iso"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3484,13 +3979,16 @@ OSC::route_solo_safe (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/solo_safe"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->solo_safe_control()) { s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup); return 0; } } - return float_message_with_id ("/strip/solo_safe", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/solo_safe"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3508,7 +4006,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 float_message("/select/solo", 0, get_address (msg)); + return float_message(X_("/select/solo"), 0, get_address (msg)); } int @@ -3527,7 +4025,7 @@ OSC::sel_solo_iso (uint32_t yn, lo_message msg) return 0; } } - return float_message("/select/solo_iso", 0, get_address (msg)); + return float_message(X_("/select/solo_iso"), 0, get_address (msg)); } int @@ -3546,7 +4044,7 @@ OSC::sel_solo_safe (uint32_t yn, lo_message msg) return 0; } } - return float_message("/select/solo_safe", 0, get_address (msg)); + return float_message(X_("/select/solo_safe"), 0, get_address (msg)); } int @@ -3567,7 +4065,7 @@ OSC::sel_recenable (uint32_t yn, lo_message msg) } } } - return float_message("/select/recenable", 0, get_address (msg)); + return float_message(X_("/select/recenable"), 0, get_address (msg)); } int @@ -3578,6 +4076,9 @@ OSC::route_recenable (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/recenable"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->rec_enable_control()) { s->rec_enable_control()->set_value (yn, sur->usegroup); if (s->rec_enable_control()->get_value()) { @@ -3585,22 +4086,150 @@ OSC::route_recenable (int ssid, int yn, lo_message msg) } } } - return float_message_with_id ("/strip/recenable", ssid, 0, sur->feedback[2], 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; + } + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s = get_strip(ssid, get_address(msg)); + + if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1-Send", s->name()), sur->feedback[2], get_address(msg)); + return 1; + } + 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 @@ -3621,7 +4250,7 @@ OSC::sel_recsafe (uint32_t yn, lo_message msg) } } } - return float_message("/select/record_safe", 0, get_address (msg)); + return float_message(X_("/select/record_safe"), 0, get_address (msg)); } int @@ -3631,6 +4260,9 @@ OSC::route_recsafe (int ssid, int yn, lo_message msg) boost::shared_ptr s = get_strip (ssid, get_address (msg)); OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/record_safe"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->rec_safe_control()) { s->rec_safe_control()->set_value (yn, sur->usegroup); if (s->rec_safe_control()->get_value()) { @@ -3638,7 +4270,7 @@ OSC::route_recsafe (int ssid, int yn, lo_message msg) } } } - return float_message_with_id ("/strip/record_safe", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/record_safe"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3649,6 +4281,9 @@ OSC::route_monitor_input (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/monitor_input"), ssid, 0, sur->feedback[2], get_address (msg)); + } boost::shared_ptr track = boost::dynamic_pointer_cast (s); if (track) { if (track->monitoring_control()) { @@ -3660,7 +4295,7 @@ OSC::route_monitor_input (int ssid, int yn, lo_message msg) } } - return float_message_with_id ("/strip/monitor_input", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/monitor_input"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3684,7 +4319,7 @@ OSC::sel_monitor_input (uint32_t yn, lo_message msg) } } } - return float_message("/select/monitor_input", 0, get_address (msg)); + return float_message(X_("/select/monitor_input"), 0, get_address (msg)); } int @@ -3695,6 +4330,9 @@ OSC::route_monitor_disk (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/monitor_disk"), ssid, 0, sur->feedback[2], get_address (msg)); + } boost::shared_ptr track = boost::dynamic_pointer_cast (s); if (track) { if (track->monitoring_control()) { @@ -3706,7 +4344,7 @@ OSC::route_monitor_disk (int ssid, int yn, lo_message msg) } } - return float_message_with_id ("/strip/monitor_disk", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/monitor_disk"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3730,7 +4368,7 @@ OSC::sel_monitor_disk (uint32_t yn, lo_message msg) } } } - return float_message("/select/monitor_disk", 0, get_address (msg)); + return float_message(X_("/select/monitor_disk"), 0, get_address (msg)); } @@ -3742,13 +4380,16 @@ OSC::strip_phase (int ssid, int yn, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/polarity"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->phase_control()) { s->phase_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup); return 0; } } - return float_message_with_id ("/strip/polarity", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/polarity"), ssid, 0, sur->feedback[2], get_address (msg)); } int @@ -3767,23 +4408,50 @@ OSC::sel_phase (uint32_t yn, lo_message msg) return 0; } } - return float_message("/select/polarity", 0, get_address (msg)); + return float_message(X_("/select/polarity"), 0, get_address (msg)); } int OSC::strip_expand (int ssid, int yn, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s = get_strip (ssid, get_address (msg)); + if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + uint32_t val = 0; + if (ssid == (int) sur->expand) { + val = 1; + } + return float_message_with_id (X_("/strip/expand"), ssid, val, sur->feedback[2], get_address (msg)); + } + } sur->expand_enable = (bool) yn; sur->expand = ssid; - boost::shared_ptr s; + boost::shared_ptr sel; if (yn) { - s = get_strip (ssid, get_address (msg)); + sel = get_strip (ssid, get_address (msg)); } else { - s = _select; + sel = _select; } - return _strip_select (s, get_address (msg)); + return _strip_select (sel, get_address (msg)); +} + +int +OSC::strip_hide (int ssid, int state, lo_message msg) +{ + boost::shared_ptr s = get_strip (ssid, get_address (msg)); + OSCSurface *sur = get_surface(get_address (msg)); + + if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/hide"), ssid, 0, sur->feedback[2], get_address (msg)); + } + if (state != s->is_hidden ()) { + s->presentation_info().set_hidden ((bool) state); + } + } + return 0; } int @@ -3793,6 +4461,7 @@ OSC::_strip_select (boost::shared_ptr s, lo_address addr) return -1; } OSCSurface *sur = get_surface(addr, true); + boost::shared_ptr old_sel = sur->select; if (!s) { // expand doesn't point to a stripable, turn it off and use select sur->expand = 0; @@ -3804,7 +4473,12 @@ OSC::_strip_select (boost::shared_ptr s, lo_address addr) } _select = s; } - sur->select = s; + if (s != old_sel) { + sur->select = s; + if (sur->custom_mode >= GroupOnly) { + _custom_mode (CusOff, addr); + } + } bool sends; uint32_t nsends = 0; do { @@ -3821,9 +4495,9 @@ OSC::_strip_select (boost::shared_ptr s, lo_address addr) OSCSelectObserver* so = dynamic_cast(sur->sel_obs); if (sur->feedback[13]) { if (so != 0) { - so->refresh_strip (s, nsends, true); + so->refresh_strip (s, nsends, sur->gainmode, true); } else { - OSCSelectObserver* sel_fb = new OSCSelectObserver (*this, sur); + OSCSelectObserver* sel_fb = new OSCSelectObserver (*this, *session, sur); sur->sel_obs = sel_fb; } sur->sel_obs->set_expand (sur->expand_enable); @@ -3875,13 +4549,16 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg) return -1; } OSCSurface *sur = get_surface(get_address (msg)); - sur->expand_enable = false; boost::shared_ptr s = get_strip (ssid, get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return -1; + } + sur->expand_enable = false; SetStripableSelection (s); } else { if ((int) (sur->feedback.to_ulong())) { - float_message_with_id ("/strip/select", ssid, 0, sur->feedback[2], get_address (msg)); + float_message_with_id (X_("/strip/select"), ssid, 0, sur->feedback[2], get_address (msg)); } } @@ -3904,27 +4581,6 @@ OSC::sel_expand (uint32_t state, lo_message msg) return _strip_select (s, get_address (msg)); } -int -OSC::route_set_gain_abs (int ssid, float level, lo_message msg) -{ - if (!session) return -1; - boost::shared_ptr s = get_strip (ssid, get_address (msg)); - OSCSurface *sur = get_surface(get_address (msg)); - - if (s) { - if (s->gain_control()) { - fake_touch (s->gain_control()); - s->gain_control()->set_value (level, sur->usegroup); - } else { - return 1; - } - } else { - return 1; - } - - return 0; -} - int OSC::route_set_gain_dB (int ssid, float dB, lo_message msg) { @@ -3932,16 +4588,31 @@ OSC::route_set_gain_dB (int ssid, float dB, lo_message msg) return -1; } OSCSurface *sur = get_surface(get_address (msg)); - int ret; - if (dB < -192) { - ret = route_set_gain_abs (ssid, 0.0, msg); - } else { - ret = route_set_gain_abs (ssid, dB_to_coefficient (dB), msg); - } - if (ret != 0) { - return float_message_with_id ("/strip/gain", ssid, -193, sur->feedback[2], get_address (msg)); + boost::shared_ptr s = get_strip (ssid, get_address (msg)); + if (s) { + boost::shared_ptr gain_control; + if (sur->custom_mode == BusOnly && get_send (s, get_address (msg))) { + gain_control = get_send(s, get_address (msg))->gain_control(); + } else { + gain_control = s->gain_control(); + } + float abs; + if (gain_control) { + if (dB < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (dB); + float top = gain_control->upper(); + if (abs > top) { + abs = top; + } + } + fake_touch (gain_control); + gain_control->set_value (abs, sur->usegroup); + return 0; + } } - return 0; + return float_message_with_id (X_("/strip/gain"), ssid, -193, sur->feedback[2], get_address (msg)); } int @@ -3949,11 +4620,7 @@ OSC::sel_gain (float val, 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; - } + s = sur->select; if (s) { float abs; if (s->gain_control()) { @@ -3971,7 +4638,7 @@ OSC::sel_gain (float val, lo_message msg) return 0; } } - return float_message("/select/gain", -193, get_address (msg)); + return float_message(X_("/select/gain"), -193, get_address (msg)); } int @@ -3979,11 +4646,7 @@ OSC::sel_dB_delta (float delta, 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; - } + s = sur->select; if (s) { if (s->gain_control()) { float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; @@ -4002,7 +4665,7 @@ OSC::sel_dB_delta (float delta, lo_message msg) return 0; } } - return float_message("/select/gain", -193, get_address (msg)); + return float_message(X_("/select/gain"), -193, get_address (msg)); } int @@ -4015,14 +4678,20 @@ OSC::route_set_gain_fader (int ssid, float pos, lo_message 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), sur->usegroup); + boost::shared_ptr gain_control; + if (sur->custom_mode == BusOnly && get_send (s, get_address (msg))) { + gain_control = get_send(s, get_address (msg))->gain_control(); } else { - return float_message_with_id ("/strip/fader", ssid, 0, sur->feedback[2], get_address (msg)); + gain_control = s->gain_control(); + } + if (gain_control) { + fake_touch (gain_control); + gain_control->set_value (gain_control->interface_to_internal (pos), sur->usegroup); + } else { + return float_message_with_id (X_("/strip/fader"), ssid, 0, sur->feedback[2], get_address (msg)); } } else { - return float_message_with_id ("/strip/fader", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/fader"), ssid, 0, sur->feedback[2], get_address (msg)); } return 0; } @@ -4034,18 +4703,24 @@ OSC::strip_db_delta (int ssid, float delta, lo_message msg) 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; + boost::shared_ptr gain_control; + if (sur->custom_mode == BusOnly && get_send (s, get_address (msg))) { + gain_control = get_send(s, get_address (msg))->gain_control(); + } else { + gain_control = s->gain_control(); + } + float db = accurate_coefficient_to_dB (gain_control->get_value()) + delta; float abs; if (db < -192) { abs = 0; } else { abs = dB_to_coefficient (db); - float top = s->gain_control()->upper(); + float top = gain_control->upper(); if (abs > top) { abs = top; } } - s->gain_control()->set_value (abs, sur->usegroup); + gain_control->set_value (abs, sur->usegroup); return 0; } return -1; @@ -4068,7 +4743,7 @@ OSC::sel_fader (float val, lo_message msg) return 0; } } - return float_message("/select/fader", 0, get_address (msg)); + return float_message(X_("/select/fader"), 0, get_address (msg)); } int @@ -4079,6 +4754,9 @@ OSC::route_set_trim_abs (int ssid, float level, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/trimdB"), ssid, 0, sur->feedback[2], get_address (msg)); + } if (s->trim_control()) { s->trim_control()->set_value (level, sur->usegroup); return 0; @@ -4096,7 +4774,7 @@ OSC::route_set_trim_dB (int ssid, float dB, lo_message msg) int ret; ret = route_set_trim_abs(ssid, dB_to_coefficient (dB), msg); if (ret != 0) { - return float_message_with_id ("/strip/trimdB", ssid, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/trimdB"), ssid, 0, sur->feedback[2], get_address (msg)); } return 0; @@ -4118,7 +4796,25 @@ OSC::sel_trim (float val, lo_message msg) return 0; } } - return float_message("/select/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 @@ -4137,7 +4833,7 @@ OSC::sel_pan_position (float val, lo_message msg) return 0; } } - return float_message("/select/pan_stereo_position", 0.5, get_address (msg)); + return float_message(X_("/select/pan_stereo_position"), 0.5, get_address (msg)); } int @@ -4156,7 +4852,7 @@ OSC::sel_pan_width (float val, lo_message msg) return 0; } } - return float_message("/select/pan_stereo_width", 1, get_address (msg)); + return float_message(X_("/select/pan_stereo_width"), 1, get_address (msg)); } int @@ -4167,13 +4863,22 @@ OSC::route_set_pan_stereo_position (int ssid, float pos, lo_message 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), sur->usegroup); + boost::shared_ptr pan_control = boost::shared_ptr(); + if (sur->custom_mode == BusOnly && get_send (s, get_address (msg))) { + boost::shared_ptr send = get_send (s, get_address (msg)); + if (send->pan_outs() > 1) { + pan_control = send->panner_shell()->panner()->pannable()->pan_azimuth_control; + } + } else { + pan_control = s->pan_azimuth_control(); + } + if(pan_control) { + pan_control->set_value (s->pan_azimuth_control()->interface_to_internal (pos), sur->usegroup); return 0; } } - return float_message_with_id ("/strip/pan_stereo_position", ssid, 0.5, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, sur->feedback[2], get_address (msg)); } int @@ -4184,13 +4889,16 @@ OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg) OSCSurface *sur = get_surface(get_address (msg)); if (s) { + if ((sur->custom_mode == BusOnly) && (s != sur->select)) { + return float_message_with_id (X_("/strip/pan_stereo_width"), ssid, 1, sur->feedback[2], get_address (msg)); + } if (s->pan_width_control()) { s->pan_width_control()->set_value (pos, sur->usegroup); return 0; } } - return float_message_with_id ("/strip/pan_stereo_width", ssid, 1, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/strip/pan_stereo_width"), ssid, 1, sur->feedback[2], get_address (msg)); } int @@ -4252,7 +4960,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 float_message_with_id ("/select/send_gain", id, -193, sur->feedback[2], 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) { @@ -4283,7 +4991,7 @@ OSC::sel_sendgain (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/send_gain", id, -193, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/send_gain"), id, -193, sur->feedback[2], get_address (msg)); } int @@ -4291,7 +4999,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 float_message_with_id ("/select/send_fader", id, 0, sur->feedback[2], 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) { @@ -4316,7 +5024,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/send_fader", id, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/send_fader"), id, 0, sur->feedback[2], get_address (msg)); } int @@ -4367,7 +5075,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 float_message_with_id ("/select/send_enable", id, 0, sur->feedback[2], 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) { @@ -4391,7 +5099,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 float_message_with_id ("/select/send_enable", id, 0, sur->feedback[2], 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) { @@ -4404,7 +5112,7 @@ OSC::sel_sendenable (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/send_enable", id, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/send_enable"), id, 0, sur->feedback[2], get_address (msg)); } int @@ -4423,7 +5131,7 @@ OSC::sel_master_send_enable (int state, lo_message msg) return 0; } } - return float_message ("/select/master_send_enable", 0, get_address(msg)); + return float_message (X_("/select/master_send_enable"), 0, get_address(msg)); } int @@ -4477,10 +5185,10 @@ OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv return -1; } if (!piid || piid > sur->plugins.size ()) { - return float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg)); + 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 float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg)); + 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); @@ -4498,7 +5206,7 @@ OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv int parid = paid + (int)sur->plug_page - 1; if (parid > (int) sur->plug_params.size ()) { if (sur->feedback[13]) { - float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg)); + float_message_with_id (X_("/select/plugin/parameter"), paid, 0, sur->feedback[2], get_address (msg)); } return 0; } @@ -4535,25 +5243,27 @@ OSC::sel_plugin_activate (float state, lo_message msg) return -1; } OSCSurface *sur = get_surface(get_address (msg)); - boost::shared_ptr s = sur->select; + if (sur->plugins.size() > 0) { + boost::shared_ptr s = sur->select; - boost::shared_ptr r = boost::dynamic_pointer_cast (s); + 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(); + 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; } - return 0; } } } - float_message ("/select/plugin/activate", 0, get_address (msg)); + float_message (X_("/select/plugin/activate"), 0, get_address (msg)); PBD::warning << "OSC: Select has no Plugin." << endmsg; return 0; } @@ -4597,7 +5307,7 @@ OSC::route_plugin_list (int ssid, lo_message msg) { 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; } @@ -4717,14 +5427,14 @@ OSC::route_plugin_descriptor (int ssid, int piid, lo_message msg) { lo_message_add_double (reply, 0); } - lo_send_message (get_address (msg), "/strip/plugin/descriptor", reply); + lo_send_message (get_address (msg), X_("/strip/plugin/descriptor"), reply); lo_message_free (reply); } lo_message reply = lo_message_new (); lo_message_add_int32 (reply, ssid); lo_message_add_int32 (reply, piid); - lo_send_message (get_address (msg), "/strip/plugin/descriptor_end", reply); + lo_send_message (get_address (msg), X_("/strip/plugin/descriptor_end"), reply); lo_message_free (reply); return 0; @@ -4961,7 +5671,7 @@ OSC::sel_pan_elevation (float val, lo_message msg) return 0; } } - return float_message("/select/pan_elevation_position", 0, get_address (msg)); + return float_message(X_("/select/pan_elevation_position"), 0, get_address (msg)); } int @@ -4980,7 +5690,7 @@ OSC::sel_pan_frontback (float val, lo_message msg) return 0; } } - return float_message("/select/pan_frontback_position", 0.5, get_address (msg)); + return float_message(X_("/select/pan_frontback_position"), 0.5, get_address (msg)); } int @@ -4999,7 +5709,7 @@ OSC::sel_pan_lfe (float val, lo_message msg) return 0; } } - return float_message("/select/pan_lfe_control", 0, get_address (msg)); + return float_message(X_("/select/pan_lfe_control"), 0, get_address (msg)); } // compressor control @@ -5019,7 +5729,7 @@ OSC::sel_comp_enable (float val, lo_message msg) return 0; } } - return float_message("/select/comp_enable", 0, get_address (msg)); + return float_message(X_("/select/comp_enable"), 0, get_address (msg)); } int @@ -5038,7 +5748,7 @@ OSC::sel_comp_threshold (float val, lo_message msg) return 0; } } - return float_message("/select/comp_threshold", 0, get_address (msg)); + return float_message(X_("/select/comp_threshold"), 0, get_address (msg)); } int @@ -5057,7 +5767,7 @@ OSC::sel_comp_speed (float val, lo_message msg) return 0; } } - return float_message("/select/comp_speed", 0, get_address (msg)); + return float_message(X_("/select/comp_speed"), 0, get_address (msg)); } int @@ -5076,7 +5786,7 @@ OSC::sel_comp_mode (float val, lo_message msg) return 0; } } - return float_message("/select/comp_mode", 0, get_address (msg)); + return float_message(X_("/select/comp_mode"), 0, get_address (msg)); } int @@ -5095,7 +5805,7 @@ OSC::sel_comp_makeup (float val, lo_message msg) return 0; } } - return float_message("/select/comp_makeup", 0, get_address (msg)); + return float_message(X_("/select/comp_makeup"), 0, get_address (msg)); } // EQ control @@ -5116,7 +5826,7 @@ OSC::sel_eq_enable (float val, lo_message msg) return 0; } } - return float_message("/select/eq_enable", 0, get_address (msg)); + return float_message(X_("/select/eq_enable"), 0, get_address (msg)); } int @@ -5135,7 +5845,7 @@ OSC::sel_eq_hpf_freq (float val, lo_message msg) return 0; } } - return float_message("/select/eq_hpf/freq", 0, get_address (msg)); + return float_message(X_("/select/eq_hpf/freq"), 0, get_address (msg)); } int @@ -5154,7 +5864,7 @@ OSC::sel_eq_lpf_freq (float val, lo_message msg) return 0; } } - return float_message("/select/eq_lpf/freq", 0, get_address (msg)); + return float_message(X_("/select/eq_lpf/freq"), 0, get_address (msg)); } int @@ -5173,7 +5883,7 @@ OSC::sel_eq_hpf_enable (float val, lo_message msg) return 0; } } - return float_message("/select/eq_hpf/enable", 0, get_address (msg)); + return float_message(X_("/select/eq_hpf/enable"), 0, get_address (msg)); } int @@ -5192,7 +5902,7 @@ OSC::sel_eq_lpf_enable (float val, lo_message msg) return 0; } } - return float_message("/select/eq_lpf/enable", 0, get_address (msg)); + return float_message(X_("/select/eq_lpf/enable"), 0, get_address (msg)); } int @@ -5211,7 +5921,7 @@ OSC::sel_eq_hpf_slope (float val, lo_message msg) return 0; } } - return float_message("/select/eq_hpf/slope", 0, get_address (msg)); + return float_message(X_("/select/eq_hpf/slope"), 0, get_address (msg)); } int @@ -5230,7 +5940,7 @@ OSC::sel_eq_lpf_slope (float val, lo_message msg) return 0; } } - return float_message("/select/eq_lpf/slope", 0, get_address (msg)); + return float_message(X_("/select/eq_lpf/slope"), 0, get_address (msg)); } int @@ -5252,7 +5962,7 @@ OSC::sel_eq_gain (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/eq_gain", id + 1, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/eq_gain"), id + 1, 0, sur->feedback[2], get_address (msg)); } int @@ -5274,7 +5984,7 @@ OSC::sel_eq_freq (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/eq_freq", id + 1, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/eq_freq"), id + 1, 0, sur->feedback[2], get_address (msg)); } int @@ -5296,7 +6006,7 @@ OSC::sel_eq_q (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/eq_q", id + 1, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/eq_q"), id + 1, 0, sur->feedback[2], get_address (msg)); } int @@ -5318,7 +6028,7 @@ OSC::sel_eq_shape (int id, float val, lo_message msg) return 0; } } - return float_message_with_id ("/select/eq_shape", id + 1, 0, sur->feedback[2], get_address (msg)); + return float_message_with_id (X_("/select/eq_shape"), id + 1, 0, sur->feedback[2], get_address (msg)); } // timer callbacks @@ -5397,15 +6107,15 @@ 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; } @@ -5578,7 +6288,7 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo } } int ret = 1; /* unhandled */ - if (!strncmp (path, "/cue/aux", 8)) { + if (!strncmp (path, X_("/cue/aux"), 8)) { // set our Aux bus if (argc) { if (value) { @@ -5588,7 +6298,7 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo } } } - else if (!strncmp (path, "/cue/connect", 12)) { + else if (!strncmp (path, X_("/cue/connect"), 12)) { // Connect to default Aux bus if ((!argc) || argv[0]->f || argv[0]->i) { ret = cue_set (1, msg); @@ -5596,7 +6306,7 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo 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]->f || argv[0]->i) { ret = cue_next (msg); @@ -5604,7 +6314,7 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo 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]->f || argv[0]->i) { ret = cue_previous (msg); @@ -5612,24 +6322,24 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo ret = 0; } } - else if (!strncmp (path, "/cue/send/fader/", 16) && strlen (path) > 16) { + 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) { + 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)) { + else if (!strncmp (path, X_("/cue/fader"), 10)) { if (argc == 1) { ret = cue_aux_fader (value, msg); } } - else if (!strncmp (path, "/cue/mute", 9)) { + else if (!strncmp (path, X_("/cue/mute"), 9)) { if (argc == 1) { ret = cue_aux_mute (value, msg); } @@ -5669,7 +6379,7 @@ OSC::_cue_set (uint32_t aux, lo_address addr) 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 @@ -5758,7 +6468,7 @@ OSC::cue_aux_fader (float position, lo_message msg) } } } - float_message ("/cue/fader", 0, get_address (msg)); + float_message (X_("/cue/fader"), 0, get_address (msg)); return -1; } @@ -5779,7 +6489,7 @@ OSC::cue_aux_mute (float state, lo_message msg) } } } - float_message ("/cue/mute", 0, get_address (msg)); + float_message (X_("/cue/mute"), 0, get_address (msg)); return -1; } @@ -5796,7 +6506,7 @@ OSC::cue_send_fader (uint32_t id, float val, lo_message msg) return 0; } } - 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; } @@ -5814,7 +6524,7 @@ OSC::cue_send_enable (uint32_t id, float state, lo_message msg) } return 0; } - 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; } @@ -5849,6 +6559,20 @@ OSC::float_message_with_id (std::string path, uint32_t ssid, float value, bool i 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) {