fix inadvertent breakage in ardev and friends caused by extension to LD_LIBRARY_PATH...

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 80548ea20b71c60a4b6d2fd525ed13fefadc269c..05e88a44dc7585e11e6fd46851f38a169618fbe4 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -37,6 +37,7 @@
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
+#include "ardour/meter.h"
 #include "ardour/midi_track.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
@@ -992,18 +993,11 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 void
 MixerStrip::update_diskstream_display ()
 {
-       if (is_track()) {
-
-               if (input_selector) {
-                       input_selector->hide_all ();
-               }
-
-               route_color_changed ();
+        if (is_track() && input_selector) {
+                        input_selector->hide_all ();
+        }
 
-       } else {
-
-               show_passthru_color ();
-       }
+        route_color_changed ();
 }
 
 void
@@ -1033,6 +1027,7 @@ MixerStrip::connect_to_pan ()
        if (panners._panner == 0) {
                panners.panshell_changed ();
        }
+       update_panner_choices();
 }
 
 void
@@ -1869,6 +1864,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 
        set_current_delivery (send);
 
+       send->meter()->set_type(_route->shared_peak_meter()->get_type());
        send->set_metering (true);
        _current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
 
@@ -2159,8 +2155,8 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
 
        _suspend_menu_callbacks = true;
        add_level_meter_item_point (items, group, _("Input"), MeterInput);
-       add_level_meter_item_point (items, group, _("Pre-fader"), MeterPreFader);
-       add_level_meter_item_point (items, group, _("Post-fader"), MeterPostFader);
+       add_level_meter_item_point (items, group, _("Pre Fader"), MeterPreFader);
+       add_level_meter_item_point (items, group, _("Post Fader"), MeterPostFader);
        add_level_meter_item_point (items, group, _("Output"), MeterOutput);
        add_level_meter_item_point (items, group, _("Custom"), MeterCustom);