drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and...

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 5b26bd51412bd89861dc0fc1455e174b8ada1c5d..22b39c1a298dabe16c13ad386bcb2b203367e8e4 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -80,7 +80,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
        ,_mixer(mx)
        , _mixer_owned (in_mixer)
        , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
-       , gpm (sess)
+       , gpm (sess, 250)
        , panners (sess)
        , _mono_button (_("Mono"))
        , button_table (3, 2)
@@ -106,7 +106,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        ,_mixer(mx)
        , _mixer_owned (in_mixer)
        , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
-       , gpm (sess)
+       , gpm (sess, 250)
        , panners (sess)
        , button_table (3, 2)
        , middle_button_table (1, 2)
@@ -134,6 +134,9 @@ MixerStrip::init ()
        _width_owner = 0;
        spacer = 0;
 
+       /* the length of this string determines the width of the mixer strip when it is set to `wide' */
+       longest_label = "longest label";
+
        Gtk::Image* img;
 
        img = manage (new Gtk::Image (::get_icon("strip_width")));
@@ -151,14 +154,15 @@ MixerStrip::init ()
        input_button.add (input_label);
        input_button.set_name ("MixerIOButton");
        input_label.set_name ("MixerIOButtonLabel");
-       Gtkmm2ext::set_size_request_to_display_given_text (input_button, "longest label", 4, 4);
+
+       Gtkmm2ext::set_size_request_to_display_given_text (input_button, longest_label.c_str(), 4, 4);
 
        output_label.set_text (_("Output"));
        ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), "");
        output_button.add (output_label);
        output_button.set_name ("MixerIOButton");
        output_label.set_name ("MixerIOButtonLabel");
-       Gtkmm2ext::set_size_request_to_display_given_text (output_button, "longest label", 4, 4);
+       Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
 
        ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
        meter_point_button.add (meter_point_label);
@@ -197,7 +201,7 @@ MixerStrip::init ()
 
        name_button.add (name_label);
        name_button.set_name ("MixerNameButton");
-       Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+       Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
 
        name_label.set_name ("MixerNameButtonLabel");
        ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
@@ -439,12 +443,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        /* now force an update of all the various elements */
 
-       processor_box.update();
        mute_changed (0);
        solo_changed (0);
        name_changed ();
        comment_changed (0);
-       route_group_changed (0);
+       route_group_changed ();
 
        connect_to_pan ();
 
@@ -526,7 +529,6 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        gpm.set_width (w);
        panners.set_width (w);
-       processor_box.set_width (w);
 
        boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
 
@@ -597,13 +599,16 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
-               Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+               Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
                set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }
+
+       processor_box.set_width (w);
+       
        update_input_display ();
        update_output_display ();
-       route_group_changed (0);
+       route_group_changed ();
        name_changed ();
        WidthChanged ();
 }
@@ -705,7 +710,7 @@ MixerStrip::edit_output_configuration ()
                        output = _route->output ();
                }
                
-               output_selector = new IOSelectorWindow (_session, output);
+               output_selector = new IOSelectorWindow (&_session, output);
        }
 
        if (output_selector->is_visible()) {
@@ -719,7 +724,7 @@ void
 MixerStrip::edit_input_configuration ()
 {
        if (input_selector == 0) {
-               input_selector = new IOSelectorWindow (_session, _route->input());
+               input_selector = new IOSelectorWindow (&_session, _route->input());
        }
 
        if (input_selector->is_visible()) {
@@ -1298,7 +1303,7 @@ MixerStrip::comment_changed (void *src)
 void
 MixerStrip::set_route_group (RouteGroup *rg)
 {
-       _route->set_route_group (rg, this);
+       rg->add (_route);
 }
 
 bool
@@ -1325,9 +1330,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 }
 
 void
-MixerStrip::route_group_changed (void *ignored)
+MixerStrip::route_group_changed ()
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_group_changed), ignored));
+       ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::route_group_changed));
 
        RouteGroup *rg = _route->route_group();
 
@@ -1609,6 +1614,7 @@ MixerStrip::engine_running ()
 {
 }
 
+/** Called when the metering point has changed */
 void
 MixerStrip::meter_changed (void *src)
 {
@@ -1635,7 +1641,6 @@ MixerStrip::meter_changed (void *src)
        gpm.setup_meters ();
        // reset peak when meter point changes
        gpm.reset_peak_display();
-       set_width_enum (_width, this);
 }
 
 void