Make deferred plugin stuff work with old compiler or different sigc version or whatever.

git-svn-id: svn://localhost/ardour2/branches/3.0@5878 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index c82a621d36c1df969d5bc95ac62d8e71a86110c6..f2af3751496c80814f6c1ddc636918b45676901a 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1794,7 +1794,7 @@ MixerStrip::mono_button_clicked ()
        panners.set_mono (_mono_button.get_active ());
 }
 
-PluginSelector&
+PluginSelector*
 MixerStrip::plugin_selector()
 {
        return _mixer.plugin_selector();

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 891d3a4d8dbdfe335a4421ab09186d584714a771..ac68b505ef2b752af591f00645297fee5b6921a9 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -89,7 +89,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        GainMeter&      gain_meter()      { return gpm; }
        PannerUI&       panner_ui()       { return panners; }
-       PluginSelector& plugin_selector();
+       PluginSelector* plugin_selector();
 
        void fast_update ();
        void set_embedded (bool);

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 9e8277a3e050a80b9daa26f7fc518fd06c0ff947..dbc61f43085ea411445af3726ce60393cde8ee0a 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1492,12 +1492,12 @@ Mixer_UI::set_route_group_activation (RouteGroup* g, bool a)
        g->set_active (a, this);
 }
 
-PluginSelector&
+PluginSelector*
 Mixer_UI::plugin_selector()
 {
        if (!_plugin_selector) {
                _plugin_selector = new PluginSelector (PluginManager::the_manager());
                _plugin_selector->set_session (session);
        }
-       return *_plugin_selector;
+       return _plugin_selector;
 }

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index e96178160af9298fe26e8d20cdaacb5c12026068..bb9625540698378e4fb55fd1bb8a72ef6607bf95 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -58,7 +58,7 @@ class Mixer_UI : public Gtk::Window
 
        void connect_to_session (ARDOUR::Session *);
 
-       PluginSelector& plugin_selector();
+       PluginSelector* plugin_selector();
 
        void  set_strip_width (Width);
        Width get_strip_width () const { return _strip_width; }

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index b21ce633da3ff9135ed014a431f79062eb6b022d..08907889310b17fe1a27c31c02ce12de775c65c5 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -93,7 +93,7 @@ bool ProcessorBox::get_colors = true;
 Gdk::Color* ProcessorBox::active_processor_color;
 Gdk::Color* ProcessorBox::inactive_processor_color;
 
-ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector&> get_plugin_selector,
+ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> get_plugin_selector,
                        RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
        : _session(sess)
        , _parent_strip (parent)
@@ -309,7 +309,7 @@ ProcessorBox::show_processor_menu (gint arg)
        Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newplugin"));
 
        if (plugin_menu_item) {
-               plugin_menu_item->set_submenu (_get_plugin_selector().plugin_menu());
+               plugin_menu_item->set_submenu (_get_plugin_selector()->plugin_menu());
        }
 
        paste_action->set_sensitive (!_rr_selection.processors.empty());
@@ -469,7 +469,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev)
        } else if (!processor && ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) {
 
                choose_plugin ();
-               _get_plugin_selector().show_manager ();
+               _get_plugin_selector()->show_manager ();
        }
 
 
@@ -572,7 +572,7 @@ ProcessorBox::deselect_all_processors ()
 void
 ProcessorBox::choose_plugin ()
 {
-       _get_plugin_selector().set_interested_object (*this);
+       _get_plugin_selector()->set_interested_object (*this);
 }
 
 void

diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 075e176903ce90e09784eed9b9958d2e62f7fb98..f175448377639d9262695f0971fbf2f8e5056e5c 100644 (file)
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -69,7 +69,7 @@ namespace ARDOUR {
 class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
 {
   public:
-       ProcessorBox (ARDOUR::Session&, sigc::slot<PluginSelector&> get_plugin_selector,
+       ProcessorBox (ARDOUR::Session&, sigc::slot<PluginSelector*> get_plugin_selector,
                        RouteRedirectSelection&, MixerStrip* parent, bool owner_is_mixer = false);
        ~ProcessorBox ();
 
@@ -97,7 +97,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
        bool                 ab_direction;
        std::vector<sigc::connection> connections;
 
-       sigc::slot<PluginSelector&> _get_plugin_selector;
+       sigc::slot<PluginSelector*> _get_plugin_selector;
 
        boost::shared_ptr<ARDOUR::Processor> _processor_being_created;
 

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index ca582dadd3cf1f7492627941cde074b7f781ee5f..4c79bb0829e8e1c4b6f59e96df1f31def2e0dbf1 100644 (file)
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -62,7 +62,7 @@ class RouteParams_UI : public ArdourDialog
 
        void set_session (ARDOUR::Session *);
        void session_gone ();
-       PluginSelector&  plugin_selector() { return *_plugin_selector; }
+       PluginSelector*  plugin_selector() { return _plugin_selector; }
 
   private:
        Gtk::HBox                global_hpacker;