X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=db96a3cb7f7fcc7799e52efcf827d6a922b81f57;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=cd33ba345beb1dadf86325009e26ab15321b0cdd;hpb=fc1e7dbb55939c708ce572d3a5c2518ea926a682;p=ardour.git diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index cd33ba345b..db96a3cb7f 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -34,17 +34,18 @@ #include #include -#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" #include "meterbridge.h" #include "meter_strip.h" #include "meter_patterns.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -58,11 +59,10 @@ PBD::Signal1 MeterStrip::CatchDeletion; PBD::Signal0 MeterStrip::MetricChanged; PBD::Signal0 MeterStrip::ConfigurationChanged; -#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::ui_scale)) +#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale())) MeterStrip::MeterStrip (int metricmode, MeterType mt) - : AxisView(0) - , RouteUI(0) + : RouteUI ((Session*) 0) { level_meter = 0; _strip_type = 0; @@ -111,12 +111,12 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) nfo_vbox.show(); UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed)); - UIConfiguration::ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); - UIConfiguration::DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); + UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); } MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteUI(0) , _route(rt) , peak_display() @@ -157,7 +157,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr 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)); @@ -182,8 +182,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr 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)); @@ -293,14 +293,13 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose)); _route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context()); - _route->PropertyChanged.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context()); peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false); name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false); UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed)); - UIConfiguration::ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); - UIConfiguration::DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); + UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context()); sess->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context()); @@ -365,7 +364,7 @@ MeterStrip::set_button_names() { mute_button->set_text (S_("Mute|M")); - if (_route && _route->solo_safe()) { + if (_route && _route->solo_safe_control()->solo_safe()) { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); } else { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive)); @@ -388,16 +387,16 @@ MeterStrip::set_button_names() } void -MeterStrip::strip_property_changed (const PropertyChange& what_changed) +MeterStrip::route_property_changed (const PropertyChange& what_changed) { if (!what_changed.contains (ARDOUR::Properties::name)) { return; } 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()); } } @@ -414,7 +413,7 @@ MeterStrip::fast_update () float mpeak = level_meter->update_meters(); if (mpeak > max_peak) { max_peak = mpeak; - if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) { + if (mpeak >= UIConfiguration::instance().get_meter_peak()) { peak_display.set_active_state ( Gtkmm2ext::ExplicitActive ); } } @@ -544,8 +543,8 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a) tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9() } - nh *= ARDOUR_UI::ui_scale; - tnh *= ARDOUR_UI::ui_scale; + nh *= UIConfiguration::instance().get_ui_scale(); + tnh *= UIConfiguration::instance().get_ui_scale(); int prev_height, ignored; bool need_relayout = false; @@ -800,17 +799,17 @@ MeterStrip::name_changed () { } name_label.set_text(_route->name ()); if (_session && _session->config.get_track_name_number()) { - const int64_t track_number = _route->track_number (); + const uint64_t track_number = _route->track_number(); if (track_number == 0) { number_label.set_text("-"); number_label.hide(); } else { - number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); + number_label.set_text (PBD::to_string (track_number, std::dec)); number_label.show(); } const int tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9() // NB numbers are rotated 90deg. on the meterbridge -> use height - number_label.set_size_request(PX_SCALE(18, 18), tnh * ARDOUR_UI::ui_scale); + number_label.set_size_request(PX_SCALE(18, 18), tnh * UIConfiguration::instance().get_ui_scale()); } else { number_label.hide(); } @@ -966,3 +965,16 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type) break; } } + +string +MeterStrip::name () const +{ + return _route->name(); +} + +Gdk::Color +MeterStrip::color () const +{ + return RouteUI::route_color (); +} +