#include <glibmm.h>
#include "pbd/control_math.h"
+#include "pbd/controllable.h"
#include <pbd/convert.h>
#include <pbd/pthread_utils.h>
#include <pbd/file_utils.h>
#include "ardour/amp.h"
#include "ardour/session.h"
#include "ardour/route.h"
+#include "ardour/route_group.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/vca.h"
#include "ardour/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"
// 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/enable", "f", custom_enable);
- 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/previous"), "f", sel_previous);
+ REGISTER_CALLBACK (serv, X_("/select/previous"), "", sel_previous);
+ REGISTER_CALLBACK (serv, X_("/select/next"), "f", sel_next);
+ REGISTER_CALLBACK (serv, X_("/select/next"), "", sel_next);
+ 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);
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<AudioTrack>(r)) {
lo_message_add_string (reply, "AT");
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());
}
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);
}
len = strlen (path);
OSCSurface *sur = get_surface(get_address (msg), true);
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+
+ if (ls) {
+ set = &(link_sets[ls]);
+ sur->custom_mode = set->custom_mode;
+ sur->custom_strips = set->custom_strips;
+ sur->temp_mode = set->temp_mode;
+ 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;
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_enable) {
+ } else if (sur->custom_mode && !sur->temp_mode) {
PBD::warning << "OSC: Can't add strips with custom enabled." << endmsg;
} else {
for (int n = 0; n < argc; ++n) {
-
- boost::shared_ptr<Stripable> s = get_strip (argv[n]->i, get_address (msg));
+ boost::shared_ptr<Stripable> s = boost::shared_ptr<Stripable>();
+ if (types[n] == 'f') {
+ s = get_strip ((uint32_t) argv[n]->f, get_address (msg));
+ } else if (types[n] == 'i') {
+ s = get_strip (argv[n]->i, get_address (msg));
+ }
if (s) {
sur->custom_strips.push_back (s);
}
}
+ if (ls) {
+ set->custom_strips = sur->custom_strips;
+ }
}
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_enable) {
+ } else if (!sur->custom_mode || sur->temp_mode) {
PBD::warning << "OSC: Can't remove strips without custom enabled." << endmsg;
} else {
for (int n = 0; n < argc; ++n) {
- if ((uint32_t) argv[n]->i <= sur->custom_strips.size ()) {
+ uint32_t st_no = 0;
+ if (types[n] == 'f') {
+ st_no = (uint32_t) argv[n]->f;
+ } else if (types[n] == 'i') {
+ st_no = (uint32_t) argv[n]->i;
+ }
+ if (st_no && st_no <= sur->custom_strips.size ()) {
sur->custom_strips[argv[n]->i - 1] = boost::shared_ptr<Stripable>();
}
}
+ if (ls) {
+ set->custom_strips = sur->custom_strips;
+ }
ret = set_bank (sur->bank, msg);
}
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;
}
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, "/set_surface", 12)) {
+ else if (!strncmp (path, X_("/marker"), 7)) {
+ ret = set_marker (types, argv, argc, msg);
+ }
+ else if (!strncmp (path, X_("/set_surface"), 12)) {
ret = surface_parse (path, types, argv, argc, msg);
}
- else if (strstr (path, "/link")) {
+ else if (strstr (path, X_("/link"))) {
ret = parse_link (path, types, argv, argc, msg);
}
if (ret) {
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);
}
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());
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);
}
// 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()) {
}
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);
void
OSC::surface_list (lo_message msg)
{
+ get_surfaces ();
+}
+
+void
+OSC::get_surfaces ()
+{
+
/* this function is for debugging and prints lots of
* information about what surfaces Ardour knows about and their
* internal parameters. It is best accessed by sending:
* a surface entry.
*/
- cerr << "List of known Surfaces: " << _surface.size() << "\n\n";
+ PBD::info << string_compose ("\nList of known Surfaces (%1):\n", _surface.size());
Glib::Threads::Mutex::Lock lm (surfaces_lock);
for (uint32_t it = 0; it < _surface.size(); it++) {
OSCSurface* sur = &_surface[it];
- cerr << string_compose (" Surface: %1 URL: %2\n", it, sur->remote_url);
- cerr << string_compose (" Number of strips: %1 Bank size: %2 Current Bank %3\n", sur->nstrips, sur->bank_size, sur->bank);
- cerr << string_compose (" Use Custom: %1 Custom Strips: %2\n", sur->custom_enable, sur->custom_strips.size ());
+ 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 ());
+ PBD::info << string_compose (" Temp Mode: %1 Temp Strips: %2\n", sur->temp_mode, sur->temp_strips.size ());
bool ug = false;
if (sur->usegroup == PBD::Controllable::UseGroup) {
ug = true;
}
- cerr << string_compose (" Strip Types: %1 Feedback: %2 no_clear: %3 gain mode: %4 use groups? %5\n", \
+ PBD::info << string_compose (" Strip Types: %1 Feedback: %2 No_clear flag: %3 Gain mode: %4 Use groups flag %5\n", \
sur->strip_types.to_ulong(), sur->feedback.to_ulong(), sur->no_clear, sur->gainmode, ug);
- cerr << string_compose (" using plugin: %1 of %2 plugins, with %3 params. page size: %4 page: %5\n", \
+ PBD::info << string_compose (" Using plugin: %1 of %2 plugins, with %3 params. Page size: %4 Page: %5\n", \
sur->plugin_id, sur->plugins.size(), sur->plug_params.size(), sur->plug_page_size, sur->plug_page);
- cerr << string_compose (" send page size: %1 page: %2\n", sur->send_page_size, sur->send_page);
- cerr << string_compose (" expanded? %1 track: %2 jogmode: %3\n", sur->expand_enable, sur->expand, sur->jogmode);
- cerr << string_compose (" personal monitor? %1, Aux master: %2, number of sends: %3\n", sur->cue, sur->aux, sur->sends.size());
- cerr << string_compose (" Linkset: %1 Device Id: %2\n", sur->linkset, sur->linkid);
+ PBD::info << string_compose (" Send page size: %1 Page: %2\n", sur->send_page_size, sur->send_page);
+ PBD::info << string_compose (" Expanded flag %1 Track: %2 Jogmode: %3\n", sur->expand_enable, sur->expand, sur->jogmode);
+ PBD::info << string_compose (" Personal monitor flag %1, Aux master: %2, Number of sends: %3\n", sur->cue, sur->aux, sur->sends.size());
+ PBD::info << string_compose (" Linkset: %1 Device Id: %2\n", sur->linkset, sur->linkid);
}
- cerr << "\nList of LinkSets " << link_sets.size() << "\n\n";
+ PBD::info << string_compose ("\nList of LinkSets (%1):\n", link_sets.size());
std::map<uint32_t, LinkSet>::iterator it;
for (it = link_sets.begin(); it != link_sets.end(); it++) {
if (!(*it).first) {
if (set->urls.size()) {
devices = set->urls.size() - 1;
}
- cerr << string_compose (" Linkset %1 has %2 devices and sees %3 strips\n", (*it).first, devices, set->strips.size());
- cerr << string_compose (" Bank size: %1 Current bank: %2 Strip Types: %3\n", set->banksize, set->bank, set->strip_types.to_ulong());
- cerr << string_compose (" auto bank sizing: %1 linkset not ready: %2\n", set->autobank, set->not_ready);
+ PBD::info << string_compose ("\n Linkset %1 has %2 devices and sees %3 strips\n", (*it).first, devices, set->strips.size());
+ PBD::info << string_compose (" Bank size: %1 Current bank: %2 Strip Types: %3\n", set->banksize, set->bank, set->strip_types.to_ulong());
+ PBD::info << string_compose (" Auto bank sizing: %1 Linkset not ready flag: %2\n", set->autobank, set->not_ready);
+ PBD::info << string_compose (" Use Custom: %1 Number of Custom Strips: %2\n", set->custom_mode, set->custom_strips.size ());
+ PBD::info << string_compose (" Temp Mode: %1 Number of Temp Strips: %2\n", set->temp_mode, set->temp_strips.size ());
}
- cerr << "\n";
+ PBD::info << endmsg;
}
int
return 0;
}
OSCSurface *sur = get_surface(get_address (msg), true);
- sur->custom_enable = false;
+ sur->custom_mode = 0;
sur->custom_strips.clear ();
- sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, false, sur->custom_strips);
sur->nstrips = sur->strips.size();
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+ if (ls) {
+ set = &(link_sets[ls]);
+ set->custom_mode = 0;
+ set->custom_strips.clear ();
+ set->strips = sur->strips;
+ }
return set_bank (1, msg);
}
int
-OSC::custom_enable (float state, lo_message msg)
+OSC::custom_mode (float state, lo_message msg)
+{
+ return _custom_mode ((uint32_t) state, get_address (msg));
+}
+
+int
+OSC::_custom_mode (uint32_t 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;
+
+ if (ls) {
+ set = &(link_sets[ls]);
+ sur->custom_mode = set->custom_mode;
+ sur->custom_strips = set->custom_strips;
+ }
if (state > 0){
if (sur->custom_strips.size () == 0) {
PBD::warning << "No custom strips set to enable" << endmsg;
- sur->custom_enable = false;
+ sur->custom_mode = 0;
+ if (ls) {
+ set->custom_mode = 0;
+ }
return -1;
} else {
- sur->custom_enable = true;
- sur->strips = sur->custom_strips;
+ if (sur->bank_size) {
+ sur->custom_mode = state | 0x4;
+ } else {
+ 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();
- return set_bank (1, msg);
}
} else {
- sur->custom_enable = false;
- sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
+ sur->custom_mode = 0;
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 0, sur->custom_strips);
sur->nstrips = sur->strips.size();
- return set_bank (1, msg);
}
- return -1;
+ if (ls) {
+ set->custom_mode = sur->custom_mode;
+ set->strips = sur->strips;
+ }
+ return _set_bank (1, addr);
}
int
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)
{
}
_surface.clear();
link_sets.clear ();
+ _ports.clear ();
PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
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);
}
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));
}
new_ls.not_ready = true;
new_ls.strip_types = sur->strip_types;
new_ls.strips = sur->strips;
+ new_ls.custom_strips = sur->custom_strips;
+ new_ls.custom_mode = sur->custom_mode;
+ new_ls.temp_mode = sur->temp_mode;
new_ls.urls.resize (2);
link_sets[set] = new_ls;
}
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;
+ }
+ [[fallthrough]];
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;
}
+ [[fallthrough]];
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;
}
+ [[fallthrough]];
case 6:
if (types[5] == 'f') {
pi_page = (int) argv[5]->f;
} else {
pi_page = argv[5]->i;
}
+ [[fallthrough]];
case 5:
if (types[4] == 'f') {
se_page = (int) argv[4]->f;
} else {
se_page = argv[4]->i;
}
+ [[fallthrough]];
case 4:
if (types[3] == 'f') {
fadermode = (int) argv[3]->f;
} else {
fadermode = argv[3]->i;
}
+ [[fallthrough]];
case 3:
if (types[2] == 'f') {
feedback = (int) argv[2]->f;
} else {
feedback = argv[2]->i;
}
+ [[fallthrough]];
case 2:
if (types[1] == 'f') {
strip_types = (int) argv[1]->f;
} else {
strip_types = argv[1]->i;
}
+ [[fallthrough]];
case 1:
if (types[0] == 'f') {
bank_size = (int) argv[0]->f;
} 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));
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;
}
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 {
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));
}
s->send_page_size = se_size;
s->plug_page_size = pi_size;
+ if (s->temp_mode) {
+ s->temp_mode = TempOff;
+ }
if (s->linkset) {
set_link (s->linkset, s->linkid, get_address (msg));
link_strip_types (s->linkset, s->strip_types.to_ulong());
// set bank and strip feedback
strip_feedback(s, true);
_set_bank (1, get_address (msg));
+ _strip_select (boost::shared_ptr<Stripable> (), get_address (msg));
}
global_feedback (s);
}
OSCSurface *s = get_surface(get_address (msg), true);
s->bank_size = bs;
+ if (s->custom_mode && bs) {
+ s->custom_mode = s->custom_mode | 0x4;
+ }
if (s->linkset) {
set_link (s->linkset, s->linkid, get_address (msg));
} else {
}
OSCSurface *s = get_surface(get_address (msg), true);
s->strip_types = st;
+ s->temp_mode = TempOff;
if (s->strip_types[10]) {
s->usegroup = PBD::Controllable::UseGroup;
} else {
if (s->linkset) {
link_strip_types (s->linkset, st);
}
-
// set bank and strip feedback
- _set_bank (1, get_address (msg));
+ strip_feedback(s, false);
+ set_bank (1, msg);
+ _strip_select (boost::shared_ptr<Stripable> (), get_address (msg));
return 0;
}
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++;
+ }
+ }
+ if (sur->feedback.to_ulong()) {
+ refresh_surface (msg);
+ }
+ return 0;
+ }
+ }
+ }
+ // should not get here
+ return -1;
+}
+
int
OSC::check_surface (lo_message msg)
{
{
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];
}
}
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();
s.gainmode = default_gainmode;
s.usegroup = PBD::Controllable::NoGroup;
s.custom_strips.clear ();
- s.custom_enable = false;
+ s.custom_mode = 0;
+ s.temp_mode = TempOff;
s.sel_obs = 0;
s.expand = 0;
s.expand_enable = false;
+ s.expand_strip = boost::shared_ptr<Stripable> ();
s.cue = false;
s.aux = 0;
s.cue_obs = 0;
- s.strips = get_sorted_stripables(s.strip_types, s.cue);
+ s.strips = get_sorted_stripables(s.strip_types, s.cue, false, s.custom_strips);
s.send_page = 1;
s.send_page_size = default_send_size;
s.plug_page = 1;
void
OSC::global_feedback (OSCSurface* sur)
{
+ OSCGlobalObserver* o = sur->global_obs;
+ if (o) {
+ 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);
}
}
void
OSC::strip_feedback (OSCSurface* sur, bool new_bank_size)
{
- if (sur->custom_enable && (sur->custom_strips.size () > 0)) {
- sur->strips = sur->custom_strips;
- sur->nstrips = sur->custom_strips.size ();
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+
+ if (ls) {
+ set = &(link_sets[ls]);
+ if (set->not_ready) {
+ return;
+ }
+ sur->custom_mode = set->custom_mode;
+ sur->custom_strips = set->custom_strips;
+ sur->temp_mode = set->temp_mode;
+ sur->temp_strips = set->temp_strips;
+ }
+ if (!sur->temp_mode) {
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, sur->custom_mode, sur->custom_strips);
} else {
- sur->custom_enable = false;
- sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
- sur->nstrips = sur->strips.size();
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 1, sur->temp_strips);
}
+ sur->nstrips = sur->strips.size();
+ if (ls) {
+ set->strips = sur->strips;
+ }
+
if (new_bank_size || (!sur->feedback[0] && !sur->feedback[1])) {
// delete old observers
for (uint32_t i = 0; i < sur->observers.size(); i++) {
for (uint32_t i = 0; i < bank_size; i++) {
OSCRouteObserver* o = new OSCRouteObserver (*this, i + 1, sur);
sur->observers.push_back (o);
+ if (sur->temp_mode == BusOnly) {
+ boost::shared_ptr<ARDOUR::Stripable> str = get_strip (i + 1, lo_address_new_from_url (sur->remote_url.c_str()));
+ boost::shared_ptr<ARDOUR::Send> send = get_send (str, lo_address_new_from_url (sur->remote_url.c_str()));
+ if (send) {
+ o->refresh_send (send, true);
+ }
+ }
+
}
}
} else {
for (uint32_t i = 0; i < sur->observers.size(); i++) {
boost::shared_ptr<ARDOUR::Stripable> str = get_strip (i + 1, lo_address_new_from_url (sur->remote_url.c_str()));
sur->observers[i]->refresh_strip(str, true);
+ if (sur->temp_mode == BusOnly) {
+ boost::shared_ptr<ARDOUR::Send> send = get_send (str, lo_address_new_from_url (sur->remote_url.c_str()));
+ if (send) {
+ sur->observers[i]->refresh_send (send, true);
+ }
+ }
}
}
}
// refresh each surface we know about.
for (uint32_t it = 0; it < _surface.size(); ++it) {
OSCSurface* sur = &_surface[it];
- //sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
- //sur->nstrips = sur->strips.size();
// find lo_address
lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
if (sur->cue) {
// 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);
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<ARDOUR::Stripable>(), 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;
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<ARDOUR::Stripable>(), sur_addr);
- bank_leds (sur);
- lo_address_free (sur_addr);
}
if (not_ready) {
surface_link_state (set);
} 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) {
} 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);
}
}
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<Stripable> s = sur->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<Route> rt = boost::dynamic_pointer_cast<Route> (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_mode = GroupOnly;
+ ret = set_temp_mode (get_address (msg));
+ set_bank (1, msg);
+ } 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<Stripable> s;
+ s = sur->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> vca = get_vca_by_name (svalue);
+ if (vca) {
+ boost::shared_ptr<Slavable> slv = boost::dynamic_pointer_cast<Slavable> (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> vca = boost::dynamic_pointer_cast<VCA> (s);
+ if (vca) {
+ if ((argc == 1 && ivalue) || !argc) {
+ sur->temp_mode = VCAOnly;
+ ret = set_temp_mode (get_address (msg));
+ set_bank (1, msg);
+ } else {
+ // key off is ignored
+ ret = 0;
+ }
+ } else {
+ PBD::warning << "OSC: Select is not a VCA right now" << endmsg;
+ }
+ }
+ }
+ return ret;
+}
+
+boost::shared_ptr<VCA>
+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<Stripable> s = *it;
+ boost::shared_ptr<VCA> v = boost::dynamic_pointer_cast<VCA> (s);
+ if (v) {
+ if (vname == v->name()) {
+ return v;
+ }
+ }
+ }
+ return boost::shared_ptr<VCA>();
+}
+
+int
+OSC::sel_bus_only (lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s = sur->select;
+ if (s) {
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (s);
+ if (rt) {
+ if (!rt->is_track () && rt->can_solo ()) {
+ // this is a bus, but not master, monitor or audition
+ sur->temp_mode = BusOnly;
+ set_temp_mode (get_address (msg));
+ set_bank (1, msg);
+ return 0;
+ }
+ }
+ }
+ return 1;
+}
+
+int
+OSC::set_temp_mode (lo_address addr)
+{
+ bool ret = 1;
+ OSCSurface *sur = get_surface(addr);
+ boost::shared_ptr<Stripable> s = sur->select;
+ if (s) {
+ if (sur->temp_mode == GroupOnly) {
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (s);
+ if (rt) {
+ RouteGroup *rg = rt->route_group();
+ if (rg) {
+ sur->temp_strips.clear();
+ boost::shared_ptr<RouteList> rl = rg->route_list();
+ for (RouteList::iterator it = rl->begin(); it != rl->end(); ++it) {
+ boost::shared_ptr<Route> r = *it;
+ boost::shared_ptr<Stripable> st = boost::dynamic_pointer_cast<Stripable> (r);
+ sur->temp_strips.push_back(st);
+ }
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 1, sur->temp_strips);
+ sur->nstrips = sur->temp_strips.size();
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+ if (ls) {
+ set = &(link_sets[ls]);
+ set->temp_mode = GroupOnly;
+ set->temp_strips.clear ();
+ set->temp_strips = sur->temp_strips;
+ set->strips = sur->strips;
+ }
+ ret = 0;
+ }
+ }
+ } else if (sur->temp_mode == VCAOnly) {
+ boost::shared_ptr<VCA> vca = boost::dynamic_pointer_cast<VCA> (s);
+ if (vca) {
+ sur->temp_strips.clear();
+ StripableList stripables;
+ session->get_stripables (stripables);
+ for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+ boost::shared_ptr<Stripable> st = *it;
+ if (st->slaved_to (vca)) {
+ sur->temp_strips.push_back(st);
+ }
+ }
+ sur->temp_strips.push_back(s);
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 1, sur->temp_strips);
+ sur->nstrips = sur->temp_strips.size();
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+ if (ls) {
+ set = &(link_sets[ls]);
+ set->temp_mode = VCAOnly;
+ set->temp_strips.clear ();
+ set->temp_strips = sur->temp_strips;
+ set->strips = sur->strips;
+ }
+ ret = 0;
+ }
+ } else if (sur->temp_mode == BusOnly) {
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (s);
+ if (rt) {
+ if (!rt->is_track () && rt->can_solo ()) {
+ // 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<Stripable> st = *it;
+ boost::shared_ptr<Route> ri = boost::dynamic_pointer_cast<Route> (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->strips = get_sorted_stripables(sur->strip_types, sur->cue, 1, sur->temp_strips);
+ sur->nstrips = sur->temp_strips.size();
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+ if (ls) {
+ set = &(link_sets[ls]);
+ set->temp_mode = BusOnly;
+ set->temp_strips.clear ();
+ set->temp_strips = sur->temp_strips;
+ set->strips = sur->strips;
+ }
+ ret = 0;
+ }
+ }
+ } else if (sur->temp_mode == TempOff) {
+ sur->temp_mode = TempOff;
+ ret = 0;
+ }
+ }
+ if (ret) {
+ sur->temp_mode = TempOff;
+ }
+ return ret;
+}
+
+boost::shared_ptr<Send>
+OSC::get_send (boost::shared_ptr<Stripable> st, lo_address addr)
+{
+ OSCSurface *sur = get_surface(addr);
+ boost::shared_ptr<Stripable> s = sur->select;
+ if (st && s && (st != s)) {
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (s);
+ boost::shared_ptr<Route> rst = boost::dynamic_pointer_cast<Route> (st);
+ //find what send number feeds s
+ return rst->internal_send_for (rt);
+ }
+ return boost::shared_ptr<Send> ();
+}
+
+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<ARDOUR::Stripable> strip, lo_address addr)
{
}
}
}
- // failsafe... should never get here.
+ // strip not in current bank
return 0;
}
boost::shared_ptr<Processor> proc = r->nth_plugin (sur->plugins[sur->plugin_id - 1]);
boost::shared_ptr<PluginInsert> pi;
if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(proc))) {
- PBD::warning << "OSC: Plugin: " << sur->plugin_id << " does not seem to be a plugin" << endmsg;
+ PBD::warning << "OSC: Plugin: " << sur->plugin_id << " does not seem to be a plugin" << endmsg;
return 1;
}
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
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);
}
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);
}
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);
}
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));
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;
if (get_transport_speed () != 1.0) {
set_transport_speed (0);
}
+ s->jogmode = (uint32_t) mode;
+ s->global_obs->jog_mode (mode);
+ return 0;
+}
- switch((uint32_t)mode)
- {
- case JOG :
- 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;
+// two structs to help with going to markers
+struct LocationMarker {
+ LocationMarker (const std::string& l, samplepos_t w)
+ : label (l), when (w) {}
+ std::string label;
+ samplepos_t when;
+};
+
+struct LocationMarkerSort {
+ bool operator() (const LocationMarker& a, const LocationMarker& b) {
+ return (a.when < b.when);
+ }
+};
+
+int
+OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg)
+{
+ if (argc != 1) {
+ PBD::warning << "Wrong number of parameters, one only." << endmsg;
+ return -1;
+ }
+ const Locations::LocationList& ll (session->locations ()->list ());
+ uint32_t marker = 0;
+
+ switch (types[0]) {
+ case 's':
+ {
+ Location *cur_mark = 0;
+ for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
+ if ((*l)->is_mark ()) {
+ if (strcmp (&argv[0]->s, (*l)->name().c_str()) == 0) {
+ session->request_locate ((*l)->start (), false);
+ return 0;
+ } else if ((*l)->start () == session->transport_sample()) {
+ cur_mark = (*l);
+ }
+ }
+ }
+ if (cur_mark) {
+ cur_mark->set_name (&argv[0]->s);
+ return 0;
+ }
+ PBD::warning << string_compose ("Marker: \"%1\" - does not exist", &argv[0]->s) << endmsg;
+ return -1;
+ }
break;
- case NUDGE:
- text_message ("/jog/mode/name", "Nudge", get_address (msg));
- s->jogmode = NUDGE;
+ case 'i':
+ marker = (uint32_t) argv[0]->i - 1;
break;
- case MARKER:
- text_message ("/jog/mode/name", "Marker", get_address (msg));
- s->jogmode = MARKER;
+ case 'f':
+ marker = (uint32_t) argv[0]->f - 1;
break;
default:
- PBD::warning << "Jog Mode: " << mode << " is not valid." << endmsg;
+ return -1;
break;
- lo_message reply = lo_message_new ();
- lo_message_add_int32 (reply, s->jogmode);
- lo_send_message (get_address(msg), "/jog/mode", reply);
- lo_message_free (reply);
+ }
+ std::vector<LocationMarker> lm;
+ // get Locations that are marks
+ for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
+ if ((*l)->is_mark ()) {
+ lm.push_back (LocationMarker((*l)->name(), (*l)->start ()));
+ }
+ }
+ // sort them by position
+ LocationMarkerSort location_marker_sort;
+ std::sort (lm.begin(), lm.end(), location_marker_sort);
+ // go there
+ if (marker < lm.size()) {
+ session->request_locate (lm[marker].when, false);
+ return 0;
+ }
+ // we were unable to deal with things
+ return -1;
+}
+
+int
+OSC::group_list (lo_message msg)
+{
+ return send_group_list (get_address (msg));
+}
+int
+OSC::send_group_list (lo_address addr)
+{
+ lo_message reply;
+ reply = lo_message_new ();
+
+ lo_message_add_string (reply, X_("none"));
+
+ std::list<RouteGroup*> groups = session->route_groups ();
+ for (std::list<RouteGroup *>::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
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);
}
}
// 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);
// 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;
}
uint32_t ctr = 0;
uint32_t aut = 0;
uint32_t ssid;
+ boost::shared_ptr<Send> send = boost::shared_ptr<Send> ();
if (argc) {
if (types[argc - 1] == 'f') {
}
//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') {
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;
if (strp) {
boost::shared_ptr<AutomationControl> control = boost::shared_ptr<AutomationControl>();
// 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;
}
control->set_automation_state (ARDOUR::Touch);
ret = 0;
break;
+ case 4:
+ control->set_automation_state (ARDOUR::Latch);
+ ret = 0;
+ break;
default:
break;
}
int ret = 1;
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> strp = boost::shared_ptr<Stripable>();
+ boost::shared_ptr<Send> send = boost::shared_ptr<Send> ();
uint32_t ctr = 0;
uint32_t touch = 0;
uint32_t ssid;
}
//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') {
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;
if (strp) {
boost::shared_ptr<AutomationControl> control = boost::shared_ptr<AutomationControl>();
// 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;
}
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->mute_control()) {
s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/mute", 0, get_address (msg));
+ return float_message(X_("/select/mute"), 0, get_address (msg));
}
int
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->solo_control()) {
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->solo_isolate_control()) {
s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/solo_iso", 0, get_address (msg));
+ return float_message(X_("/select/solo_iso"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->solo_safe_control()) {
s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/solo_safe", 0, get_address (msg));
+ return float_message(X_("/select/solo_safe"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->rec_enable_control()) {
s->rec_enable_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
}
}
}
- return float_message("/select/recenable", 0, get_address (msg));
+ return float_message(X_("/select/recenable"), 0, get_address (msg));
}
int
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
- if (s->rec_enable_control()) {
- s->rec_enable_control()->set_value (yn, sur->usegroup);
- if (s->rec_enable_control()->get_value()) {
+ if ((sur->temp_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()) {
+ return 0;
+ }
+ }
+ }
+ 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<Stripable> s = get_strip(ssid, get_address(msg));
+
+ if (s) {
+ if ((sur->temp_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<Stripable> s;
+ s = sur->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<Stripable> s;
+ s = sur->select;
+ if (s) {
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (s);
+ if (!rt) {
+ PBD::warning << "OSC: can not set comment on VCAs." << endmsg;
+ return -1;
+ }
+ rt->set_comment (newcomment, this);
+ }
+
+ return 0;
+}
+
+int
+OSC::strip_group (int ssid, char *group, lo_message msg) {
+ if (!session) {
+ return -1;
+ }
+ boost::shared_ptr<Stripable> s = get_strip(ssid, get_address(msg));
+ return strip_select_group (s, group);
+}
+
+int
+OSC::sel_group (char *group, lo_message msg) {
+ if (!session) {
+ return -1;
+ }
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ s = sur->select;
+ return strip_select_group (s, group);
+}
+
+int
+OSC::strip_select_group (boost::shared_ptr<Stripable> s, char *group)
+{
+ string grp = group;
+ if (grp == "" || grp == " ") {
+ grp = "none";
+ }
+
+ if (s) {
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (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 float_message_with_id ("/strip/recenable", ssid, 0, sur->feedback[2], get_address (msg));
-}
-
-int
-OSC::route_rename(int ssid, char *newname, lo_message msg) {
- if (!session) {
- return -1;
- }
-
- boost::shared_ptr<Stripable> s = get_strip(ssid, get_address(msg));
-
- if (s) {
- s->set_name(std::string(newname));
- }
-
- return 0;
+ return 0;
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->rec_safe_control()) {
s->rec_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
}
}
}
- return float_message("/select/record_safe", 0, get_address (msg));
+ return float_message(X_("/select/record_safe"), 0, get_address (msg));
}
int
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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()) {
}
}
}
- 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
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
}
}
- 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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
}
}
}
- return float_message("/select/monitor_input", 0, get_address (msg));
+ return float_message(X_("/select/monitor_input"), 0, get_address (msg));
}
int
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
}
}
- 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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
}
}
}
- return float_message("/select/monitor_disk", 0, get_address (msg));
+ return float_message(X_("/select/monitor_disk"), 0, get_address (msg));
}
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->phase_control()) {
s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
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<Stripable> s = get_strip (ssid, get_address (msg));
+ if (s) {
+ if ((sur->temp_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));
+ } else {
+ sur->expand_strip = s;
+ }
+ }
sur->expand_enable = (bool) yn;
sur->expand = ssid;
- boost::shared_ptr<Stripable> s;
+ boost::shared_ptr<Stripable> sel;
if (yn) {
- s = get_strip (ssid, get_address (msg));
+ sel = get_strip (ssid, get_address (msg));
} else {
- s = _select;
+ sel = boost::shared_ptr<Stripable> ();
}
- 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<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
+
+ if (s) {
+ if ((sur->temp_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
return -1;
}
OSCSurface *sur = get_surface(addr, true);
+ boost::weak_ptr<Stripable> o_sel = sur->select;
+ boost::shared_ptr<Stripable> old_sel= o_sel.lock ();
+ boost::weak_ptr<Stripable> o_expand = sur->expand_strip;
+ boost::shared_ptr<Stripable> old_expand= o_expand.lock ();
+
+ // we got a null strip check that old strips are valid
+ if (!s) {
+ if (old_expand && sur->expand_enable) {
+ sur->expand = get_sid (old_expand, addr);
+ if (sur->strip_types[11] || sur->expand) {
+ s = old_expand;
+ } else {
+ sur->expand_strip = boost::shared_ptr<Stripable> ();
+ }
+ }
+ }
if (!s) {
- // expand doesn't point to a stripable, turn it off and use select
sur->expand = 0;
sur->expand_enable = false;
if (ControlProtocol::first_selected_stripable()) {
} else {
s = session->master_out ();
}
- _select = s;
+ _select = s;
+ }
+ if (s != old_sel) {
+ sur->select = s;
}
- sur->select = s;
bool sends;
uint32_t nsends = 0;
do {
OSCSelectObserver* so = dynamic_cast<OSCSelectObserver*>(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);
+ } else {
+ if (so != 0) {
+ delete so;
+ sur->sel_obs = 0;
+ }
+ }
+ if (sur->feedback[0] || sur->feedback[1]) {
uint32_t obs_expand = 0;
if (sur->expand_enable) {
+ sur->expand = get_sid (s, addr);
obs_expand = sur->expand;
} else {
obs_expand = 0;
for (uint32_t i = 0; i < sur->observers.size(); i++) {
sur->observers[i]->set_expand (obs_expand);
}
- } else {
- if (so != 0) {
- delete so;
- sur->sel_obs = 0;
+ }
+ if (s != old_sel) {
+ if (sur->temp_mode) {
+ set_temp_mode (addr);
+ if (sur->temp_mode > GroupOnly) {
+ sur->bank = 1;
+ strip_feedback (sur, false);
+ }
}
}
-
// need to set monitor for processor changed signal (for paging)
+ string address = lo_address_get_url (addr);
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
if (r) {
- r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, addr), this);
+ r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, address), this);
_sel_plugin (sur->plugin_id, addr);
}
}
void
-OSC::processor_changed (lo_address addr)
+OSC::processor_changed (string address)
{
+ lo_address addr = lo_address_new_from_url (address.c_str());
OSCSurface *sur = get_surface (addr);
_sel_plugin (sur->plugin_id, addr);
if (sur->sel_obs) {
return -1;
}
OSCSurface *sur = get_surface(get_address (msg));
- sur->expand_enable = false;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) {
+ if ((sur->temp_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));
}
}
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (state && sur->expand) {
+ if (!sur->expand_strip) {
+ state = 0;
+ float_message (X_("/select/expand"), 0.0, get_address (msg));
+ }
+ if (state) {
sur->expand_enable = (bool) state;
- s = get_strip (sur->expand, get_address (msg));
+ s = boost::shared_ptr<Stripable> ();
} else {
sur->expand_enable = false;
- s = _select;
+ s = boost::shared_ptr<Stripable> ();
}
return _strip_select (s, get_address (msg));
}
int
-OSC::route_set_gain_abs (int ssid, float level, lo_message msg)
+OSC::sel_previous (lo_message msg)
{
- if (!session) return -1;
- boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
- OSCSurface *sur = get_surface(get_address (msg));
+ return sel_delta (-1, msg);
+}
- if (s) {
- if (s->gain_control()) {
- fake_touch (s->gain_control());
- s->gain_control()->set_value (level, sur->usegroup);
+int
+OSC::sel_next (lo_message msg)
+{
+ return sel_delta (1, msg);
+}
+
+int
+OSC::sel_delta (int delta, lo_message msg)
+{
+ if (!delta) {
+ return 0;
+ }
+ OSCSurface *sur = get_surface(get_address (msg));
+ Sorted sel_strips;
+ if (sur->temp_mode < VCAOnly) {
+ sel_strips = sur->strips;
+ } else if (sur->temp_mode == VCAOnly) {
+ sel_strips = get_sorted_stripables(16, false, 0, sur->strips);
+ } else if (sur->temp_mode == BusOnly) {
+ sel_strips = get_sorted_stripables(132, false, 0, sur->strips);
+ } else {
+ return -1;
+ }
+ // the current selected strip _should_ be in sel_strips
+ uint32_t nstps = sel_strips.size ();
+ if (!nstps) {
+ return -1;
+ }
+ boost::shared_ptr<Stripable> new_sel = boost::shared_ptr<Stripable> ();
+ boost::weak_ptr<Stripable> o_sel = sur->select;
+ boost::shared_ptr<Stripable> old_sel= o_sel.lock ();
+ for (uint32_t i = 0; i < nstps; i++) {
+ if (old_sel == sel_strips[i]) {
+ if (i && delta < 0) {
+ // i is > 0 and delta is -1
+ new_sel = sel_strips[i - 1];
+ } else if ((i + 1) < nstps && delta > 0) {
+ // i is at least 1 less than greatest and delta = 1
+ new_sel = sel_strips[i + 1];
+ } else if ((i + 1) >= nstps && delta > 0) {
+ // i is greatest strip and delta 1
+ new_sel = sel_strips[0];
+ } else if (!i && delta < 0) {
+ // i = 0 and delta -1
+ new_sel = sel_strips[nstps - 1];
+ } else {
+ // should not happen
+ return -1;
+ }
+ }
+ }
+ if (!new_sel) {
+ // our selected strip has vanished use the first one
+ new_sel = sel_strips[0];
+ }
+ if (new_sel) {
+ if (!sur->expand_enable) {
+ SetStripableSelection (new_sel);
} else {
- return 1;
+ _strip_select (new_sel, get_address (msg));
}
- } else {
- return 1;
+ return 0;
}
-
- return 0;
+ return -1;
}
int
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<Stripable> s = get_strip (ssid, get_address (msg));
+ if (s) {
+ boost::shared_ptr<GainControl> gain_control;
+ if (sur->temp_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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
float abs;
if (s->gain_control()) {
return 0;
}
}
- return float_message("/select/gain", -193, get_address (msg));
+ return float_message(X_("/select/gain"), -193, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->gain_control()) {
float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
return 0;
}
}
- return float_message("/select/gain", -193, get_address (msg));
+ return float_message(X_("/select/gain"), -193, get_address (msg));
}
int
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<GainControl> gain_control;
+ if (sur->temp_mode == BusOnly && get_send (s, get_address (msg))) {
+ gain_control = get_send(s, get_address (msg))->gain_control();
+ } else {
+ 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 ("/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));
}
} 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;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
- float db = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
+ boost::shared_ptr<GainControl> gain_control;
+ if (sur->temp_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;
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->gain_control()) {
fake_touch (s->gain_control());
return 0;
}
}
- return float_message("/select/fader", 0, get_address (msg));
+ return float_message(X_("/select/fader"), 0, get_address (msg));
}
int
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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;
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;
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->trim_control()) {
s->trim_control()->set_value (dB_to_coefficient (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/trimdB", 0, get_address (msg));
+ return float_message(X_("/select/trimdB"), 0, get_address (msg));
}
int
-OSC::sel_pan_position (float val, lo_message msg)
+OSC::sel_hide (uint32_t state, lo_message msg)
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
+ s = sur->select;
+ if (s) {
+ if (state != s->is_hidden ()) {
+ s->presentation_info().set_hidden ((bool) state);
+ }
}
+ return 0;
+}
+
+int
+OSC::sel_pan_position (float val, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ s = sur->select;
if (s) {
if(s->pan_azimuth_control()) {
s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->pan_width_control()) {
s->pan_width_control()->set_value (s->pan_width_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/pan_stereo_width", 1, get_address (msg));
+ return float_message(X_("/select/pan_stereo_width"), 1, get_address (msg));
}
int
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<PBD::Controllable> pan_control = boost::shared_ptr<PBD::Controllable>();
+ if (sur->temp_mode == BusOnly && get_send (s, get_address (msg))) {
+ boost::shared_ptr<ARDOUR::Send> 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
OSCSurface *sur = get_surface(get_address (msg));
if (s) {
+ if ((sur->temp_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
{
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<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
float abs;
int send_id = 0;
if (s) {
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
{
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<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
float abs;
int send_id = 0;
if (s) {
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
{
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<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
int send_id = 0;
if (s) {
if (id > 0) {
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (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<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(send_id));
if (snd) {
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->master_send_enable_controllable ()) {
s->master_send_enable_controllable()->set_value (state, PBD::Controllable::NoGroup);
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
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<Stripable> s = sur->select;
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
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;
}
return -1;
}
OSCSurface *sur = get_surface(get_address (msg));
- boost::shared_ptr<Stripable> s = sur->select;
+ if (sur->plugins.size() > 0) {
+ boost::shared_ptr<Stripable> s = sur->select;
- boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+ boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
- if (r) {
- boost::shared_ptr<Processor> redi=r->nth_plugin (sur->plugins[sur->plugin_id -1]);
- if (redi) {
- boost::shared_ptr<PluginInsert> pi;
- if ((pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
- if(state > 0) {
- pi->activate();
- } else {
- pi->deactivate();
+ if (r) {
+ boost::shared_ptr<Processor> redi=r->nth_plugin (sur->plugins[sur->plugin_id -1]);
+ if (redi) {
+ boost::shared_ptr<PluginInsert> pi;
+ if ((pi = boost::dynamic_pointer_cast<PluginInsert>(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;
}
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;
}
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;
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->pan_elevation_control()) {
s->pan_elevation_control()->set_value (s->pan_elevation_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/pan_elevation_position", 0, get_address (msg));
+ return float_message(X_("/select/pan_elevation_position"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->pan_frontback_control()) {
s->pan_frontback_control()->set_value (s->pan_frontback_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return 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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->pan_lfe_control()) {
s->pan_lfe_control()->set_value (s->pan_lfe_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/pan_lfe_control", 0, get_address (msg));
+ return float_message(X_("/select/pan_lfe_control"), 0, get_address (msg));
}
// compressor control
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->comp_enable_controllable()) {
s->comp_enable_controllable()->set_value (s->comp_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/comp_enable", 0, get_address (msg));
+ return float_message(X_("/select/comp_enable"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->comp_threshold_controllable()) {
s->comp_threshold_controllable()->set_value (s->comp_threshold_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/comp_threshold", 0, get_address (msg));
+ return float_message(X_("/select/comp_threshold"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->comp_speed_controllable()) {
s->comp_speed_controllable()->set_value (s->comp_speed_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/comp_speed", 0, get_address (msg));
+ return float_message(X_("/select/comp_speed"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->comp_mode_controllable()) {
s->comp_mode_controllable()->set_value (s->comp_mode_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/comp_mode", 0, get_address (msg));
+ return float_message(X_("/select/comp_mode"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->comp_makeup_controllable()) {
s->comp_makeup_controllable()->set_value (s->comp_makeup_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/comp_makeup", 0, get_address (msg));
+ return float_message(X_("/select/comp_makeup"), 0, get_address (msg));
}
// EQ control
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->eq_enable_controllable()) {
s->eq_enable_controllable()->set_value (s->eq_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
return 0;
}
}
- return float_message("/select/eq_enable", 0, get_address (msg));
+ return float_message(X_("/select/eq_enable"), 0, get_address (msg));
}
int
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->filter_freq_controllable(true)) {
s->filter_freq_controllable(true)->set_value (s->filter_freq_controllable(true)->interface_to_internal (val), PBD::Controllable::NoGroup);
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->filter_freq_controllable(false)) {
s->filter_freq_controllable(false)->set_value (s->filter_freq_controllable(false)->interface_to_internal (val), PBD::Controllable::NoGroup);
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->filter_enable_controllable(true)) {
s->filter_enable_controllable(true)->set_value (s->filter_enable_controllable(true)->interface_to_internal (val), PBD::Controllable::NoGroup);
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->filter_enable_controllable(false)) {
s->filter_enable_controllable(false)->set_value (s->filter_enable_controllable(false)->interface_to_internal (val), PBD::Controllable::NoGroup);
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->filter_slope_controllable(true)) {
s->filter_slope_controllable(true)->set_value (s->filter_slope_controllable(true)->interface_to_internal (val), PBD::Controllable::NoGroup);
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (s->filter_slope_controllable(false)) {
s->filter_slope_controllable(false)->set_value (s->filter_slope_controllable(false)->interface_to_internal (val), PBD::Controllable::NoGroup);
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (id > 0) {
--id;
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (id > 0) {
--id;
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (id > 0) {
--id;
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
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
- }
+ s = sur->select;
if (s) {
if (id > 0) {
--id;
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
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;
}
};
OSC::Sorted
-OSC::get_sorted_stripables(std::bitset<32> types, bool cue)
+OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sorted my_list)
{
Sorted sorted;
StripableList stripables;
+ StripableList custom_list;
// fetch all stripables
session->get_stripables (stripables);
-
+ if (custom) {
+ uint32_t nstps = my_list.size ();
+ // check each custom strip to see if it still exists
+ boost::shared_ptr<Stripable> s;
+ for (uint32_t i = 0; i < nstps; i++) {
+ bool exists = false;
+ s = my_list[i];
+ for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+ boost::shared_ptr<Stripable> sl = *it;
+ if (s == sl) {
+ exists = true;
+ break;
+ }
+ }
+ if(!exists) {
+ my_list[i] = boost::shared_ptr<Stripable>();
+ } else {
+ custom_list.push_back (s);
+ }
+ }
+ if (custom == 1) {
+ return my_list;
+ } else {
+ stripables = custom_list;
+ }
+ }
// Look for stripables that match bit in sur->strip_types
for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
boost::shared_ptr<Stripable> s = *it;
+ if (!s) {
+ break;
+ }
+ if (custom == 2) {
+ // banking off use all valid custom strips
+ sorted.push_back (s);
+ } else
if ((!cue) && (!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
// do nothing... skip it
} else if (types[8] && (s->is_selected())) {
}
}
}
- sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
- // Master/Monitor might be anywhere... we put them at the end - Sorry ;)
- if (types[5]) {
- sorted.push_back (session->master_out());
+ if (!custom || (custom & 0x2)) {
+ sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
}
- if (types[6]) {
- if (session->monitor_out()) {
- sorted.push_back (session->monitor_out());
+ if (!custom) {
+ // Master/Monitor might be anywhere... we put them at the end - Sorry ;)
+ if (types[5]) {
+ sorted.push_back (session->master_out());
+ }
+ if (types[6]) {
+ if (session->monitor_out()) {
+ sorted.push_back (session->monitor_out());
+ }
}
}
return sorted;
}
}
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) {
}
}
}
- 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);
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);
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);
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);
}
s->feedback = 0;
s->gainmode = 1;
s->cue = true;
- s->strips = get_sorted_stripables(s->strip_types, s->cue);
+ s->strips = get_sorted_stripables(s->strip_types, s->cue, false, s->custom_strips);
s->nstrips = s->strips.size();
for (uint32_t n = 0; n < s->nstrips; ++n) {
boost::shared_ptr<Stripable> 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
}
}
}
- float_message ("/cue/fader", 0, get_address (msg));
+ float_message (X_("/cue/fader"), 0, get_address (msg));
return -1;
}
}
}
}
- float_message ("/cue/mute", 0, get_address (msg));
+ float_message (X_("/cue/mute"), 0, get_address (msg));
return -1;
}
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;
}
}
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;
}
int
OSC::float_message (string path, float val, lo_address addr)
{
+ _lo_lock.lock ();
lo_message reply;
reply = lo_message_new ();
lo_message_add_float (reply, (float) val);
lo_send_message (addr, path.c_str(), reply);
+ Glib::usleep(1);
lo_message_free (reply);
+ _lo_lock.unlock ();
return 0;
}
int
OSC::float_message_with_id (std::string path, uint32_t ssid, float value, bool in_line, lo_address addr)
{
+ _lo_lock.lock ();
lo_message msg = lo_message_new ();
if (in_line) {
path = string_compose ("%1/%2", path, ssid);
lo_message_add_float (msg, value);
lo_send_message (addr, path.c_str(), msg);
+ Glib::usleep(1);
lo_message_free (msg);
+ _lo_lock.unlock ();
+ return 0;
+}
+
+int
+OSC::int_message (string path, int val, lo_address addr)
+{
+ _lo_lock.lock ();
+
+ lo_message reply;
+ reply = lo_message_new ();
+ lo_message_add_int32 (reply, (float) val);
+
+ lo_send_message (addr, path.c_str(), reply);
+ Glib::usleep(1);
+ lo_message_free (reply);
+ _lo_lock.unlock ();
+
return 0;
}
int
OSC::int_message_with_id (std::string path, uint32_t ssid, int value, bool in_line, lo_address addr)
{
+ _lo_lock.lock ();
lo_message msg = lo_message_new ();
if (in_line) {
path = string_compose ("%1/%2", path, ssid);
lo_message_add_int32 (msg, value);
lo_send_message (addr, path.c_str(), msg);
+ Glib::usleep(1);
lo_message_free (msg);
+ _lo_lock.unlock ();
return 0;
}
int
OSC::text_message (string path, string val, lo_address addr)
{
+ _lo_lock.lock ();
lo_message reply;
reply = lo_message_new ();
lo_message_add_string (reply, val.c_str());
lo_send_message (addr, path.c_str(), reply);
+ Glib::usleep(1);
lo_message_free (reply);
+ _lo_lock.unlock ();
return 0;
}
int
OSC::text_message_with_id (std::string path, uint32_t ssid, std::string val, bool in_line, lo_address addr)
{
+ _lo_lock.lock ();
lo_message msg = lo_message_new ();
if (in_line) {
path = string_compose ("%1/%2", path, ssid);
lo_message_add_string (msg, val.c_str());
lo_send_message (addr, path.c_str(), msg);
+ Glib::usleep(1);
lo_message_free (msg);
+ _lo_lock.unlock ();
return 0;
}
projects / ardour.git / blobdiff