Removed unnecessary AudioEngine argument to FooPluginUIs.
git-svn-id: svn://localhost/ardour2/trunk@785 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
00bf20c236
commit
5596fe35df
@ -23,11 +23,32 @@
|
||||
|
||||
#include "plugin_ui.h"
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,6 @@
|
||||
|
||||
#include <midi++/manager.h>
|
||||
|
||||
#include <ardour/audioengine.h>
|
||||
#include <ardour/plugin.h>
|
||||
#include <ardour/insert.h>
|
||||
#include <ardour/ladspa_plugin.h>
|
||||
@ -57,9 +56,8 @@ using namespace Gtkmm2ext;
|
||||
using namespace Gtk;
|
||||
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),
|
||||
engine(engine),
|
||||
button_table (initial_button_rows, initial_button_cols),
|
||||
output_table (initial_output_rows, initial_output_cols),
|
||||
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));
|
||||
bypass_button.set_active (!insert->active());
|
||||
|
||||
build (engine);
|
||||
build ();
|
||||
}
|
||||
|
||||
LadspaPluginUI::~LadspaPluginUI ()
|
||||
@ -119,7 +117,7 @@ LadspaPluginUI::~LadspaPluginUI ()
|
||||
}
|
||||
|
||||
void
|
||||
LadspaPluginUI::build (AudioEngine &engine)
|
||||
LadspaPluginUI::build ()
|
||||
|
||||
{
|
||||
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;
|
||||
continue;
|
||||
}
|
||||
@ -359,7 +357,7 @@ LadspaPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
|
||||
}
|
||||
|
||||
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;
|
||||
|
@ -37,7 +37,6 @@
|
||||
|
||||
#include <midi++/manager.h>
|
||||
|
||||
#include <ardour/audioengine.h>
|
||||
#include <ardour/plugin.h>
|
||||
#include <ardour/insert.h>
|
||||
#include <ardour/ladspa_plugin.h>
|
||||
@ -63,7 +62,7 @@ using namespace Gtkmm2ext;
|
||||
using namespace Gtk;
|
||||
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")
|
||||
{
|
||||
if (insert->plugin()->has_editor()) {
|
||||
@ -92,7 +91,7 @@ PluginUIWindow::PluginUIWindow (AudioEngine &engine, boost::shared_ptr<PluginIns
|
||||
|
||||
} else {
|
||||
|
||||
LadspaPluginUI* pu = new LadspaPluginUI (engine, insert, scrollable);
|
||||
LadspaPluginUI* pu = new LadspaPluginUI (insert, scrollable);
|
||||
|
||||
_pluginui = pu;
|
||||
get_vbox()->add (*pu);
|
||||
|
@ -45,7 +45,6 @@
|
||||
#include <ardour/types.h>
|
||||
|
||||
namespace ARDOUR {
|
||||
class AudioEngine;
|
||||
class PluginInsert;
|
||||
class Plugin;
|
||||
class VSTPlugin;
|
||||
@ -90,7 +89,7 @@ class PlugUIBase : public virtual sigc::trackable
|
||||
class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
|
||||
{
|
||||
public:
|
||||
LadspaPluginUI (ARDOUR::AudioEngine &, boost::shared_ptr<ARDOUR::PluginInsert> plug, bool scrollable=false);
|
||||
LadspaPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> plug, bool scrollable=false);
|
||||
~LadspaPluginUI ();
|
||||
|
||||
gint get_preferred_height () { return prefheight; }
|
||||
@ -99,7 +98,6 @@ class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
|
||||
bool stop_updating(GdkEventAny*);
|
||||
|
||||
private:
|
||||
ARDOUR::AudioEngine &engine;
|
||||
Gtk::HBox settings_box;
|
||||
Gtk::HBox hpacker;
|
||||
|
||||
@ -174,8 +172,8 @@ class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
|
||||
sigc::connection screen_update_connection;
|
||||
void output_update();
|
||||
|
||||
void build (ARDOUR::AudioEngine &);
|
||||
ControlUI* build_control_ui (ARDOUR::AudioEngine &, guint32 port_index, PBD::Controllable *);
|
||||
void build ();
|
||||
ControlUI* build_control_ui (guint32 port_index, PBD::Controllable *);
|
||||
std::vector<string> setup_scale_values(guint32 port_index, ControlUI* cui);
|
||||
void control_adjustment_changed (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
|
||||
{
|
||||
public:
|
||||
PluginUIWindow (ARDOUR::AudioEngine &, boost::shared_ptr<ARDOUR::PluginInsert> insert, bool scrollable=false);
|
||||
PluginUIWindow (boost::shared_ptr<ARDOUR::PluginInsert> insert, bool scrollable=false);
|
||||
~PluginUIWindow ();
|
||||
|
||||
PlugUIBase& pluginui() { return *_pluginui; }
|
||||
@ -240,7 +238,7 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
|
||||
class AUPluginUI
|
||||
{
|
||||
public:
|
||||
AUPluginUI (ARDOUR::AudioEngine&, boost::shared_ptr<ARDOUR::PluginInsert>);
|
||||
AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>);
|
||||
~AUPluginUI ();
|
||||
|
||||
private:
|
||||
|
@ -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);
|
||||
|
||||
plugin_ui = new PluginUIWindow (_session.engine(), plugin_insert);
|
||||
plugin_ui = new PluginUIWindow (plugin_insert);
|
||||
if (_owner_is_mixer) {
|
||||
ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
|
||||
} else {
|
||||
@ -1001,7 +1001,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
|
||||
} else if (type == ARDOUR::AudioUnit) {
|
||||
AUPluginUI* plugin_ui;
|
||||
if (plugin_insert->get_gui() == 0) {
|
||||
plugin_ui = new AUPluginUI (_session.engine(), plugin_insert);
|
||||
plugin_ui = new AUPluginUI (plugin_insert);
|
||||
} else {
|
||||
plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui());
|
||||
}
|
||||
|
@ -556,7 +556,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Redirect> redirect,
|
||||
|
||||
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) {
|
||||
cleanup_pre_view();
|
||||
|
Loading…
Reference in New Issue
Block a user