Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index b2ff7ecf1b8d5492548a5b01530b9c2ba05c5fb6..63e09b9a9f617907cbc7933f37796ebd260f93ca 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -141,7 +141,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        level_meter->clear_meters();
        level_meter->set_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);
@@ -779,10 +779,12 @@ MeterStrip::name_changed () {
 }
 
 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;
        }