#include <sigc++/bind.h>
+#include "ardour/logmeter.h"
#include "ardour/session.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/rgb_macros.h>
+#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;
using namespace Gtkmm2ext;
PBD::Signal0<void> MeterStrip::MetricChanged;
PBD::Signal0<void> 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));
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);
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<ARDOUR::Route> rt)
- : AxisView(sess)
- , RouteUI(sess)
+ : SessionHandlePtr (sess)
+ , RouteUI(0)
, _route(rt)
, peak_display()
{
- mtr_vbox.set_spacing(2);
- nfo_vbox.set_spacing(2);
- RouteUI::set_route (rt);
+ 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);
_has_midi = false;
_tick_bar = 0;
_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;
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->ButtonRelease.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_release, this, _1));
+ 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));
meter_align.set(0.5, 0.5, 0.0, 1.0);
// peak display
peak_display.set_name ("meterbridge peakindicator");
peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+ 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(PX_SCALE(18, 18), PX_SCALE(18, 18));
- // add track-name label
- name_label.set_text(_route->name());
- name_label.set_corner_radius(2);
+ name_changed();
+
+ 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.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
- name_label.layout()->set_width(48 * PANGO_SCALE);
- name_label.set_size_request(18, 50);
+ name_label.set_text_ellipsize (Pango::ELLIPSIZE_END);
+ 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_ellipsize_width(18 * PANGO_SCALE);
+ number_label.set_alignment(.5, .5);
- namebx.set_size_request(18, 52);
- namebx.pack_start(name_label, true, false, 3);
+ 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);
mon_in_box.pack_start(*monitor_input_button, true, false);
btnbox.pack_start(mon_in_box, false, false, 1);
btnbox.pack_start(solobox, false, false, 1);
rec_enable_button->set_corner_radius(2);
- rec_enable_button->set_size_request(16, 16);
+ 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(16, 16);
+ mute_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
solo_button->set_corner_radius(2);
- solo_button->set_size_request(16, 16);
+ 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(16, 16);
+ 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(16, 16);
+ monitor_disk_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
- mutebox.set_size_request(16, 16);
- solobox.set_size_request(16, 16);
- recbox.set_size_request(16, 16);
- mon_in_box.set_size_request(16, 16);
- mon_disk_box.set_size_request(16, 16);
+ 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();
mtr_container.show();
mtr_hsep.show();
nfo_vbox.show();
- monitor_input_button->show();
- monitor_disk_button->show();
+ namenumberbx.show();
+
+ if (boost::dynamic_pointer_cast<Track>(_route)) {
+ monitor_input_button->show();
+ monitor_disk_button->show();
+ } else {
+ monitor_input_button->hide();
+ monitor_disk_button->hide();
+ }
_route->shared_peak_meter()->ConfigurationChanged.connect (
- route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
+ meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
);
ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
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 (route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
- _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
+ _route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), 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());
}
void
-MeterStrip::update_rec_display ()
+MeterStrip::blink_rec_display (bool onoff)
{
- RouteUI::update_rec_display ();
+ RouteUI::blink_rec_display (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"));
- rec_enable_button->set_text ("");
- rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+ 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_label.set_text(_route->name());
- ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+ ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
+ name_changed();
+ set_tooltip (name_label, _route->name());
if (level_meter) {
- ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+ set_tooltip (*level_meter, _route->name());
}
}
+void
+MeterStrip::route_color_changed ()
+{
+ number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
+}
+
+
void
MeterStrip::fast_update ()
{
float mpeak = level_meter->update_meters();
if (mpeak > max_peak) {
max_peak = mpeak;
- if (mpeak >= Config->get_meter_peak()) {
- peak_display.set_name ("meterbridge peakindicator on");
- peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+ if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
+ peak_display.set_active_state ( Gtkmm2ext::ExplicitActive );
}
}
}
nh = 148;
break;
}
- namebx.set_size_request(18, nh);
+ int tnh = 0;
+ if (_session && _session->config.get_track_name_number()) {
+ // NB numbers are rotated 90deg. on the meterbridge
+ 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 (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 (PX_SCALE(18, 18), nh + tnh);
+
+ if (prev_height != nh + tnh) {
+ need_relayout = true;
+ }
+
if (_route) {
- name_label.set_size_request(18, nh-2);
- name_label.layout()->set_width((nh-4) * PANGO_SCALE);
+ int nlh = nh + (_route->is_master() ? tnh : -1);
+ name_label.get_size_request(ignored, prev_height);
+ 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;
+ }
}
+
VBox::on_size_allocate(a);
+
+ if (need_relayout) {
+ queue_resize();
+ MetricChanged(); // force re-layout, parent on_scroll(), queue_resize()
+ }
}
gint
case MeterIEC1NOR:
case MeterIEC2BBC:
case MeterIEC2EBU:
+ case MeterK12:
case MeterK14:
case MeterK20:
mtr_container.set_name ("meterstripPPM");
_route->shared_peak_meter()->reset_max();
level_meter->clear_meters();
max_peak = -INFINITY;
- peak_display.set_name ("meterbridge peakindicator");
- peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+ peak_display.set_active_state ( Gtkmm2ext::Off );
}
bool
} else {
ResetRoutePeakDisplays (_route.get());
}
- return true;
+ return false;
}
void
if (!_session) return;
int height = 0;
if (_session->config.get_show_mute_on_meterbridge()) {
- height += 18;
+ height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
mutebox.show();
} else {
mutebox.hide();
}
if (_session->config.get_show_solo_on_meterbridge()) {
- height += 18;
+ height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
solobox.show();
} else {
solobox.hide();
}
if (_session->config.get_show_rec_on_meterbridge()) {
- height += 18;
+ height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
recbox.show();
} else {
recbox.hide();
}
if (_session->config.get_show_monitor_on_meterbridge()) {
- height += 18 + 18;
+ 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(16, height);
+ btnbox.set_size_request(PX_SCALE(18, 18), height);
check_resize();
}
else if (p == "meterbridge-label-height") {
queue_resize();
}
+ else if (p == "track-name-number") {
+ name_changed();
+ queue_resize();
+ }
+}
+
+void
+MeterStrip::name_changed () {
+ if (!_route) {
+ return;
+ }
+ name_label.set_text(_route->name ());
+ if (_session && _session->config.get_track_name_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 (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 * UIConfiguration::instance().get_ui_scale());
+ } else {
+ number_label.hide();
+ }
}
bool
-MeterStrip::level_meter_button_release (GdkEventButton* ev)
+MeterStrip::level_meter_button_press (GdkEventButton* ev)
{
if (ev->button == 3) {
- popup_level_meter_menu (ev);
+ if (_route && _route->shared_peak_meter()->input_streams ().n_audio() > 0) {
+ popup_level_meter_menu (ev);
+ }
return true;
}
_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);
add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
+ add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK12), MeterK12);
add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterVU), MeterVU);
MeterType cmt = _route->meter_type();
if (_suspend_menu_callbacks) return;
if (_route->meter_type() == type) return;
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
void
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 ();
+}
+
projects / ardour.git / blobdiff