From c3ec93997cdc56e7547daa05ad1e042f340df6a8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 13 Jan 2024 03:11:20 +0100 Subject: [PATCH] Remove old well-known ctrls API --- libs/ardour/ardour/route.h | 50 ------- libs/ardour/ardour/stripable.h | 74 ---------- libs/ardour/ardour/vca.h | 50 +------ libs/ardour/luabindings.cc | 14 -- libs/ardour/route.cc | 239 +-------------------------------- 5 files changed, 9 insertions(+), 418 deletions(-) diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index c4a1b8cd7c..c157c46439 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -553,50 +553,6 @@ public: std::shared_ptr mapped_control (enum WellKnownCtrl, uint32_t band = 0) const; std::shared_ptr mapped_output (enum WellKnownData) const; - std::shared_ptr eq_enable_controllable () const; - std::shared_ptr eq_gain_controllable (uint32_t band) const; - std::shared_ptr eq_freq_controllable (uint32_t band) const; - std::shared_ptr eq_q_controllable (uint32_t band) const; - std::shared_ptr eq_shape_controllable (uint32_t band) const; - - std::shared_ptr filter_freq_controllable (bool hpf) const; - std::shared_ptr filter_slope_controllable (bool) const; - std::shared_ptr filter_enable_controllable (bool) const; - - std::shared_ptr tape_drive_controllable () const; - std::shared_ptr tape_drive_mode_controllable () const; - std::shared_ptr tape_drive_mtr_controllable () const; - - std::shared_ptr comp_enable_controllable () const; - std::shared_ptr comp_threshold_controllable () const; - std::shared_ptr comp_speed_controllable () const; - std::shared_ptr comp_mode_controllable () const; - std::shared_ptr comp_makeup_controllable () const; - std::shared_ptr comp_ratio_controllable () const; - std::shared_ptr comp_attack_controllable () const; - std::shared_ptr comp_release_controllable () const; - std::shared_ptr comp_key_filter_freq_controllable () const; - std::shared_ptr comp_lookahead_controllable () const; - std::shared_ptr comp_meter_controllable () const; - std::shared_ptr comp_redux_controllable () const; - - std::shared_ptr gate_enable_controllable () const; - std::shared_ptr gate_mode_controllable () const; - std::shared_ptr gate_ratio_controllable () const; - std::shared_ptr gate_knee_controllable () const; - std::shared_ptr gate_threshold_controllable () const; - std::shared_ptr gate_depth_controllable () const; - std::shared_ptr gate_hysteresis_controllable () const; - std::shared_ptr gate_hold_controllable () const; - std::shared_ptr gate_attack_controllable () const; - std::shared_ptr gate_release_controllable () const; - std::shared_ptr gate_key_listen_controllable () const; - std::shared_ptr gate_key_filter_enable_controllable () const; - std::shared_ptr gate_key_filter_freq_controllable () const; - std::shared_ptr gate_lookahead_controllable () const; - std::shared_ptr gate_meter_controllable () const; - std::shared_ptr gate_redux_controllable () const; - std::shared_ptr send_level_controllable (uint32_t n) const; std::shared_ptr send_enable_controllable (uint32_t n) const; std::shared_ptr send_pan_azimuth_controllable (uint32_t n) const; @@ -606,12 +562,6 @@ public: std::shared_ptr master_send_enable_controllable () const; - std::shared_ptr master_correlation_mtr_controllable (bool) const; - - std::shared_ptr master_limiter_enable_controllable () const; - std::shared_ptr master_limiter_mtr_controllable () const; - std::shared_ptr master_k_mtr_controllable () const; - void protect_automation (); bool has_external_redirects() const; diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index 2af114af41..d7d76821f9 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -145,7 +145,6 @@ class LIBARDOUR_API Stripable : public SessionObject, virtual uint32_t eq_band_cnt () const = 0; virtual std::string eq_band_name (uint32_t) const = 0; - virtual std::shared_ptr mapped_control (enum WellKnownCtrl, uint32_t band = 0) const = 0; virtual std::shared_ptr mapped_output (enum WellKnownData) const = 0; @@ -154,54 +153,6 @@ class LIBARDOUR_API Stripable : public SessionObject, */ PBD::Signal0 MappedControlsChanged; - virtual std::shared_ptr eq_enable_controllable () const = 0; - virtual std::shared_ptr eq_gain_controllable (uint32_t band) const = 0; - virtual std::shared_ptr eq_freq_controllable (uint32_t band) const = 0; - virtual std::shared_ptr eq_q_controllable (uint32_t band) const = 0; - virtual std::shared_ptr eq_shape_controllable (uint32_t band) const = 0; - - virtual std::shared_ptr filter_freq_controllable (bool hp /* false for LPF*/) const = 0; - virtual std::shared_ptr filter_slope_controllable (bool hp) const = 0; - virtual std::shared_ptr filter_enable_controllable (bool hp) const = 0; - - virtual std::shared_ptr tape_drive_controllable () const = 0; - virtual std::shared_ptr tape_drive_mode_controllable () const = 0; - virtual std::shared_ptr tape_drive_mtr_controllable () const = 0; - - /* "well-known" controls for a compressor in this route. Any or all may - * be null. - */ - - virtual std::shared_ptr comp_enable_controllable () const = 0; - virtual std::shared_ptr comp_threshold_controllable () const = 0; - virtual std::shared_ptr comp_speed_controllable () const = 0; - virtual std::shared_ptr comp_mode_controllable () const = 0; - virtual std::shared_ptr comp_makeup_controllable () const = 0; - virtual std::shared_ptr comp_ratio_controllable () const = 0; - virtual std::shared_ptr comp_attack_controllable () const = 0; - virtual std::shared_ptr comp_release_controllable () const = 0; - virtual std::shared_ptr comp_key_filter_freq_controllable () const = 0; - virtual std::shared_ptr comp_lookahead_controllable () const = 0; - virtual std::shared_ptr comp_meter_controllable () const = 0; - virtual std::shared_ptr comp_redux_controllable () const = 0; - - virtual std::shared_ptr gate_enable_controllable () const = 0; - virtual std::shared_ptr gate_mode_controllable () const = 0; - virtual std::shared_ptr gate_ratio_controllable () const = 0; - virtual std::shared_ptr gate_knee_controllable () const = 0; - virtual std::shared_ptr gate_threshold_controllable () const = 0; - virtual std::shared_ptr gate_depth_controllable () const = 0; - virtual std::shared_ptr gate_hysteresis_controllable () const = 0; - virtual std::shared_ptr gate_hold_controllable () const = 0; - virtual std::shared_ptr gate_attack_controllable () const = 0; - virtual std::shared_ptr gate_release_controllable () const = 0; - virtual std::shared_ptr gate_key_listen_controllable () const = 0; - virtual std::shared_ptr gate_key_filter_enable_controllable () const = 0; - virtual std::shared_ptr gate_key_filter_freq_controllable () const = 0; - virtual std::shared_ptr gate_lookahead_controllable () const = 0; - virtual std::shared_ptr gate_meter_controllable () const = 0; - virtual std::shared_ptr gate_redux_controllable () const = 0; - /* "well-known" controls for sends to well-known busses in this route. Any or all may * be null. * @@ -227,31 +178,6 @@ class LIBARDOUR_API Stripable : public SessionObject, */ virtual std::shared_ptr master_send_enable_controllable () const = 0; - /* well known control for mixbus's correlation meter. - * - * In Ardour, this returns null. - * In Mixbus, it will return a suitable control, or null depending on the route. - * @param mm min/max of the correlation range, true for upper value - */ - virtual std::shared_ptr master_correlation_mtr_controllable (bool mm) const { return std::shared_ptr(); } - - /* well known control for mixbus's limiter. - * - * In Ardour, this returns null. - * In Mixbus, it will return a suitable control, or null depending on - * the route. - */ - virtual std::shared_ptr master_limiter_enable_controllable () const { return std::shared_ptr(); } - virtual std::shared_ptr master_limiter_mtr_controllable () const { return std::shared_ptr(); } - - /* well known control for mixbus's k-meter. - * - * In Ardour, this returns null. - * In Mixbus, it will return a suitable control, or null depending on - * the route. - */ - virtual std::shared_ptr master_k_mtr_controllable () const { return std::shared_ptr(); } - virtual bool muted_by_others_soloing () const = 0; virtual std::shared_ptr monitor_control() const = 0; diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index 7756a2eaa5..76885d2c8d 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -118,72 +118,32 @@ class LIBARDOUR_API VCA : public Stripable, } std::shared_ptr solo_isolate_control() const { return std::shared_ptr(); } - std::shared_ptr solo_safe_control() const { return std::shared_ptr(); } + std::shared_ptr solo_safe_control() const { return std::shared_ptr(); } + std::shared_ptr peak_meter() { return std::shared_ptr(); } std::shared_ptr peak_meter() const { return std::shared_ptr(); } std::shared_ptr phase_control() const { return std::shared_ptr(); } std::shared_ptr trim_control() const { return std::shared_ptr(); } + std::shared_ptr pan_azimuth_control() const { return std::shared_ptr(); } std::shared_ptr pan_elevation_control() const { return std::shared_ptr(); } std::shared_ptr pan_width_control() const { return std::shared_ptr(); } std::shared_ptr pan_frontback_control() const { return std::shared_ptr(); } std::shared_ptr pan_lfe_control() const { return std::shared_ptr(); } - std::shared_ptr tape_drive_controllable () const { return std::shared_ptr(); } - std::shared_ptr tape_drive_mode_controllable () const { return std::shared_ptr(); } - std::shared_ptr tape_drive_mtr_controllable () const { return std::shared_ptr(); } + uint32_t eq_band_cnt () const { return 0; } std::string eq_band_name (uint32_t) const { return std::string(); } - std::shared_ptr eq_enable_controllable () const { return std::shared_ptr(); } - std::shared_ptr eq_gain_controllable (uint32_t) const { return std::shared_ptr(); } - std::shared_ptr eq_freq_controllable (uint32_t) const { return std::shared_ptr(); } - std::shared_ptr eq_q_controllable (uint32_t) const { return std::shared_ptr(); } - std::shared_ptr eq_shape_controllable (uint32_t) const { return std::shared_ptr(); } - std::shared_ptr filter_freq_controllable (bool) const { return std::shared_ptr(); } - std::shared_ptr filter_slope_controllable (bool) const { return std::shared_ptr(); } - std::shared_ptr filter_enable_controllable (bool) const { return std::shared_ptr(); } - std::shared_ptr comp_enable_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_threshold_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_speed_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_mode_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_makeup_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_ratio_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_attack_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_release_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_key_filter_freq_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_lookahead_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_meter_controllable () const { return std::shared_ptr(); } - std::shared_ptr comp_redux_controllable () const { return std::shared_ptr(); } - - std::shared_ptr gate_enable_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_mode_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_ratio_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_knee_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_threshold_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_depth_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_hysteresis_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_hold_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_attack_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_release_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_key_listen_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_key_filter_enable_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_key_filter_freq_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_lookahead_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_meter_controllable () const { return std::shared_ptr(); } - std::shared_ptr gate_redux_controllable () const { return std::shared_ptr(); } std::shared_ptr send_level_controllable (uint32_t n) const { return std::shared_ptr(); } std::shared_ptr send_enable_controllable (uint32_t n) const { return std::shared_ptr(); } std::shared_ptr send_pan_azimuth_controllable (uint32_t n) const { return std::shared_ptr(); } std::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const { return std::shared_ptr(); } std::string send_name (uint32_t n) const { return std::string(); } + std::shared_ptr master_send_enable_controllable () const { return std::shared_ptr(); } std::shared_ptr monitor_control() const { return std::shared_ptr(); } std::shared_ptr monitoring_control() const { return std::shared_ptr(); } - //additional filter params (currently 32C only ) - std::shared_ptr eq_lpf_controllable () const { return std::shared_ptr(); } - std::shared_ptr filter_enable_controllable () const { return std::shared_ptr(); } - protected: SlavableAutomationControlList slavables () const; diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 31bbd490fc..1dcc1b8eeb 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -1407,22 +1407,8 @@ LuaBindings::common (lua_State* L) .addFunction ("send_name", &Stripable::send_name) .addFunction ("monitor_control", &Stripable::monitor_control) .addFunction ("master_send_enable_controllable", &Stripable::master_send_enable_controllable) - .addFunction ("comp_enable_controllable", &Stripable::comp_enable_controllable) - .addFunction ("comp_threshold_controllable", &Stripable::comp_threshold_controllable) - .addFunction ("comp_speed_controllable", &Stripable::comp_speed_controllable) - .addFunction ("comp_mode_controllable", &Stripable::comp_mode_controllable) - .addFunction ("comp_makeup_controllable", &Stripable::comp_makeup_controllable) - .addFunction ("comp_redux_controllable", &Stripable::comp_redux_controllable) .addFunction ("eq_band_cnt", &Stripable::eq_band_cnt) - .addFunction ("eq_enable_controllable", &Stripable::eq_enable_controllable) .addFunction ("eq_band_name", &Stripable::eq_band_name) - .addFunction ("eq_gain_controllable", &Stripable::eq_gain_controllable) - .addFunction ("eq_freq_controllable", &Stripable::eq_freq_controllable) - .addFunction ("eq_q_controllable", &Stripable::eq_q_controllable) - .addFunction ("eq_shape_controllable", &Stripable::eq_shape_controllable) - .addFunction ("filter_freq_controllable", &Stripable::filter_freq_controllable) - .addFunction ("filter_slope_controllable", &Stripable::filter_slope_controllable) - .addFunction ("filter_enable_controllable", &Stripable::filter_enable_controllable) .addFunction ("set_presentation_order", &Stripable::set_presentation_order) .addFunction ("presentation_info_ptr", &Stripable::presentation_info_ptr) .addFunction ("slaved_to", &Stripable::slaved_to) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 8042f07ade..d45e9e19cb 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5854,13 +5854,6 @@ Route::pan_lfe_control() const } } -uint32_t -Route::eq_band_cnt () const -{ - /* Ardour has no well-known EQ object */ - return 0; -} - void Route::add_well_known_ctrl (WellKnownCtrl which) { @@ -5889,92 +5882,11 @@ Route::mapped_output (enum WellKnownData which) const return std::shared_ptr(); } -std::shared_ptr -Route::eq_enable_controllable () const +uint32_t +Route::eq_band_cnt () const { - return std::shared_ptr(); -} -std::shared_ptr -Route::eq_gain_controllable (uint32_t band) const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::eq_freq_controllable (uint32_t band) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::eq_q_controllable (uint32_t band) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::eq_shape_controllable (uint32_t band) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::filter_freq_controllable (bool hpf) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::filter_slope_controllable (bool) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::filter_enable_controllable (bool) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::tape_drive_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::tape_drive_mode_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::tape_drive_mtr_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::master_correlation_mtr_controllable (bool mm) const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::master_limiter_enable_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::master_limiter_mtr_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::master_k_mtr_controllable () const -{ - return std::shared_ptr(); + /* Ardour has no well-known EQ object */ + return 0; } string @@ -5983,149 +5895,6 @@ Route::eq_band_name (uint32_t band) const return string (); } -std::shared_ptr -Route::comp_enable_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::comp_threshold_controllable () const -{ - return std::shared_ptr(); -} - -std::shared_ptr -Route::comp_speed_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_mode_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_makeup_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_ratio_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_attack_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_release_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_key_filter_freq_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_lookahead_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_meter_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::comp_redux_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_enable_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_mode_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_ratio_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_knee_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_threshold_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_depth_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_hysteresis_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_hold_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_attack_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_release_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_key_listen_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_key_filter_enable_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_key_filter_freq_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_lookahead_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_meter_controllable () const -{ - return std::shared_ptr(); -} -std::shared_ptr -Route::gate_redux_controllable () const -{ - return std::shared_ptr(); -} - std::shared_ptr Route::send_pan_azimuth_controllable (uint32_t n) const {