using namespace Gtk;
using namespace Gtkmm2ext;
using namespace std;
+using namespace ArdourMeter;
PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
PBD::Signal0<void> MeterStrip::MetricChanged;
+PBD::Signal0<void> MeterStrip::ConfigurationChanged;
-MeterStrip::MeterStrip (int metricmode)
+MeterStrip::MeterStrip (int metricmode, MeterType mt)
: AxisView(0)
, RouteUI(0)
{
level_meter = 0;
_strip_type = 0;
- set_spacing(2);
+ 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);
- set_metric_mode(metricmode);
+ set_metric_mode(metricmode, mt);
meter_metric_area.set_size_request(25, 10);
meter_metric_area.signal_expose_event().connect (
meterbox.pack_start(meter_metric_area, true, false);
- pack_start (peakbx, false, false);
- pack_start (meterbox, true, true);
- pack_start (btnbox, false, false);
- pack_start (namebx, false, false);
+ mtr_vbox.pack_start (peakbx, false, false);
+ mtr_vbox.pack_start (meterbox, true, true);
+ mtr_vbox.pack_start (spacer, false, false);
+ mtr_container.add(mtr_vbox);
+
+ mtr_hsep.set_size_request(-1,1);
+ mtr_hsep.set_name("BlackSeparator");
+
+ nfo_vbox.pack_start (mtr_hsep, false, false);
+ nfo_vbox.pack_start (btnbox, false, false);
+ nfo_vbox.pack_start (namebx, false, false);
+
+ pack_start (mtr_container, true, true);
+ pack_start (nfo_vbox, false, false);
peakbx.show();
btnbox.show();
meter_metric_area.show();
meterbox.show();
+ spacer.show();
+ mtr_vbox.show();
+ mtr_container.show();
+ mtr_hsep.show();
+ 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));
, _route(rt)
, peak_display()
{
- set_spacing(2);
+ mtr_vbox.set_spacing(2);
+ nfo_vbox.set_spacing(2);
RouteUI::set_route (rt);
SessionHandlePtr::set_session (sess);
level_meter = new LevelMeter(sess);
level_meter->set_meter (_route->shared_peak_meter().get());
level_meter->clear_meters();
- level_meter->setup_meters (220, meter_width, 6);
level_meter->set_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));
mutebox.set_size_request(16, 16);
solobox.set_size_request(16, 16);
recbox.set_size_request(16, 16);
+ spacer.set_size_request(-1,0);
update_button_box();
update_name_box();
+ update_background (_route->meter_type());
+
+ mtr_vbox.pack_start (peakbx, false, false);
+ mtr_vbox.pack_start (meterbox, true, true);
+ mtr_vbox.pack_start (spacer, false, false);
+ mtr_container.add(mtr_vbox);
+
+ mtr_hsep.set_size_request(-1,1);
+ mtr_hsep.set_name("BlackSeparator");
+
+ nfo_vbox.pack_start (mtr_hsep, false, false);
+ nfo_vbox.pack_start (btnbox, false, false);
+ nfo_vbox.pack_start (namebx, false, false);
+
+ pack_start (mtr_container, true, true);
+ pack_start (nfo_vbox, false, false);
- pack_start (peakbx, false, false);
- pack_start (meterbox, true, true);
- pack_start (btnbox, false, false);
- pack_start (namebx, false, false);
name_label.show();
peak_display.show();
peakbx.show();
meter_ticks1_area.show();
meter_ticks2_area.show();
meterbox.show();
+ spacer.show();
level_meter->show();
meter_align.show();
peak_align.show();
btnbox.show();
+ mtr_vbox.show();
+ mtr_container.show();
+ mtr_hsep.show();
+ nfo_vbox.show();
_route->shared_peak_meter()->ConfigurationChanged.connect (
route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
_has_midi = true;
}
- if (old_has_midi != _has_midi) MetricChanged();
on_theme_changed();
+ if (old_has_midi != _has_midi) MetricChanged();
+ else ConfigurationChanged();
}
void
MeterStrip::on_size_request (Gtk::Requisition* r)
{
- meter_clear_pattern_cache();
VBox::on_size_request(r);
}
void
MeterStrip::on_size_allocate (Gtk::Allocation& a)
{
- meter_clear_pattern_cache();
const int wh = a.get_height();
int nh = ceilf(wh * .11f);
if (nh < 52) nh = 52;
gint
MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
{
- return meter_expose_metrics(ev, _types, &meter_metric_area);
+ if (_route) {
+ return meter_expose_metrics(ev, _route->meter_type(), _types, &meter_metric_area);
+ } else {
+ return meter_expose_metrics(ev, metric_type, _types, &meter_metric_area);
+ }
}
void
-MeterStrip::set_metric_mode (int metricmode)
+MeterStrip::set_metric_mode (int metricmode, ARDOUR::MeterType mt)
{
+ metric_type = mt;
_types.clear ();
switch(metricmode) {
case 0:
_types.push_back (DataType::AUDIO);
break;
}
-
+ update_background (mt);
meter_metric_area.queue_draw ();
}
void
-MeterStrip::set_pos (int pos)
+MeterStrip::update_background(MeterType type)
+{
+ switch(type) {
+ case MeterIEC1DIN:
+ case MeterIEC1NOR:
+ case MeterIEC2BBC:
+ case MeterIEC2EBU:
+ case MeterK14:
+ case MeterK20:
+ mtr_container.set_name ("meterstripPPM");
+ break;
+ case MeterVU:
+ mtr_container.set_name ("meterstripVU");
+ break;
+ default:
+ mtr_container.set_name ("meterstripDPM");
+ }
+}
+
+MeterType
+MeterStrip::meter_type()
{
+ assert((!_route && _strip_type == 0) || (_route && _strip_type != 0));
+ if (!_route) return metric_type;
+ return _route->meter_type();
}
gint
MeterStrip::meter_ticks1_expose (GdkEventExpose *ev)
{
- return meter_expose_ticks(ev, _types, &meter_ticks1_area);
+ assert(_route);
+ return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks1_area);
}
gint
MeterStrip::meter_ticks2_expose (GdkEventExpose *ev)
{
- return meter_expose_ticks(ev, _types, &meter_ticks2_area);
+ assert(_route);
+ return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area);
}
void
RadioMenuItem::Group group;
_suspend_menu_callbacks = true;
- add_level_meter_item (items, group, _("Peak"), MeterPeak);
- add_level_meter_item (items, group, _("RMS + Peak"), MeterKrms);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
+ add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterVU), MeterVU);
+
+ MeterType cmt = _route->meter_type();
+ const std::string cmn = ArdourMeter::meter_type_string(cmt);
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Change all in Group to Peak"), sigc::bind (SetMeterTypeMulti, -1, _route->route_group(), MeterPeak)));
- items.push_back (MenuElem (_("Change all in Group to RMS + Peak"), sigc::bind (SetMeterTypeMulti, -1, _route->route_group(), MeterKrms)));
- items.push_back (MenuElem (_("Change all to Peak"), sigc::bind (SetMeterTypeMulti, 0, _route->route_group(), MeterPeak)));
- items.push_back (MenuElem (_("Change all to RMS + Peak"), sigc::bind (SetMeterTypeMulti, 0, _route->route_group(), MeterKrms)));
- items.push_back (MenuElem (_("Change same track-type to Peak"), sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), MeterPeak)));
- items.push_back (MenuElem (_("Change same track-type to RMS + Peak"), sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), MeterKrms)));
+ items.push_back (MenuElem (string_compose(_("Change all in Group to %1"), cmn),
+ sigc::bind (SetMeterTypeMulti, -1, _route->route_group(), cmt)));
+ items.push_back (MenuElem (string_compose(_("Change all to %1"), cmn),
+ sigc::bind (SetMeterTypeMulti, 0, _route->route_group(), cmt)));
+ items.push_back (MenuElem (string_compose(_("Change same track-type to %1"), cmn),
+ sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), cmt)));
m->popup (ev->button, ev->time);
_suspend_menu_callbacks = false;
void
MeterStrip::meter_type_changed (MeterType type)
{
- _route->set_meter_type(type);
+ if (_route->meter_type() != type) {
+ _route->set_meter_type(type);
+ }
+ update_background (type);
+ MetricChanged();
}
void