X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=f7f18fb273235202f15d98582abf245a6e5f96ac;hb=d8372bdf9b62eec064ec7e94bb6237a5363ee40a;hp=de8697037ec550d62733c620b1f28d9bca535453;hpb=56f4341ade5131092cc5948c180cd94eff754e6e;p=ardour.git diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index de8697037e..f7f18fb273 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -52,22 +52,23 @@ using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; using namespace std; +using namespace ArdourMeter; PBD::Signal1 MeterStrip::CatchDeletion; PBD::Signal0 MeterStrip::MetricChanged; +PBD::Signal0 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); + strip.set_spacing(2); peakbx.set_size_request(-1, 14); namebx.set_size_request(18, 52); - numbx.set_size_request(18, 18); - set_metric_mode(metricmode); + set_metric_mode(metricmode, mt); meter_metric_area.set_size_request(25, 10); meter_metric_area.signal_expose_event().connect ( @@ -76,16 +77,17 @@ MeterStrip::MeterStrip (int metricmode) 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); - pack_start (numbx, false, false); + strip.pack_start (peakbx, false, false); + strip.pack_start (meterbox, true, true); + strip.pack_start (btnbox, false, false); + strip.pack_start (namebx, false, false); + add(strip); peakbx.show(); btnbox.show(); meter_metric_area.show(); meterbox.show(); + strip.show(); UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed)); ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); @@ -98,7 +100,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) , _route(rt) , peak_display() { - set_spacing(2); + strip.set_spacing(2); RouteUI::set_route (rt); SessionHandlePtr::set_session (sess); @@ -113,8 +115,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) 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)); @@ -149,27 +151,9 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) name_label.set_alignment(-1.0, .5); ARDOUR_UI::instance()->set_tip (name_label, _route->name()); - number_label.set_alignment(.5, .5); - number_label.set_name("meterbridge label"); - number_label.set_corner_radius(2); - number_label.set_size_request(18, 18); - - if (_route->unique_id() > 0) { - char buf[12]; - snprintf(buf, 12, "%d", _route->unique_id()); - number_label.set_text(buf); - number_label.show(); - } else { - number_label.set_text(""); - number_label.hide(); - } - namebx.set_size_request(18, 52); namebx.pack_start(name_label, true, false, 3); - numbx.set_size_request(18, 18); - numbx.pack_start(number_label, true, false, 3); - recbox.pack_start(*rec_enable_button, true, false); btnbox.pack_start(recbox, false, false, 1); mutebox.pack_start(*mute_button, true, false); @@ -192,12 +176,12 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) update_button_box(); update_name_box(); + update_background (_route->meter_type()); - pack_start (peakbx, false, false); - pack_start (meterbox, true, true); - pack_start (numbx, false, false); - pack_start (btnbox, false, false); - pack_start (namebx, false, false); + strip.pack_start (peakbx, false, false); + strip.pack_start (meterbox, true, true); + strip.pack_start (btnbox, false, false); + strip.pack_start (namebx, false, false); name_label.show(); peak_display.show(); peakbx.show(); @@ -208,6 +192,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) meter_align.show(); peak_align.show(); btnbox.show(); + add(strip); + strip.show(); _route->shared_peak_meter()->ConfigurationChanged.connect ( route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context() @@ -291,9 +277,27 @@ void MeterStrip::set_button_names() { mute_button->set_text (_("M")); - solo_button->set_text (_("S")); 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)); + } 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")); + } else { + switch (Config->get_listen_position()) { + case AfterFaderListen: + solo_button->set_text (_("A")); + break; + case PreFaderListen: + solo_button->set_text (_("P")); + break; + } + } + } void @@ -368,21 +372,20 @@ MeterStrip::meter_configuration_changed (ChanCount c) _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); + EventBox::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; @@ -392,18 +395,23 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a) name_label.set_size_request(18, nh-2); name_label.layout()->set_width((nh-4) * PANGO_SCALE); } - VBox::on_size_allocate(a); + EventBox::on_size_allocate(a); } 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: @@ -424,25 +432,50 @@ MeterStrip::set_metric_mode (int metricmode) _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: + set_name ("meterstripPPM"); + break; + case MeterVU: + set_name ("meterstripVU"); + break; + default: + 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 @@ -525,11 +558,6 @@ void MeterStrip::update_name_box () { if (!_session) return; - if (_session->config.get_show_id_on_meterbridge()) { - numbx.show(); - } else { - numbx.hide(); - } if (_session->config.get_show_name_on_meterbridge()) { namebx.show(); } else { @@ -555,9 +583,6 @@ MeterStrip::parameter_changed (std::string const & p) else if (p == "show-name-on-meterbridge") { update_name_box(); } - else if (p == "show-id-on-meterbridge") { - update_name_box(); - } } @@ -583,16 +608,26 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev) 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; @@ -618,7 +653,11 @@ MeterStrip::set_meter_type (MeterType type) 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