#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
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);
MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
: AxisView(sess)
- , RouteUI(sess)
+ , RouteUI(0)
, _route(rt)
, peak_display()
{
mtr_vbox.set_spacing(2);
nfo_vbox.set_spacing(2);
- RouteUI::set_route (rt);
SessionHandlePtr::set_session (sess);
+ RouteUI::init ();
+ RouteUI::set_route (rt);
_has_midi = false;
_tick_bar = 0;
+ _metricmode = -1;
+ metric_type = MeterPeak;
int meter_width = 6;
if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
peakbx.pack_start(peak_align, true, true, 3);
peakbx.set_size_request(-1, 14);
- // add track-name label
- name_label.set_text(_route->name());
+ // add track-name & -number label
+ number_label.set_text("-");
+ number_label.set_size_request(18, 18);
+
+ name_changed();
+
name_label.set_corner_radius(2);
name_label.set_name("meterbridge label");
name_label.set_angle(-90.0);
ARDOUR_UI::instance()->set_tip (name_label, _route->name());
ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+ number_label.set_corner_radius(2);
+ number_label.set_name("tracknumber label");
+ number_label.set_angle(-90.0);
+ number_label.layout()->set_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.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);
+ mon_disk_box.pack_start(*monitor_disk_button, true, false);
+ btnbox.pack_start(mon_disk_box, false, false, 1);
recbox.pack_start(*rec_enable_button, true, false);
btnbox.pack_start(recbox, false, false, 1);
rec_enable_button->set_corner_radius(2);
rec_enable_button->set_size_request(16, 16);
+ rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
mute_button->set_corner_radius(2);
mute_button->set_size_request(16, 16);
solo_button->set_corner_radius(2);
solo_button->set_size_request(16, 16);
+ monitor_input_button->set_corner_radius(2);
+ monitor_input_button->set_size_request(16, 16);
+
+ monitor_disk_button->set_corner_radius(2);
+ monitor_disk_button->set_size_request(16, 16);
+
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);
spacer.set_size_request(-1,0);
update_button_box();
mtr_container.show();
mtr_hsep.show();
nfo_vbox.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_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());
+ _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);
MeterStrip::~MeterStrip ()
{
- delete level_meter;
- CatchDeletion (this);
+ if (level_meter) {
+ delete level_meter;
+ CatchDeletion (this);
+ }
}
void
{
mute_button->set_text (_("M"));
rec_enable_button->set_text ("");
- rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
if (_route && _route->solo_safe()) {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
}
}
+ monitor_input_button->set_text (_("I"));
+ monitor_disk_button->set_text (_("D"));
}
void
if (!what_changed.contains (ARDOUR::Properties::name)) {
return;
}
- ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed)
- name_label.set_text(_route->name());
+ ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
+ name_changed();
ARDOUR_UI::instance()->set_tip (name_label, _route->name());
if (level_meter) {
ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
nh = 52;
break;
case 2:
- nh = 106;
+ nh = 88;
break;
case 3:
- nh = 148;
+ nh = 106;
break;
case 4:
- nh = 254;
+ nh = 148;
break;
}
- namebx.set_size_request(18, nh);
+ int tnh = 0;
+ if (_session && _session->config.get_track_name_number()) {
+ tnh = 4 + _session->track_number_decimals() * 8;
+ }
+ namebx.set_size_request(18, nh + tnh);
+ namenumberbx.set_size_request(18, nh + tnh);
if (_route) {
- name_label.set_size_request(18, nh-2);
- name_label.layout()->set_width((nh-4) * PANGO_SCALE);
+ name_label.set_size_request(18, nh + (_route->is_master() ? tnh : -1));
+ name_label.layout()->set_width((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
}
VBox::on_size_allocate(a);
}
case MeterIEC1NOR:
case MeterIEC2BBC:
case MeterIEC2EBU:
+ case MeterK12:
case MeterK14:
case MeterK20:
mtr_container.set_name ("meterstripPPM");
} else {
recbox.hide();
}
+ if (_session->config.get_show_monitor_on_meterbridge()) {
+ height += 18 + 18;
+ mon_in_box.show();
+ mon_disk_box.show();
+ } else {
+ mon_in_box.hide();
+ mon_disk_box.hide();
+ }
btnbox.set_size_request(16, height);
check_resize();
}
else if (p == "show-name-on-meterbridge") {
update_name_box();
}
+ else if (p == "show-monitor-on-meterbridge") {
+ update_button_box();
+ }
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 int64_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.show();
+ }
+ number_label.set_size_request(18, 4 + _session->track_number_decimals() * 8);
+ } else {
+ number_label.hide();
+ }
}
bool
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();
projects / ardour.git / blobdiff