projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
with RMS meters: use "peak indicator" as DPM
[ardour.git] / gtk2_ardour / meter_strip.cc
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 9580aaf24f504227bbdff8620d09a5148b9cc84e..759bdef16aa4ccc3d38d23633eb81ba0135ad4f2 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -54,11 +54,8 @@ using namespace Gtkmm2ext;
 using namespace std;
 
 PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
-PBD::Signal0<void> MeterStrip::ResetAllPeakDisplays;
-PBD::Signal1<void,RouteGroup*> MeterStrip::ResetGroupPeakDisplays;
 PBD::Signal0<void> MeterStrip::MetricChanged;
 
-
 MeterStrip::MeterStrip (int metricmode)
        : AxisView(0)
        , RouteUI(0)
@@ -74,6 +71,7 @@ MeterStrip::MeterStrip (int metricmode)
        set_size_request_to_display_given_text (meter_metric_area, "-8888", 1, 0);
        meter_metric_area.signal_expose_event().connect (
                        sigc::mem_fun(*this, &MeterStrip::meter_metrics_expose));
+       RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics));
 
        meterbox.pack_start(meter_metric_area, true, false);
 
@@ -114,6 +112,9 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        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->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);
        meter_align.add(*level_meter);
@@ -173,6 +174,12 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        _route->shared_peak_meter()->ConfigurationChanged.connect (
                        route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
                        );
+
+       ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
+       ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_route_peak_display));
+       ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_group_peak_display));
+       RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics));
+
        meter_configuration_changed (_route->shared_peak_meter()->input_streams ());
 
        meter_ticks1_area.set_size_request(3,-1);
@@ -188,6 +195,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        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));
+       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
 }
 
 MeterStrip::~MeterStrip ()
@@ -237,7 +245,7 @@ MeterStrip::fast_update ()
        float mpeak = level_meter->update_meters();
        if (mpeak > max_peak) {
                max_peak = mpeak;
-               if (mpeak >= 0.0f) {
+               if (mpeak >= Config->get_meter_peak()) {
                        peak_display.set_name ("meterbridge peakindicator on");
                        peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
                }
@@ -247,8 +255,6 @@ MeterStrip::fast_update ()
 void
 MeterStrip::on_theme_changed()
 {
-       meter_clear_pattern_cache();
-
        if (level_meter && _route) {
                int meter_width = 6;
                if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
@@ -256,9 +262,6 @@ MeterStrip::on_theme_changed()
                }
                level_meter->setup_meters (220, meter_width, 6);
        }
-       meter_metric_area.queue_draw();
-       meter_ticks1_area.queue_draw();
-       meter_ticks2_area.queue_draw();
 }
 
 void
@@ -279,22 +282,22 @@ MeterStrip::meter_configuration_changed (ChanCount c)
        if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
                        && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
                        ) {
-               meter_ticks1_area.set_name ("AudioBusMetrics");
-               meter_ticks2_area.set_name ("AudioBusMetrics");
+               meter_ticks1_area.set_name ("AudioBusMetricsLeft");
+               meter_ticks2_area.set_name ("AudioBusMetricsRight");
                _has_midi = false;
        }
        else if (type == (1 << DataType::AUDIO)) {
-               meter_ticks1_area.set_name ("AudioTrackMetrics");
-               meter_ticks2_area.set_name ("AudioTrackMetrics");
+               meter_ticks1_area.set_name ("AudioTrackMetricsLeft");
+               meter_ticks2_area.set_name ("AudioTrackMetricsRight");
                _has_midi = false;
        }
        else if (type == (1 << DataType::MIDI)) {
-               meter_ticks1_area.set_name ("MidiTrackMetrics");
-               meter_ticks2_area.set_name ("MidiTrackMetrics");
+               meter_ticks1_area.set_name ("MidiTrackMetricsLeft");
+               meter_ticks2_area.set_name ("MidiTrackMetricsRight");
                _has_midi = true;
        } else {
-               meter_ticks1_area.set_name ("AudioMidiTrackMetrics");
-               meter_ticks2_area.set_name ("AudioMidiTrackMetrics");
+               meter_ticks1_area.set_name ("AudioMidiTrackMetricsLeft");
+               meter_ticks2_area.set_name ("AudioMidiTrackMetricsRight");
                _has_midi = true;
        }
 
@@ -370,10 +373,17 @@ MeterStrip::meter_ticks2_expose (GdkEventExpose *ev)
        return meter_expose_ticks(ev, _types, &meter_ticks2_area);
 }
 
+void
+MeterStrip::reset_route_peak_display (Route* route)
+{
+       if (_route && _route.get() == route) {
+               reset_peak_display ();
+       }
+}
+
 void
 MeterStrip::reset_group_peak_display (RouteGroup* group)
 {
-       /* UNUSED -- need connection w/mixer || other meters */
        if (_route && group == _route->route_group()) {
                reset_peak_display ();
        }
@@ -399,7 +409,77 @@ MeterStrip::peak_button_release (GdkEventButton* ev)
                        ResetGroupPeakDisplays (_route->route_group());
                }
        } else {
-               reset_peak_display ();
+               ResetRoutePeakDisplays (_route.get());
        }
        return true;
 }
+
+void
+MeterStrip::redraw_metrics ()
+{
+       meter_metric_area.queue_draw();
+       meter_ticks1_area.queue_draw();
+       meter_ticks2_area.queue_draw();
+}
+
+void
+MeterStrip::parameter_changed (std::string const & p)
+{
+       if (p == "meter-peak") {
+               max_peak = -INFINITY;
+       }
+}
+
+
+bool
+MeterStrip::level_meter_button_press (GdkEventButton* ev)
+{
+       if (ev->button == 3) {
+               popup_level_meter_menu (ev);
+               return true;
+       }
+
+       return false;
+}
+
+void
+MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
+{
+       using namespace Gtk::Menu_Helpers;
+
+       Gtk::Menu* m = manage (new Menu);
+       MenuList& items = m->items ();
+
+       RadioMenuItem::Group group;
+
+       _suspend_menu_callbacks = true;
+       add_level_meter_item (items, group, _("Peak"), MeterPeak);
+       add_level_meter_item (items, group, _("RMS + Peak"), MeterKrms);
+
+       m->popup (ev->button, ev->time);
+       _suspend_menu_callbacks = false;
+}
+
+void
+MeterStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
+{
+       using namespace Menu_Helpers;
+
+       items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MeterStrip::set_meter_type), type)));
+       RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+       i->set_active (_route->meter_type() == type);
+}
+
+void
+MeterStrip::set_meter_type (MeterType m)
+{
+       if (_suspend_menu_callbacks) return;
+       level_meter->set_type (m);
+}
+
+void
+MeterStrip::meter_type_changed (MeterType t)
+{
+       _route->set_meter_type(t);
+}
+
Unnamed repository; edit this file 'description' to name the repository.