smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5878 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-23 01:00:13 +00:00
parent bcf885b4be
commit 370752bf24
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/mixer_strip.cc
View file

@ -1794,7 +1794,7 @@ MixerStrip::mono_button_clicked ()
panners.set_mono (_mono_button.get_active ()); panners.set_mono (_mono_button.get_active ());
} }
PluginSelector& PluginSelector*
MixerStrip::plugin_selector() MixerStrip::plugin_selector()
{ {
return _mixer.plugin_selector(); return _mixer.plugin_selector();

2
gtk2_ardour/mixer_strip.h
View file

@ -89,7 +89,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
GainMeter& gain_meter() { return gpm; } GainMeter& gain_meter() { return gpm; }
PannerUI& panner_ui() { return panners; } PannerUI& panner_ui() { return panners; }
PluginSelector& plugin_selector(); PluginSelector* plugin_selector();
void fast_update (); void fast_update ();
void set_embedded (bool); void set_embedded (bool);

4
gtk2_ardour/mixer_ui.cc
View file

@ -1492,12 +1492,12 @@ Mixer_UI::set_route_group_activation (RouteGroup* g, bool a)
g->set_active (a, this); g->set_active (a, this);
} }
PluginSelector& PluginSelector*
Mixer_UI::plugin_selector() Mixer_UI::plugin_selector()
{ {
if (!_plugin_selector) { if (!_plugin_selector) {
_plugin_selector = new PluginSelector (PluginManager::the_manager()); _plugin_selector = new PluginSelector (PluginManager::the_manager());
_plugin_selector->set_session (session); _plugin_selector->set_session (session);
} }
return *_plugin_selector; return _plugin_selector;
} }

2
gtk2_ardour/mixer_ui.h
View file

@ -58,7 +58,7 @@ class Mixer_UI : public Gtk::Window
void connect_to_session (ARDOUR::Session *); void connect_to_session (ARDOUR::Session *);
PluginSelector& plugin_selector(); PluginSelector* plugin_selector();
void set_strip_width (Width); void set_strip_width (Width);
Width get_strip_width () const { return _strip_width; } Width get_strip_width () const { return _strip_width; }

8
gtk2_ardour/processor_box.cc
View file

@ -93,7 +93,7 @@ bool ProcessorBox::get_colors = true;
Gdk::Color* ProcessorBox::active_processor_color; Gdk::Color* ProcessorBox::active_processor_color;
Gdk::Color* ProcessorBox::inactive_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) RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
: _session(sess) : _session(sess)
, _parent_strip (parent) , _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")); Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newplugin"));
if (plugin_menu_item) { 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()); 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) { } else if (!processor && ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) {
choose_plugin (); choose_plugin ();
_get_plugin_selector().show_manager (); _get_plugin_selector()->show_manager ();
} }
@ -572,7 +572,7 @@ ProcessorBox::deselect_all_processors ()
void void
ProcessorBox::choose_plugin () ProcessorBox::choose_plugin ()
{ {
_get_plugin_selector().set_interested_object (*this); _get_plugin_selector()->set_interested_object (*this);
} }
void void

4
gtk2_ardour/processor_box.h
View file

@ -69,7 +69,7 @@ namespace ARDOUR {
class ProcessorBox : public Gtk::HBox, public PluginInterestedObject class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
{ {
public: 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); RouteRedirectSelection&, MixerStrip* parent, bool owner_is_mixer = false);
~ProcessorBox (); ~ProcessorBox ();
@ -97,7 +97,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
bool ab_direction; bool ab_direction;
std::vector<sigc::connection> connections; 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; boost::shared_ptr<ARDOUR::Processor> _processor_being_created;

2
gtk2_ardour/route_params_ui.h
View file

@ -62,7 +62,7 @@ class RouteParams_UI : public ArdourDialog
void set_session (ARDOUR::Session *); void set_session (ARDOUR::Session *);
void session_gone (); void session_gone ();
PluginSelector& plugin_selector() { return *_plugin_selector; } PluginSelector* plugin_selector() { return _plugin_selector; }
private: private:
Gtk::HBox global_hpacker; Gtk::HBox global_hpacker;