X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=cf981763fa8236465d630c01b18238a81a8eab38;hp=bda1d07d8986298f75ba01fac2664e45d2ad14cf;hb=ae0dcdc0c5d13483271065c360e378202d20170a;hpb=0a4038f1df44bd289fac1f767eacb1b863fb5fbe diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index bda1d07d89..cf981763fa 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,24 +61,26 @@ PBD::Signal1 MeterStrip::CatchDeletion; PBD::Signal0 MeterStrip::MetricChanged; PBD::Signal0 MeterStrip::ConfigurationChanged; +#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; _tick_bar = 0; _metricmode = -1; metric_type = MeterPeak; - mtr_vbox.set_spacing(2); - nfo_vbox.set_spacing(2); - peakbx.set_size_request(-1, 14); - namebx.set_size_request(18, 52); - spacer.set_size_request(-1,0); + + mtr_vbox.set_spacing (PX_SCALE(2, 2)); + nfo_vbox.set_spacing (PX_SCALE(2, 2)); + peakbx.set_size_request (-1, PX_SCALE(14, 14)); + namebx.set_size_request (PX_SCALE(16, 18), PX_SCALE(32, 52)); + spacer.set_size_request (-1,0); set_metric_mode(metricmode, mt); - meter_metric_area.set_size_request(25, 10); + meter_metric_area.set_size_request (PX_SCALE(25, 25), 10); meter_metric_area.signal_expose_event().connect ( sigc::mem_fun(*this, &MeterStrip::meter_metrics_expose)); RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics)); @@ -88,7 +92,7 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) mtr_vbox.pack_start (spacer, false, false); mtr_container.add(mtr_vbox); - mtr_hsep.set_size_request(-1,1); + mtr_hsep.set_size_request (-1, 1); mtr_hsep.set_name("BlackSeparator"); nfo_vbox.pack_start (mtr_hsep, false, false); @@ -109,18 +113,18 @@ 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() { - mtr_vbox.set_spacing(2); - nfo_vbox.set_spacing(2); + mtr_vbox.set_spacing (PX_SCALE(2, 2)); + nfo_vbox.set_spacing (PX_SCALE(2, 2)); SessionHandlePtr::set_session (sess); RouteUI::init (); RouteUI::set_route (rt); @@ -130,6 +134,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) _metricmode = -1; metric_type = MeterPeak; + // note: level_meter->setup_meters() does the scaling int meter_width = 6; if (_route->shared_peak_meter()->input_streams().n_total() == 1) { meter_width = 12; @@ -139,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)); @@ -154,42 +159,42 @@ 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(12, 8); - peak_display.set_corner_radius(2); + peak_display.set_size_request(PX_SCALE(12, 12), PX_SCALE(8, 8)); + peak_display.set_corner_radius(2); // ardour-button scales this peak_align.set(0.5, 1.0, 1.0, 0.8); peak_align.add(peak_display); - peakbx.pack_start(peak_align, true, true, 3); - peakbx.set_size_request(-1, 14); + peakbx.pack_start(peak_align, true, true, 2); + peakbx.set_size_request(-1, PX_SCALE(14, 14)); // add track-name & -number label number_label.set_text("-"); - number_label.set_size_request(18, 18); + number_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(18, 18)); name_changed(); - name_label.set_corner_radius(2); + name_label.set_corner_radius(2); // ardour button scales radius name_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive)); name_label.set_name("meterbridge label"); name_label.set_angle(-90.0); name_label.set_text_ellipsize (Pango::ELLIPSIZE_END); - name_label.set_layout_ellisize_width(48 * PANGO_SCALE); - name_label.set_size_request(18, 50); + 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)); number_label.set_name("tracknumber label"); number_label.set_angle(-90.0); - number_label.set_layout_ellisize_width(18 * PANGO_SCALE); + number_label.set_layout_ellipsize_width(18 * PANGO_SCALE); number_label.set_alignment(.5, .5); - namebx.set_size_request(18, 52); + namebx.set_size_request(PX_SCALE(18, 18), PX_SCALE(52, 52)); namebx.pack_start(namenumberbx, true, false, 0); namenumberbx.pack_start(name_label, true, false, 0); namenumberbx.pack_start(number_label, false, false, 0); @@ -207,25 +212,25 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) btnbox.pack_start(solobox, false, false, 1); rec_enable_button->set_corner_radius(2); - rec_enable_button->set_size_request(18, 18); + rec_enable_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); mute_button->set_corner_radius(2); - mute_button->set_size_request(18, 18); + mute_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); solo_button->set_corner_radius(2); - solo_button->set_size_request(18, 18); + solo_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); monitor_input_button->set_corner_radius(2); - monitor_input_button->set_size_request(18, 18); + monitor_input_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); monitor_disk_button->set_corner_radius(2); - monitor_disk_button->set_size_request(18, 18); + monitor_disk_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); - mutebox.set_size_request(18, 18); - solobox.set_size_request(18, 18); - recbox.set_size_request(18, 18); - mon_in_box.set_size_request(18, 18); - mon_disk_box.set_size_request(18, 18); + mutebox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); + solobox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); + recbox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); + mon_in_box.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); + mon_disk_box.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18)); spacer.set_size_request(-1,0); update_button_box(); @@ -284,20 +289,19 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) meter_configuration_changed (_route->shared_peak_meter()->input_streams ()); - meter_ticks1_area.set_size_request(3,-1); - meter_ticks2_area.set_size_request(3,-1); + meter_ticks1_area.set_size_request(PX_SCALE(3, 3), -1); + meter_ticks2_area.set_size_request(PX_SCALE(3, 3), -1); meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose)); 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()); @@ -350,47 +354,51 @@ MeterStrip::blink_rec_display (bool onoff) std::string MeterStrip::state_id() const { - return string_compose ("mtrs %1", _route->id().to_s()); + if (_route) { + return string_compose ("mtrs %1", _route->id().to_s()); + } else { + return string (); + } } void MeterStrip::set_button_names() { - mute_button->set_text (_("M")); + 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)); } if (!Config->get_solo_control_is_listen_control()) { - solo_button->set_text (_("S")); + solo_button->set_text (S_("Solo|S")); } else { switch (Config->get_listen_position()) { case AfterFaderListen: - solo_button->set_text (_("A")); + solo_button->set_text (S_("AfterFader|A")); break; case PreFaderListen: - solo_button->set_text (_("P")); + solo_button->set_text (S_("PreFader|P")); break; } } - monitor_input_button->set_text (_("I")); - monitor_disk_button->set_text (_("D")); + monitor_input_button->set_text (S_("MonitorInput|I")); + monitor_disk_button->set_text (S_("MonitorDisk|D")); } 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()); } } @@ -407,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 ); } } @@ -537,18 +545,21 @@ 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 *= UIConfiguration::instance().get_ui_scale(); + tnh *= UIConfiguration::instance().get_ui_scale(); + int prev_height, ignored; bool need_relayout = false; - namebx.get_size_request(ignored, prev_height); - namebx.set_size_request(18, nh + tnh); + namebx.get_size_request (ignored, prev_height); + namebx.set_size_request (PX_SCALE(18, 18), nh + tnh); if (prev_height != nh + tnh) { need_relayout = true; } - namenumberbx.get_size_request(ignored, prev_height); - namenumberbx.set_size_request(18, nh + tnh); + namenumberbx.get_size_request (ignored, prev_height); + namenumberbx.set_size_request (PX_SCALE(18, 18), nh + tnh); if (prev_height != nh + tnh) { need_relayout = true; @@ -557,8 +568,8 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a) if (_route) { int nlh = nh + (_route->is_master() ? tnh : -1); name_label.get_size_request(ignored, prev_height); - name_label.set_size_request(18, nlh); - name_label.set_layout_ellisize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE); + name_label.set_size_request (PX_SCALE(18, 18), nlh); + name_label.set_layout_ellipsize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE); // XXX if (prev_height != nlh) { need_relayout = true; } @@ -712,32 +723,33 @@ MeterStrip::update_button_box () if (!_session) return; int height = 0; if (_session->config.get_show_mute_on_meterbridge()) { - height += 20; + height += PX_SCALE(18, 18) + PX_SCALE(2, 2); mutebox.show(); } else { mutebox.hide(); } if (_session->config.get_show_solo_on_meterbridge()) { - height += 20; + height += PX_SCALE(18, 18) + PX_SCALE(2, 2); solobox.show(); } else { solobox.hide(); } if (_session->config.get_show_rec_on_meterbridge()) { - height += 20; + height += PX_SCALE(18, 18) + PX_SCALE(2, 2); recbox.show(); } else { recbox.hide(); } if (_session->config.get_show_monitor_on_meterbridge()) { - height += 20 + 20; + height += PX_SCALE(18, 18) + PX_SCALE(2, 2); + height += PX_SCALE(18, 18) + PX_SCALE(2, 2); mon_in_box.show(); mon_disk_box.show(); } else { mon_in_box.hide(); mon_disk_box.hide(); } - btnbox.set_size_request(18, height); + btnbox.set_size_request(PX_SCALE(18, 18), height); check_resize(); } @@ -789,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(18, tnh); + number_label.set_size_request(PX_SCALE(18, 18), tnh * UIConfiguration::instance().get_ui_scale()); } else { number_label.hide(); } @@ -830,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); @@ -916,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 @@ -942,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 (); +} +