diff options
author | Hans Fugal <hans@fugal.net> | 2006-08-12 21:57:07 +0000 |
---|---|---|
committer | Hans Fugal <hans@fugal.net> | 2006-08-12 21:57:07 +0000 |
commit | 1f20fbbad8cf9deda3743003bbc40b14ba06465d (patch) | |
tree | 623cc58dff647a6da432c6966ea6a4c63f01db6f /gtk2_ardour | |
parent | 8e1c9186cbe02481f3cf7986ccd4bbe0fea6af65 (diff) |
merge from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@802 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/SConscript | 7 | ||||
-rw-r--r-- | gtk2_ardour/au_pluginui.cc | 125 | ||||
-rw-r--r-- | gtk2_ardour/au_pluginui.h | 48 | ||||
-rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/plugin_ui.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/plugin_ui.h | 14 | ||||
-rw-r--r-- | gtk2_ardour/redirect_box.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/region_view.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.cc | 2 |
10 files changed, 180 insertions, 34 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 2a7250eaa4..658caac1e3 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -200,6 +200,11 @@ mtest_files=Split(""" mtest.cc """) + +rcu_files=Split(""" +rcu.cc +""") + itest_files=Split(""" itest.cc """) @@ -215,6 +220,7 @@ if env['VST']: if gtkardour['COREAUDIO']: extra_sources += coreaudio_files gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO') + gtkardour.Append(LINKFLAGS='-framework Carbon') gtkardour.Merge([libraries['appleutility']]) if env['FFT_ANALYSIS']: @@ -238,6 +244,7 @@ ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_fil mtest = gtkardour.Program(target = 'mtest', source = mtest_files) itest = gtkardour.Program(target = 'itest', source = itest_files) +rcu = gtkardour.Program(target = 'rcu', source = rcu_files) my_subst_dict = { } my_subst_dict['%INSTALL_PREFIX%'] = install_prefix diff --git a/gtk2_ardour/au_pluginui.cc b/gtk2_ardour/au_pluginui.cc index e4a5c73fe9..092e34d50b 100644 --- a/gtk2_ardour/au_pluginui.cc +++ b/gtk2_ardour/au_pluginui.cc @@ -18,37 +18,102 @@ */ -#include <ardour/insert.h> #include <ardour/audio_unit.h> +#include <ardour/insert.h> + +#include <gtkmm2ext/doi.h> + +#include "au_pluginui.h" +#include "gui_thread.h" -#include "plugin_ui.h" +#include <appleutility/CAAudioUnit.h> +#include <appleutility/CAComponent.h> + +#include <AudioUnit/AudioUnit.h> #include "i18n.h" using namespace ARDOUR; using namespace PBD; -AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> ap) +AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert) { - if ((au = boost::dynamic_pointer_cast<AUPlugin> (ap->plugin())) == 0) { + if ((au = boost::dynamic_pointer_cast<AUPlugin> (insert->plugin())) == 0) { error << _("unknown type of editor-supplying plugin (note: no AudioUnit support in this version of ardour)") << endmsg; throw failed_constructor (); } + OSStatus err = noErr; + + CAComponentDescription desc; + Component carbonViewComponent = NULL; + AudioUnitCarbonView carbonView = NULL; + + GetComponentInfo(au->get_comp()->Comp(), &desc, 0, 0, 0); + carbonViewComponent = get_carbon_view_component(desc.componentSubType); + err = OpenAComponent(carbonViewComponent, &carbonView); + + Rect rec; + rec.top = 0; + rec.left = 0; + rec.bottom = 400; + rec.right = 500; + + ProcessSerialNumber ourPSN; + + /* Here we will set the MacOSX native section of the process to the foreground for putting up this + * dialog box. First step is to get our process serial number. We do this by calling + * GetCurrentProcess. + * First Argument: On success this PSN will be our PSN on return. + * Return Value: A Macintosh error indicating success or failure. + */ + err = GetCurrentProcess(&ourPSN); + + //If no error then set this process to be frontmost. + if (err == noErr) { + /* Calling SetFrontProcess to make us frontmost. + * First Argument: The Process Serial Number of the process we want to make frontmost. Here + * of course we pass our process serial number + * Return Value: An error value indicating success or failure. We just ignore the return + * value here. + */ + (void)SetFrontProcess(&ourPSN); + } else { + error << "couldn't get current process" << endmsg; + } + + err = CreateNewWindow (kDocumentWindowClass, kWindowStandardFloatingAttributes, &rec, &wr); + + ComponentResult auResult; + ControlRef rootControl = NULL; + GetRootControl(wr, &rootControl); + + int width = 500; + int height = 400; + Float32Point location = {30, 30}; + Float32Point size = {width, height}; + ControlRef audioUnitControl = NULL; + + auResult = AudioUnitCarbonViewCreate(carbonView, + au->get_au()->AU(), + wr, + rootControl, + &location, + &size, + &audioUnitControl); + + ShowWindow (wr); + BringToFront (wr); +// AudioUnitCarbonViewSetEventListener(carbonView, EventListener, this); #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)); +#endif - if (scrollable) { - gint h = _pluginui->get_preferred_height (); - if (h > 600) h = 600; - set_default_size (450, h); - } -#endif + insert->GoingAway.connect (mem_fun(*this, &AUPluginUI::plugin_going_away)); + info << "AUPluginUI created" << endmsg; } @@ -56,3 +121,39 @@ AUPluginUI::~AUPluginUI () { // nothing to do here - plugin destructor destroys the GUI } + +void +AUPluginUI::plugin_going_away (ARDOUR::Redirect* ignored) +{ + ENSURE_GUI_THREAD(bind (mem_fun(*this, &AUPluginUI::plugin_going_away), ignored)); + + delete_when_idle (this); +} + +Component +AUPluginUI::get_carbon_view_component(OSType subtype) +{ + ComponentDescription desc; + Component component; + + desc.componentType = kAudioUnitCarbonViewComponentType; // 'auvw' + desc.componentSubType = subtype; + desc.componentManufacturer = 0; + desc.componentFlags = 0; + desc.componentFlagsMask = 0; + + // First see if we can find a carbon view designed specifically for this + // plug-in: + + component = FindNextComponent(NULL, &desc); + if (component) + return component; + + // If not, grab the generic carbon view, which will create a GUI for + // any Audio Unit. + + desc.componentSubType = kAUCarbonViewSubType_Generic; + component = FindNextComponent(NULL, &desc); + + return component; +} diff --git a/gtk2_ardour/au_pluginui.h b/gtk2_ardour/au_pluginui.h new file mode 100644 index 0000000000..2dcefcc42f --- /dev/null +++ b/gtk2_ardour/au_pluginui.h @@ -0,0 +1,48 @@ +/* + Copyright (C) 2006 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __au_plugin_ui_h__ +#define __au_plugin_ui_h__ + +#include <boost/shared_ptr.hpp> + +#include <Carbon/Carbon.h> +#include <AudioUnit/AudioUnit.h> + +namespace ARDOUR { + class AUPlugin; + class PluginInsert; + class Redirect; +} + +class AUPluginUI +{ + public: + AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>); + ~AUPluginUI (); + + private: + WindowRef wr; + boost::shared_ptr<ARDOUR::AUPlugin> au; + + void plugin_going_away (ARDOUR::Redirect*); + Component get_carbon_view_component(OSType subtype); +}; + +#endif // __au_plugin_ui_h__ diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 9ae94d1fe0..f8ace8244f 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -60,8 +60,6 @@ #include "keyboard.h" #include "pan_automation_time_axis.h" #include "playlist_selector.h" -#include "plugin_selector.h" -#include "plugin_ui.h" #include "prompter.h" #include "public_editor.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 4f3dc720d9..b089883c80 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -50,9 +50,7 @@ #include "mixer_strip.h" #include "mixer_ui.h" #include "keyboard.h" -#include "plugin_selector.h" #include "public_editor.h" -#include "plugin_ui.h" #include "send_ui.h" #include "io_selector.h" #include "utils.h" diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 4619d50359..154c2fd3cf 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -205,3 +205,4 @@ PlugUIBase::bypass_toggled () insert->set_active (!x, this); } } + diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index 5c940843f7..fd5516cee1 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -234,16 +234,4 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox }; #endif // VST_SUPPORT -#ifdef HAVE_COREAUDIO -class AUPluginUI -{ - public: - AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>); - ~AUPluginUI (); - - private: - boost::shared_ptr<ARDOUR::AUPlugin> au; -}; -#endif // HAVE_COREAUDIO - #endif /* __ardour_plugin_ui_h__ */ diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index f93dfb9433..058cc9f5ab 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -54,7 +54,6 @@ #include "route_redirect_selection.h" #include "mixer_ui.h" #include "actions.h" - #include "plugin_ui.h" #include "send_ui.h" #include "io_selector.h" @@ -63,6 +62,10 @@ #include "i18n.h" +#ifdef HAVE_COREAUDIO +#include "au_pluginui.h" +#endif + using namespace sigc; using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index ebec4261ac..8e80b147e5 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -111,10 +111,14 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) compute_colors (basic_color); name_highlight->set_data ("regionview", this); - name_text->set_data ("regionview", this); + + if (name_text) { + name_text->set_data ("regionview", this); + } /* an equilateral triangle */ - ArdourCanvas::Points shape; + + ArdourCanvas::Points shape; shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1)); shape.push_back (Gnome::Art::Point ((sync_mark_width - 1)/2, 1)); shape.push_back (Gnome::Art::Point (0, sync_mark_width - 1)); diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 0d7405e4f6..6e578a13e7 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -61,8 +61,6 @@ #include "gui_thread.h" #include "keyboard.h" #include "playlist_selector.h" -#include "plugin_selector.h" -#include "plugin_ui.h" #include "point_selection.h" #include "prompter.h" #include "public_editor.h" |