smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Removed unnecessary AudioEngine argument to FooPluginUIs.

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@785 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-08-10 17:35:58 +00:00
parent 00bf20c236
commit 5596fe35df
6 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gtk2_ardour/au_pluginui.cc
View file

@ -23,11 +23,32 @@
#include "plugin_ui.h" #include "plugin_ui.h"
#include "i18n.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
AUPluginUI::AUPluginUI (ARDOUR::AudioEngine& engine, boost::shared_ptr<PluginInsert> ap) AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> ap)
{ {
if ((au = boost::dynamic_pointer_cast<AUPlugin> (ap->plugin())) == 0) {
error << _("unknown type of editor-supplying plugin (note: no AudioUnit support in this version of ardour)") << endmsg;
throw failed_constructor ();
}
#if 0
set_position (Gtk::WIN_POS_MOUSE);
set_name ("PluginEditor");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)));
insert->GoingAway.connect (mem_fun(*this, &PluginUIWindow::plugin_going_away));
if (scrollable) {
gint h = _pluginui->get_preferred_height ();
if (h > 600) h = 600;
set_default_size (450, h);
}
#endif
info << "AUPluginUI created" << endmsg; info << "AUPluginUI created" << endmsg;
} }

12
gtk2_ardour/ladspa_pluginui.cc
View file

