diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index 8b55b8ca8d..955dd13ccc 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -54,12 +54,7 @@ Amp::Amp (Session& s, std::string type) _gain_control->set_flags (Controllable::GainLike); add_control(_gain_control); -} - -std::string -Amp::display_name() const -{ - return _type == "trim" ? _("Trim") : _("Fader"); + set_display_name (_type == "trim" ? _("Trim") : _("Fader")); } bool diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index 7cde853155..e8445c4853 100644 --- a/libs/ardour/ardour/amp.h +++ b/libs/ardour/ardour/amp.h @@ -38,7 +38,9 @@ class LIBARDOUR_API Amp : public Processor { public: Amp(Session& s, std::string type = "amp"); - std::string display_name() const; + std::string display_name () const { return _display_name; } + void set_display_name (const std::string& name) { _display_name = name; } + std::string type() const { return _type;} bool visible () const; @@ -121,6 +123,8 @@ private: float _current_gain; framepos_t _current_automation_frame; + std::string _display_name; + boost::shared_ptr _gain_control; /** Buffer that we should use for gain automation */ diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index caae7af43a..fef1ea14a3 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -174,6 +174,10 @@ Route::init () _amp.reset (new Amp (_session)); add_processor (_amp, PostFader); + if (is_monitor ()) { + _amp->set_display_name ("Monitor"); + } + // amp should exist before amp controls _group_gain_control.reset (new GroupGainControllable (X_("groupgain"), shared_from_this ())); _group_gain_control->set_flags (Controllable::Flag (_group_gain_control->flags() | Controllable::GainLike));