Superficial code cleanup.

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index aaa712a8b08b06728cdd25dd25638bfa39e5ecf6..2459ac57a83dc8862bdcff9d63b409d1cdba241c 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -107,7 +107,9 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        input_selector = 0;
        output_selector = 0;
        group_menu = 0;
-       _marked_for_display = false;
+       if (!_route->is_hidden()) {
+               _marked_for_display = true;
+       }
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
@@ -182,12 +184,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        bottom_button_table.attach (group_button, 0, 1, 0, 1);
        
        if (is_audio_track()) {
-               
-               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
-               rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
-
-               rec_enable_button->set_name ("MixerRecordEnableButton");
-
                boost::shared_ptr<AudioTrack> at = audio_track();
 
                at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
@@ -206,9 +202,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
                button_table.attach (speed_frame, 0, 2, 5, 6);
 #endif /* VARISPEED_IN_MIXER_STRIP */
 
+       }
+       
+       if(rec_enable_button) {
+               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
+               rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
+       
+               rec_enable_button->set_name ("MixerRecordEnableButton");
                button_table.attach (*rec_enable_button, 0, 2, 2, 3);
        }
-
+       
        name_button.add (name_label);
        name_button.set_name ("MixerNameButton");
        Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
@@ -260,8 +263,9 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (post_processor_box, true, true);
-       if (!is_midi_track())
+       if (!is_midi_track()) {
                global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+       }
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
@@ -361,7 +365,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        whvbox->show();
        hide_icon->show();
        width_icon->show();
-       gain_meter_alignment->show();
+       gain_meter_alignment->show_all();
 
        pre_processor_box.show();
 
@@ -446,7 +450,7 @@ MixerStrip::set_width (Width w, void* owner)
        pre_processor_box.set_width (w);
        post_processor_box.set_width (w);
 
-       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->list();
+       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
 
        _width_owner = owner;
 
@@ -680,7 +684,7 @@ MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, std::vector<b
 
        MenuList& citems = input_menu.items();
        
-       if (b->nchannels() == _route->n_inputs().n_total()) {
+       if (b->nchannels() == _route->n_inputs()) {
 
                citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
 
@@ -703,7 +707,7 @@ MixerStrip::add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, std::vector<
                return;
        }
 
-       if (b->nchannels() == _route->n_outputs().n_total()) {
+       if (b->nchannels() == _route->n_outputs()) {
 
                MenuList& citems = output_menu.items();
                citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
@@ -744,8 +748,8 @@ MixerStrip::connect_to_pan ()
        if (!_route->panner().empty()) {
                StreamPanner* sp = _route->panner().front();
 
-               panstate_connection = sp->pan_control()->list()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
-               panstyle_connection = sp->pan_control()->list()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
+               panstate_connection = sp->pan_control()->alist()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
+               panstyle_connection = sp->pan_control()->alist()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
        }
 
        panners.pan_changed (this);
@@ -1206,6 +1210,13 @@ MixerStrip::map_frozen ()
                        break;
                }
        }
+       
+       hide_redirect_editors ();
+}
+
+void
+MixerStrip::hide_redirect_editors ()
+{
        _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
 }
 
@@ -1293,6 +1304,8 @@ MixerStrip::meter_changed (void *src)
        }
 
        gpm.setup_meters ();
+               // reset peak when meter point changes
+               gpm.reset_peak_display();
                set_width(_width, this);
 }