X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=98a005a0361b1318b646b7d5da03f66e36227d62;hb=61d26e5678de2738120c5be9832d4e9c480d3c47;hp=c325673c5581303ead7048216e279b5b00c8dd40;hpb=b38ab89d92a5f963c90da885409da541ad081a65;p=ardour.git diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index c325673c55..98a005a036 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -21,6 +21,7 @@ #include +#include "ardour/logmeter.h" #include "ardour/session.h" #include "ardour/route.h" #include "ardour/route_group.h" @@ -29,25 +30,26 @@ #include "ardour/audio_track.h" #include "ardour/midi_track.h" -#include -#include -#include -#include +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/keyboard.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/rgb_macros.h" + +#include "widgets/tooltips.h" -#include "ardour_ui.h" -#include "global_signals.h" -#include "logmeter.h" #include "gui_thread.h" #include "ardour_window.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 ArdourWidgets; using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; @@ -59,11 +61,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; @@ -112,12 +113,12 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) nfo_vbox.show(); UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed)); - ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); - 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() @@ -143,7 +144,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) level_meter = new LevelMeterHBox(sess); level_meter->set_meter (_route->shared_peak_meter().get()); level_meter->clear_meters(); - level_meter->set_type (_route->meter_type()); + level_meter->set_meter_type (_route->meter_type()); level_meter->setup_meters (220, meter_width, 6); level_meter->ButtonPress.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_press, this, _1)); level_meter->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1)); @@ -158,7 +159,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)); @@ -183,8 +184,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, Gtkmm2ext::markup_escape_text (_route->name())); + set_tooltip (*level_meter, Gtkmm2ext::markup_escape_text (_route->name())); number_label.set_corner_radius(2); number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive)); @@ -294,14 +295,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)); - ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); - 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()); @@ -366,7 +366,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)); @@ -389,16 +389,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()); } } @@ -415,7 +415,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 ); } } @@ -488,7 +488,7 @@ MeterStrip::set_tick_bar (int m) } else { n = meter_ticks1_area.get_name(); if (n.substr(0,3) == "Bar") { - meter_ticks1_area.set_name(n.substr(3,-1)); + meter_ticks1_area.set_name (n.substr (3)); } } if (_tick_bar & 2) { @@ -499,7 +499,7 @@ MeterStrip::set_tick_bar (int m) } else { n = meter_ticks2_area.get_name(); if (n.substr(0,3) == "Bar") { - meter_ticks2_area.set_name(n.substr(3,-1)); + meter_ticks2_area.set_name (n.substr (3)); } } } @@ -545,8 +545,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; @@ -801,17 +801,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)); 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(); } @@ -842,6 +842,7 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev) _suspend_menu_callbacks = true; add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); + add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB); add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); @@ -928,7 +929,7 @@ MeterStrip::set_meter_type (MeterType type) if (_suspend_menu_callbacks) return; if (_route->meter_type() == type) return; - level_meter->set_type (type); + level_meter->set_meter_type (type); } void @@ -954,15 +955,28 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type) switch (what) { case -1: if (_route && group == _route->route_group()) { - level_meter->set_type (type); + level_meter->set_meter_type (type); } break; case 0: - level_meter->set_type (type); + level_meter->set_meter_type (type); default: if (what == _strip_type) { - level_meter->set_type (type); + level_meter->set_meter_type (type); } break; } } + +string +MeterStrip::name () const +{ + return _route->name(); +} + +Gdk::Color +MeterStrip::color () const +{ + return RouteUI::route_color (); +} +