summaryrefslogtreecommitdiff
path: root/gtk2_ardour/meter_strip.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2015-01-05 12:32:14 +0700
committerPaul Davis <paul@linuxaudiosystems.com>2015-09-16 16:55:17 -0400
commit1d42ed077e555a83a93bac436547e7c378ee0c00 (patch)
treeae50cb81adaa7a6b321acd687c0d27c60f3da571 /gtk2_ardour/meter_strip.cc
parent2031007a3a6a2c47ec6c4dd5270afd5dc7a53de4 (diff)
Use ARDOUR_UI_UTILS::set_tooltip rather than via ARDOUR_UI::set_tip
This removes the direct dependence on ARDOUR_UI/Gtk_UI for setting tooltips. Removes inclusion of ardour_ui.h from 16 files.
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
-rw-r--r--gtk2_ardour/meter_strip.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index b1199811ef..82acd1dad5 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -34,10 +34,10 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/rgb_macros.h>
-#include "ardour_ui.h"
#include "logmeter.h"
#include "gui_thread.h"
#include "ardour_window.h"
+#include "tooltips.h"
#include "ui_config.h"
#include "utils.h"
@@ -158,7 +158,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
// peak display
peak_display.set_name ("meterbridge peakindicator");
peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
- ARDOUR_UI::instance()->set_tip (peak_display, _("Reset Peak"));
+ set_tooltip (peak_display, _("Reset Peak"));
max_peak = minus_infinity();
peak_display.unset_flags (Gtk::CAN_FOCUS);
peak_display.set_size_request(PX_SCALE(12, 12), PX_SCALE(8, 8));
@@ -183,8 +183,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 50));
name_label.set_alignment(-1.0, .5);
- ARDOUR_UI::instance()->set_tip (name_label, _route->name());
- ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+ set_tooltip (name_label, _route->name());
+ set_tooltip (*level_meter, _route->name());
number_label.set_corner_radius(2);
number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
@@ -396,9 +396,9 @@ MeterStrip::strip_property_changed (const PropertyChange& what_changed)
}
ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
name_changed();
- ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+ set_tooltip (name_label, _route->name());
if (level_meter) {
- ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+ set_tooltip (*level_meter, _route->name());
}
}