@ -35,7 +35,6 @@
#include <midi++/manager.h> #include <midi++/manager.h>
#include <ardour/audioengine.h>
#include <ardour/plugin.h> #include <ardour/plugin.h>
#include <ardour/insert.h> #include <ardour/insert.h>
#include <ardour/ladspa_plugin.h> #include <ardour/ladspa_plugin.h>
@ -57,9 +56,8 @@ using namespace Gtkmm2ext;
using namespace Gtk; using namespace Gtk;
using namespace sigc; using namespace sigc;
LadspaPluginUI::LadspaPluginUI (AudioEngine &engine, boost::shared_ptr<PluginInsert> pi, bool scrollable) LadspaPluginUI::LadspaPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrollable)
: PlugUIBase (pi), : PlugUIBase (pi),
engine(engine),
button_table (initial_button_rows, initial_button_cols), button_table (initial_button_rows, initial_button_cols),
output_table (initial_output_rows, initial_output_cols), output_table (initial_output_rows, initial_output_cols),
hAdjustment(0.0, 0.0, 0.0), hAdjustment(0.0, 0.0, 0.0),
@ -108,7 +106,7 @@ LadspaPluginUI::LadspaPluginUI (AudioEngine &engine, boost::shared_ptr<PluginIns
insert->active_changed.connect (mem_fun(*this, &LadspaPluginUI::redirect_active_changed)); insert->active_changed.connect (mem_fun(*this, &LadspaPluginUI::redirect_active_changed));
bypass_button.set_active (!insert->active()); bypass_button.set_active (!insert->active());
build (engine); build ();
} }
LadspaPluginUI::~LadspaPluginUI () LadspaPluginUI::~LadspaPluginUI ()
@ -119,7 +117,7 @@ LadspaPluginUI::~LadspaPluginUI ()
} }
void void
LadspaPluginUI::build (AudioEngine &engine) LadspaPluginUI::build ()
{ {
guint32 i = 0; guint32 i = 0;
@ -203,7 +201,7 @@ LadspaPluginUI::build (AudioEngine &engine)
} }
} }
if ((cui = build_control_ui (engine, i, plugin->get_nth_control (i))) == 0) { if ((cui = build_control_ui (i, plugin->get_nth_control (i))) == 0) {
error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg; error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
continue; continue;
} }
@ -359,7 +357,7 @@ LadspaPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
} }
LadspaPluginUI::ControlUI* LadspaPluginUI::ControlUI*
LadspaPluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, PBD::Controllable* mcontrol) LadspaPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontrol)
{ {
ControlUI* control_ui; ControlUI* control_ui;

5
gtk2_ardour/plugin_ui.cc
View file

@ -37,7 +37,6 @@
#include <midi++/manager.h> #include <midi++/manager.h>
#include <ardour/audioengine.h>
#include <ardour/plugin.h> #include <ardour/plugin.h>
#include <ardour/insert.h> #include <ardour/insert.h>
#include <ardour/ladspa_plugin.h> #include <ardour/ladspa_plugin.h>
@ -63,7 +62,7 @@ using namespace Gtkmm2ext;
using namespace Gtk; using namespace Gtk;
using namespace sigc; using namespace sigc;
PluginUIWindow::PluginUIWindow (AudioEngine &engine, boost::shared_ptr<PluginInsert> insert, bool scrollable) PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scrollable)
: ArdourDialog ("plugin ui") : ArdourDialog ("plugin ui")
{ {
if (insert->plugin()->has_editor()) { if (insert->plugin()->has_editor()) {
@ -92,7 +91,7 @@ PluginUIWindow::PluginUIWindow (AudioEngine &engine, boost::shared_ptr<PluginIns
} else { } else {
LadspaPluginUI* pu = new LadspaPluginUI (engine, insert, scrollable); LadspaPluginUI* pu = new LadspaPluginUI (insert, scrollable);
_pluginui = pu; _pluginui = pu;
get_vbox()->add (*pu); get_vbox()->add (*pu);

12
gtk2_ardour/plugin_ui.h
View file

@ -45,7 +45,6 @@
#include <ardour/types.h> #include <ardour/types.h>
namespace ARDOUR { namespace ARDOUR {
class AudioEngine;
class PluginInsert; class PluginInsert;
class Plugin; class Plugin;
class VSTPlugin; class VSTPlugin;
@ -90,7 +89,7 @@ class PlugUIBase : public virtual sigc::trackable
class LadspaPluginUI : public PlugUIBase, public Gtk::VBox class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
{ {
public: public:
LadspaPluginUI (ARDOUR::AudioEngine &, boost::shared_ptr<ARDOUR::PluginInsert> plug, bool scrollable=false); LadspaPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> plug, bool scrollable=false);
~LadspaPluginUI (); ~LadspaPluginUI ();
gint get_preferred_height () { return prefheight; } gint get_preferred_height () { return prefheight; }
@ -99,7 +98,6 @@ class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
bool stop_updating(GdkEventAny*); bool stop_updating(GdkEventAny*);
private: private:
ARDOUR::AudioEngine &engine;
Gtk::HBox settings_box; Gtk::HBox settings_box;
Gtk::HBox hpacker; Gtk::HBox hpacker;
@ -174,8 +172,8 @@ class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
sigc::connection screen_update_connection; sigc::connection screen_update_connection;
void output_update(); void output_update();
void build (ARDOUR::AudioEngine &); void build ();
ControlUI* build_control_ui (ARDOUR::AudioEngine &, guint32 port_index, PBD::Controllable *); ControlUI* build_control_ui (guint32 port_index, PBD::Controllable *);
std::vector<string> setup_scale_values(guint32 port_index, ControlUI* cui); std::vector<string> setup_scale_values(guint32 port_index, ControlUI* cui);
void control_adjustment_changed (ControlUI* cui); void control_adjustment_changed (ControlUI* cui);
void parameter_changed (uint32_t, float, ControlUI* cui); void parameter_changed (uint32_t, float, ControlUI* cui);
@ -197,7 +195,7 @@ class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
class PluginUIWindow : public ArdourDialog class PluginUIWindow : public ArdourDialog
{ {
public: public:
PluginUIWindow (ARDOUR::AudioEngine &, boost::shared_ptr<ARDOUR::PluginInsert> insert, bool scrollable=false); PluginUIWindow (boost::shared_ptr<ARDOUR::PluginInsert> insert, bool scrollable=false);
~PluginUIWindow (); ~PluginUIWindow ();
PlugUIBase& pluginui() { return *_pluginui; } PlugUIBase& pluginui() { return *_pluginui; }
@ -240,7 +238,7 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
class AUPluginUI class AUPluginUI
{ {
public: public:
AUPluginUI (ARDOUR::AudioEngine&, boost::shared_ptr<ARDOUR::PluginInsert>); AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>);
~AUPluginUI (); ~AUPluginUI ();
private: private:

4
gtk2_ardour/redirect_box.cc
View file

@ -979,7 +979,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker); title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker);
plugin_ui = new PluginUIWindow (_session.engine(), plugin_insert); plugin_ui = new PluginUIWindow (plugin_insert);
if (_owner_is_mixer) { if (_owner_is_mixer) {
ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui); ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
} else { } else {
@ -1001,7 +1001,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
} else if (type == ARDOUR::AudioUnit) { } else if (type == ARDOUR::AudioUnit) {
AUPluginUI* plugin_ui; AUPluginUI* plugin_ui;
if (plugin_insert->get_gui() == 0) { if (plugin_insert->get_gui() == 0) {
plugin_ui = new AUPluginUI (_session.engine(), plugin_insert); plugin_ui = new AUPluginUI (plugin_insert);
} else { } else {
plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui()); plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui());
} }

2
gtk2_ardour/route_params_ui.cc
View file

@ -556,7 +556,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Redirect> redirect,
if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) { if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) {
LadspaPluginUI *plugin_ui = new LadspaPluginUI (session->engine(), plugin_insert, true); LadspaPluginUI *plugin_ui = new LadspaPluginUI (plugin_insert, true);
if (place == PreFader) { if (place == PreFader) {
cleanup_pre_view(); cleanup_pre_view();