Another not-quite-there-but-better commit.

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 4efc2b0340bd51a9baaa773c3d040dd5f5825b2a..656105e725de2b1254c5c0f8568e1313f86238de 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -40,7 +40,7 @@
 #include <ardour/audio_diskstream.h>
 #include <ardour/panner.h>
 #include <ardour/send.h>
-#include <ardour/insert.h>
+#include <ardour/processor.h>
 #include <ardour/ladspa_plugin.h>
 #include <ardour/bundle.h>
 #include <ardour/session_bundle.h>
@@ -85,8 +85,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        : AxisView(sess),
          RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")),
          _mixer(mx),
-         pre_redirect_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
-         post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
+         pre_processor_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
+         post_processor_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
          gpm (_route, sess),
          panners (_route, sess),
          button_table (3, 2),
@@ -251,17 +251,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
        global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (pre_redirect_box, true, true);
+       global_vpacker.pack_start (pre_processor_box, true, true);
        global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
        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_redirect_box, true, true);
+       global_vpacker.pack_start (post_processor_box, true, true);
        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);
 
-       if (route()->master() || route()->control()) {
+       if (route()->is_master() || route()->is_control()) {
                
                if (scrollbar_height == 0) {
                        HScrollbar scrollbar;
@@ -303,7 +303,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
                get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
        }
 
-       _route->name_changed.connect (mem_fun(*this, &RouteUI::name_changed));
+       _route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed));
        _route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
        _route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
 
@@ -332,11 +332,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
        /* now force an update of all the various elements */
 
-       pre_redirect_box.update();
-       post_redirect_box.update();
+       pre_processor_box.update();
+       post_processor_box.update();
        mute_changed (0);
        solo_changed (0);
-       name_changed (0);
+       name_changed ();
        comment_changed (0);
        mix_group_changed (0);
 
@@ -400,8 +400,10 @@ MixerStrip::set_width (Width w, void* owner)
 
        gpm.set_width (w);
        panners.set_width (w);
-       pre_redirect_box.set_width (w);
-       post_redirect_box.set_width (w);
+       pre_processor_box.set_width (w);
+       post_processor_box.set_width (w);
+
+       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->list();
 
        _width_owner = owner;
 
@@ -435,8 +437,8 @@ MixerStrip::set_width (Width w, void* owner)
                       ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
                }
 
-               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
-               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().automation_state()));
+               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style()));
+               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(gain_automation->automation_state()));
                ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
                ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
@@ -457,8 +459,8 @@ MixerStrip::set_width (Width w, void* owner)
                       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
                }
 
-               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
-               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
+               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(gain_automation->automation_style()));
+               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(gain_automation->automation_state()));
                ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
                ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
@@ -469,7 +471,7 @@ MixerStrip::set_width (Width w, void* owner)
        update_input_display ();
        update_output_display ();
        mix_group_changed (0);
-       name_changed (0);
+       name_changed ();
 
 }
 
@@ -699,8 +701,8 @@ MixerStrip::connect_to_pan ()
        if (!_route->panner().empty()) {
                StreamPanner* sp = _route->panner().front();
 
-               panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
-               panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
+               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));
        }
 
        panners.pan_changed (this);
@@ -984,6 +986,11 @@ MixerStrip::build_route_ops_menu ()
        items.push_back (CheckMenuElem (_("Active"), mem_fun (*this, &RouteUI::toggle_route_active)));
        route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
        route_active_menu_item->set_active (_route->active());
+
+       items.push_back (SeparatorElem());
+
+       items.push_back (MenuElem (_("Adjust latency"), mem_fun (*this, &RouteUI::adjust_latency)));
+
        items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity)));
        polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
@@ -1078,11 +1085,11 @@ MixerStrip::set_selected (bool yn)
 }
 
 void
-MixerStrip::name_changed (void *src)
+MixerStrip::name_changed ()
 {
        switch (_width) {
        case Wide:
-               RouteUI::name_changed (src);
+               RouteUI::name_changed ();
                break;
        case Narrow:
                name_label.set_text (PBD::short_version (_route->name(), 5));
@@ -1138,24 +1145,24 @@ MixerStrip::map_frozen ()
        if (at) {
                switch (at->freeze_state()) {
                case AudioTrack::Frozen:
-                       pre_redirect_box.set_sensitive (false);
-                       post_redirect_box.set_sensitive (false);
+                       pre_processor_box.set_sensitive (false);
+                       post_processor_box.set_sensitive (false);
                        speed_spinner.set_sensitive (false);
                        break;
                default:
-                       pre_redirect_box.set_sensitive (true);
-                       post_redirect_box.set_sensitive (true);
+                       pre_processor_box.set_sensitive (true);
+                       post_processor_box.set_sensitive (true);
                        speed_spinner.set_sensitive (true);
                        break;
                }
        }
-       _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
+       _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
 }
 
 void
-MixerStrip::hide_redirect_editor (boost::shared_ptr<Redirect> redirect)
+MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
 {
-       void* gui = redirect->get_gui ();
+       void* gui = processor->get_gui ();
        
        if (gui) {
                static_cast<Gtk::Widget*>(gui)->hide ();