diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 7f8155b823..9883e6b8d3 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -549,7 +549,6 @@ public: std::shared_ptr filter_slope_controllable (bool) const; std::shared_ptr filter_enable_controllable (bool) const; - std::string tape_mode_name (uint32_t) const; std::shared_ptr tape_drive_controllable () const; std::shared_ptr tape_drive_mode_controllable () const; std::shared_ptr tape_drive_mtr_controllable () const; @@ -567,7 +566,6 @@ public: std::shared_ptr comp_meter_controllable () const; std::shared_ptr comp_redux_controllable () const; - std::string gate_mode_name (uint32_t) const; std::shared_ptr gate_enable_controllable () const; std::shared_ptr gate_mode_controllable () const; std::shared_ptr gate_ratio_controllable () const; @@ -585,9 +583,6 @@ public: std::shared_ptr gate_meter_controllable () const; std::shared_ptr gate_redux_controllable () const; - std::string comp_mode_name (uint32_t mode) const; - std::string comp_speed_name (uint32_t mode) 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; diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index 8617b499dd..627fef48b8 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -142,8 +142,8 @@ class LIBARDOUR_API Stripable : public SessionObject, * return of a null ptr (or an empty string for eq_band_name()). */ virtual uint32_t eq_band_cnt () const = 0; - virtual std::shared_ptr eq_enable_controllable () const = 0; virtual std::string eq_band_name (uint32_t) const = 0; + 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; @@ -153,8 +153,6 @@ class LIBARDOUR_API Stripable : public SessionObject, virtual std::shared_ptr filter_slope_controllable (bool hp) const = 0; virtual std::shared_ptr filter_enable_controllable (bool hp) const = 0; - - virtual std::string tape_mode_name (uint32_t) 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; @@ -176,7 +174,6 @@ class LIBARDOUR_API Stripable : public SessionObject, virtual std::shared_ptr comp_meter_controllable () const = 0; virtual std::shared_ptr comp_redux_controllable () const = 0; - virtual std::string gate_mode_name (uint32_t) 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; @@ -194,17 +191,6 @@ class LIBARDOUR_API Stripable : public SessionObject, virtual std::shared_ptr gate_meter_controllable () const = 0; virtual std::shared_ptr gate_redux_controllable () const = 0; - /* @param mode must be supplied by the comp_mode_controllable(). All other values - * result in undefined behaviour - */ - virtual std::string comp_mode_name (uint32_t mode) const = 0; - - /* @param mode - as for comp mode name. This returns the name for the - * parameter/control accessed via comp_speed_controllable(), which can - * be mode dependent. - */ - virtual std::string comp_speed_name (uint32_t mode) const = 0; - /* "well-known" controls for sends to well-known busses in this route. Any or all may * be null. * diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index 15c05a4bd1..e0a930fd11 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -164,11 +164,6 @@ class LIBARDOUR_API VCA : public Stripable, std::shared_ptr gate_meter_controllable () const { return std::shared_ptr(); } std::shared_ptr gate_redux_controllable () const { return std::shared_ptr(); } - std::string tape_mode_name (uint32_t) const {return std::string("");} - std::string gate_mode_name (uint32_t) const {return std::string("");} - std::string comp_mode_name (uint32_t mode) const { return std::string(); } - std::string comp_speed_name (uint32_t mode) const { return std::string(); } - 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(); } diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 9461b47f47..4dbb8b0057 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -1371,8 +1371,6 @@ LuaBindings::common (lua_State* L) .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 ("comp_mode_name", &Stripable::comp_mode_name) - .addFunction ("comp_speed_name", &Stripable::comp_speed_name) .addFunction ("eq_band_cnt", &Stripable::eq_band_cnt) .addFunction ("eq_enable_controllable", &Stripable::eq_enable_controllable) .addFunction ("eq_band_name", &Stripable::eq_band_name) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index c2539fba39..ef427dd395 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5807,12 +5807,6 @@ Route::filter_enable_controllable (bool) const return std::shared_ptr(); } -std::string -Route::tape_mode_name (uint32_t mode) const -{ - return _("???"); -} - std::shared_ptr Route::tape_drive_controllable () const { @@ -5923,24 +5917,6 @@ Route::comp_redux_controllable () const { return std::shared_ptr(); } -string -Route::comp_mode_name (uint32_t mode) const -{ - return _("???"); -} - -string -Route::comp_speed_name (uint32_t mode) const -{ - return _("???"); -} - -string -Route::gate_mode_name (uint32_t mode) const -{ - return _("???"); -} - std::shared_ptr Route::gate_enable_controllable () const { diff --git a/libs/surfaces/mackie/subview.cc b/libs/surfaces/mackie/subview.cc index 088658f073..4f36cf79d4 100644 --- a/libs/surfaces/mackie/subview.cc +++ b/libs/surfaces/mackie/subview.cc @@ -508,7 +508,7 @@ void DynamicsSubview::setup_vpot( std::vector params; if (tc) { available.push_back (std::make_pair (tc, "Thresh")); } - if (sc) { available.push_back (std::make_pair (sc, mc ? _subview_stripable->comp_speed_name (mc->get_value()) : "Speed")); } + if (sc) { available.push_back (std::make_pair (sc, mc ? mc->get_user_string () : "Speed")); } if (mc) { available.push_back (std::make_pair (mc, "Mode")); } if (kc) { available.push_back (std::make_pair (kc, "Makeup")); } if (ec) { available.push_back (std::make_pair (ec, "on/off")); } @@ -571,7 +571,7 @@ DynamicsSubview::notify_change (std::weak_ptr pc, uin if (control) { float val = control->get_value(); if (control == _subview_stripable->comp_mode_controllable ()) { - pending_display[1] = _subview_stripable->comp_mode_name (val); + pending_display[1] = control->get_user_string (); } else { do_parameter_display(pending_display[1], control->desc(), val, strip, true); } diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 82679d7968..6fe40a65ca 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -1061,8 +1061,8 @@ void OSCSelectObserver::comp_mode () { change_message (X_("/select/comp_mode"), _strip->comp_mode_controllable()); - _osc.text_message (X_("/select/comp_mode_name"), _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()), addr); - _osc.text_message (X_("/select/comp_speed_name"), _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()), addr); + _osc.text_message (X_("/select/comp_mode_name"), _strip->comp_mode_controllable()->get_user_string(), addr); + _osc.text_message (X_("/select/comp_speed_name"), _strip->comp_speed_controllable()->get_user_string(), addr); } void