summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-12-27 18:36:20 +0100
committerRobin Gareus <robin@gareus.org>2015-12-27 18:36:20 +0100
commitdd9e0e49a016a408b7a6506282a86584e76a2715 (patch)
tree2adb13c31a33ef60962501df3715eb5e03c868dd /libs/ardour
parent47922c5d19736c3d1fc8eeee7ca8a83561ac268b (diff)
proper display name for Monitor Processor
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/amp.cc7
-rw-r--r--libs/ardour/ardour/amp.h6
-rw-r--r--libs/ardour/route.cc4
3 files changed, 10 insertions, 7 deletions
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<GainControl> _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));