#undef Marker
#define Marker FuckYouAppleAndYourLackOfNameSpaces
-#include <pbd/error.h>
-#include <ardour/audio_unit.h>
-#include <ardour/insert.h>
-
-#undef check // stupid gtk, stupid apple
-
#include <gtkmm/button.h>
#include <gdk/gdkquartz.h>
+#include "pbd/convert.h"
+#include "pbd/error.h"
+
+#include "ardour/audio_unit.h"
+#include "ardour/debug.h"
+#include "ardour/plugin_insert.h"
+
+#undef check // stupid gtk, stupid apple
+
#include <gtkmm2ext/utils.h>
#include "au_pluginui.h"
#include "gui_thread.h"
-#include <appleutility/CAAudioUnit.h>
-#include <appleutility/CAComponent.h>
+#include "appleutility/CAAudioUnit.h"
+#include "appleutility/CAComponent.h"
#import <AudioUnit/AUCocoaUIView.h>
#import <CoreAudioKit/AUGenericView.h>
using namespace ARDOUR;
using namespace Gtk;
using namespace Gtkmm2ext;
-using namespace sigc;
using namespace std;
using namespace PBD;
0
};
+static void
+dump_view_tree (NSView* view, int depth)
+{
+ NSArray* subviews = [view subviews];
+ unsigned long cnt = [subviews count];
+
+ for (int d = 0; d < depth; d++) {
+ cerr << '\t';
+ }
+ NSRect frame = [view frame];
+ cerr << " view @ " << frame.origin.x << ", " << frame.origin.y
+ << ' ' << frame.size.width << " x " << frame.size.height
+ << endl;
+
+ for (unsigned long i = 0; i < cnt; ++i) {
+ NSView* subview = [subviews objectAtIndex:i];
+ dump_view_tree (subview, depth+1);
+ }
+}
+
+@implementation NotificationObject
+
+- (NotificationObject*) initWithPluginUI: (AUPluginUI*) apluginui andCocoaParent: (NSWindow*) cp andTopLevelParent: (NSWindow*) tlp
+{
+ self = [ super init ];
+
+ if (self) {
+ plugin_ui = apluginui;
+ top_level_parent = tlp;
+
+ if (cp) {
+ cocoa_parent = cp;
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(cocoaParentActivationHandler:)
+ name:NSWindowDidBecomeMainNotification
+ object:NULL];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(cocoaParentBecameKeyHandler:)
+ name:NSWindowDidBecomeKeyNotification
+ object:NULL];
+ }
+ }
+
+ return self;
+}
+
+- (void)cocoaParentActivationHandler:(NSNotification *)notification
+{
+ NSWindow* notification_window = (NSWindow *)[notification object];
+
+ if (top_level_parent == notification_window || cocoa_parent == notification_window) {
+ if ([notification_window isMainWindow]) {
+ plugin_ui->activate();
+ } else {
+ plugin_ui->deactivate();
+ }
+ }
+}
+
+- (void)cocoaParentBecameKeyHandler:(NSNotification *)notification
+{
+ NSWindow* notification_window = (NSWindow *)[notification object];
+
+ if (top_level_parent == notification_window || cocoa_parent == notification_window) {
+ if ([notification_window isKeyWindow]) {
+ plugin_ui->activate();
+ } else {
+ plugin_ui->deactivate();
+ }
+ }
+}
+
+- (void)auViewResized:(NSNotification *)notification
+{
+ (void) notification; // stop complaints about unusued argument
+ plugin_ui->cocoa_view_resized();
+}
+
+@end
+
AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
: PlugUIBase (insert)
, automation_mode_label (_("Automation"))
HBox* smaller_hbox = manage (new HBox);
- smaller_hbox->pack_start (preset_label, false, false, 10);
- smaller_hbox->pack_start (preset_combo, false, false);
+ smaller_hbox->set_spacing (6);
+ smaller_hbox->pack_start (preset_label, false, false, 4);
+ smaller_hbox->pack_start (_preset_modified, false, false);
+ smaller_hbox->pack_start (_preset_combo, false, false);
+ smaller_hbox->pack_start (add_button, false, false);
+#if 0
+ /* Ardour does not currently allow to overwrite existing presets
+ * see save_property_list() in audio_unit.cc
+ */
smaller_hbox->pack_start (save_button, false, false);
+#endif
+#if 0
+ /* one day these might be useful with an AU plugin, but not yet */
smaller_hbox->pack_start (automation_mode_label, false, false);
smaller_hbox->pack_start (automation_mode_selector, false, false);
+#endif
+ smaller_hbox->pack_start (reset_button, false, false);
smaller_hbox->pack_start (bypass_button, false, true);
VBox* v1_box = manage (new VBox);
pack_start (low_box, false, false);
preset_label.show ();
- preset_combo.show ();
+ _preset_combo.show ();
automation_mode_label.show ();
automation_mode_selector.show ();
bypass_button.show ();
top_box.show ();
low_box.show ();
- _activating_from_app = false;
cocoa_parent = 0;
cocoa_window = 0;
+
+#ifdef WITH_CARBON
+ _activating_from_app = false;
+ _notify = 0;
au_view = 0;
- packView = 0;
+ editView = 0;
+ carbon_window = 0;
+#endif
/* prefer cocoa, fall back to cocoa, but use carbon if its there */
if (test_cocoa_view_support()) {
create_cocoa_view ();
+#ifdef WITH_CARBON
} else if (test_carbon_view_support()) {
create_carbon_view ();
+#endif
} else {
create_cocoa_view ();
}
+ low_box.add_events(Gdk::VISIBILITY_NOTIFY_MASK);
+
low_box.signal_realize().connect (mem_fun (this, &AUPluginUI::lower_box_realized));
+ low_box.signal_visibility_notify_event ().connect (mem_fun (this, &AUPluginUI::lower_box_visibility_notify));
}
AUPluginUI::~AUPluginUI ()
{
+ if (_notify) {
+ [[NSNotificationCenter defaultCenter] removeObserver:_notify];
+ }
+
if (cocoa_parent) {
NSWindow* win = get_nswindow();
- RemoveEventHandler(carbon_event_handler);
[win removeChildWindow:cocoa_parent];
- } else if (carbon_window) {
- /* never parented */
+ }
+
+#ifdef WITH_CARBON
+ if (carbon_window) {
+ /* not parented, just overlaid on top of our window */
DisposeWindow (carbon_window);
}
+#endif
- if (packView && packView != au_view) {
- [packView release];
+ if (editView) {
+ CloseComponent (editView);
+ }
+
+ if (au_view) {
+ /* remove whatever we packed into low_box so that GTK doesn't
+ mess with it.
+ */
+
+ [au_view removeFromSuperview];
}
}
bool
AUPluginUI::test_carbon_view_support ()
{
+#ifdef WITH_CARBON
bool ret = false;
carbon_descriptor.componentType = kAudioUnitCarbonViewComponentType;
}
return ret;
+#else
+ return false;
+#endif
}
bool
int
AUPluginUI::create_cocoa_view ()
{
- BOOL wasAbleToLoadCustomView = NO;
+ bool wasAbleToLoadCustomView = false;
AudioUnitCocoaViewInfo* cocoaViewInfo = NULL;
UInt32 numberOfClasses = 0;
UInt32 dataSize;
Boolean isWritable;
NSString* factoryClassName = 0;
- NSURL* CocoaViewBundlePath;
+ NSURL* CocoaViewBundlePath = NULL;
OSStatus result = AudioUnitGetPropertyInfo (*au->get_au(),
kAudioUnitProperty_CocoaUI,
&isWritable );
numberOfClasses = (dataSize - sizeof(CFURLRef)) / sizeof(CFStringRef);
-
+
// Does view have custom Cocoa UI?
if ((result == noErr) && (numberOfClasses > 0) ) {
+
+ DEBUG_TRACE(DEBUG::AudioUnits,
+ string_compose ( "based on %1, there are %2 cocoa UI classes\n", dataSize, numberOfClasses));
+
cocoaViewInfo = (AudioUnitCocoaViewInfo *)malloc(dataSize);
+
if(AudioUnitGetProperty(*au->get_au(),
kAudioUnitProperty_CocoaUI,
kAudioUnitScope_Global,
&dataSize) == noErr) {
CocoaViewBundlePath = (NSURL *)cocoaViewInfo->mCocoaAUViewBundleLocation;
-
+
// we only take the first view in this example.
factoryClassName = (NSString *)cocoaViewInfo->mCocoaAUViewClass[0];
-
+
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("the factory name is %1 bundle is %2\n",
+ [factoryClassName UTF8String], CocoaViewBundlePath));
+
} else {
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("No cocoaUI property cocoaViewInfo = %1\n", cocoaViewInfo));
+
if (cocoaViewInfo != NULL) {
free (cocoaViewInfo);
cocoaViewInfo = NULL;
}
}
- NSRect crect = { { 0, 0 }, { 1, 1} };
-
// [A] Show custom UI if view has it
if (CocoaViewBundlePath && factoryClassName) {
NSBundle *viewBundle = [NSBundle bundleWithPath:[CocoaViewBundlePath path]];
- if (viewBundle == nil) {
+
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle));
+
+ if (viewBundle == NULL) {
error << _("AUPluginUI: error loading AU view's bundle") << endmsg;
return -1;
} else {
Class factoryClass = [viewBundle classNamed:factoryClassName];
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create factory class, result = %1\n", factoryClass));
if (!factoryClass) {
error << _("AUPluginUI: error getting AU view's factory class from bundle") << endmsg;
return -1;
return -1;
}
// make a factory
- id factoryInstance = [[[factoryClass alloc] init] autorelease];
- if (factoryInstance == nil) {
+ id factory = [[[factoryClass alloc] init] autorelease];
+ if (factory == NULL) {
error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg;
return -1;
}
+ DEBUG_TRACE (DEBUG::AudioUnits, "got a factory instance\n");
+
// make a view
- au_view = [factoryInstance uiViewForAudioUnit:*au->get_au() withSize:crect.size];
+ au_view = [factory uiViewForAudioUnit:*au->get_au() withSize:NSZeroSize];
+
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("view created @ %1\n", au_view));
// cleanup
[CocoaViewBundlePath release];
free (cocoaViewInfo);
}
- wasAbleToLoadCustomView = YES;
+ wasAbleToLoadCustomView = true;
}
}
if (!wasAbleToLoadCustomView) {
// load generic Cocoa view
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("Loading generic view using %1 -> %2\n", au,
+ au->get_au()));
au_view = [[AUGenericView alloc] initWithAudioUnit:*au->get_au()];
- [(AUGenericView *)au_view setShowsExpertParameters:YES];
+ DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("view created @ %1\n", au_view));
+ [(AUGenericView *)au_view setShowsExpertParameters:1];
}
- NSRect packFrame;
-
- // Get the size of the new AU View's frame
- packFrame = [au_view frame];
-
- packFrame.origin.x = 0;
- packFrame.origin.y = 0;
-
- if (packFrame.size.width > 500 || packFrame.size.height > 500) {
-
- /* its too big - use a scrollview */
-
- NSRect frameRect = [[cocoa_window contentView] frame];
- scroll_view = [[[NSScrollView alloc] initWithFrame:frameRect] autorelease];
- [scroll_view setDrawsBackground:NO];
- [scroll_view setHasHorizontalScroller:YES];
- [scroll_view setHasVerticalScroller:YES];
-
- packFrame.size = [NSScrollView frameSizeForContentSize:packFrame.size
- hasHorizontalScroller:[scroll_view hasHorizontalScroller]
- hasVerticalScroller:[scroll_view hasVerticalScroller]
- borderType:[scroll_view borderType]];
-
- // Create a new frame with same origin as current
- // frame but size equal to the size of the new view
- NSRect newFrame;
- newFrame.origin = [scroll_view frame].origin;
- newFrame.size = packFrame.size;
-
- // Set the new frame and document views on the scroll view
- [scroll_view setFrame:newFrame];
- [scroll_view setDocumentView:au_view];
-
- packView = scroll_view;
-
- } else {
-
- packView = au_view;
- }
-
- prefwidth = packFrame.size.width;
- prefheight = packFrame.size.height;
+ // Get the initial size of the new AU View's frame
+
+ NSRect rect = [au_view frame];
+ prefheight = rect.size.height;
+ prefwidth = rect.size.width;
+ low_box.set_size_request (rect.size.width, rect.size.height);
return 0;
}
+void
+AUPluginUI::cocoa_view_resized ()
+{
+ NSWindow* window = get_nswindow ();
+ NSRect windowFrame= [window frame];
+ NSRect new_frame = [au_view frame];
+
+ float dy = last_au_frame.size.height - new_frame.size.height;
+ float dx = last_au_frame.size.width - new_frame.size.width;
+
+ windowFrame.origin.y += dy;
+ windowFrame.origin.x += dx;
+ windowFrame.size.height -= dy;
+ windowFrame.size.width -= dx;
+
+ [[NSNotificationCenter defaultCenter] removeObserver:_notify
+ name:NSViewFrameDidChangeNotification
+ object:au_view];
+
+ NSUInteger old_auto_resize = [au_view autoresizingMask];
+
+ [au_view setAutoresizingMask:NSViewNotSizable];
+ [window setFrame:windowFrame display:1];
+
+ /* Some stupid AU Views change the origin of the original AU View
+ when they are resized (I'm looking at you AUSampler). If the origin
+ has been moved, move it back.
+ */
+
+ if (last_au_frame.origin.x != new_frame.origin.x ||
+ last_au_frame.origin.y != new_frame.origin.y) {
+ new_frame.origin = last_au_frame.origin;
+ [au_view setFrame:new_frame];
+ /* also be sure to redraw the topbox because this can
+ also go wrong.
+ */
+ top_box.queue_draw ();
+ }
+
+ [au_view setAutoresizingMask:old_auto_resize];
+
+ [[NSNotificationCenter defaultCenter] addObserver:_notify
+ selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
+ object:au_view];
+
+ last_au_frame = new_frame;
+}
+
int
AUPluginUI::create_carbon_view ()
{
+#ifdef WITH_CARBON
OSStatus err;
ControlRef root_control;
kWindowNoShadowAttribute|
kWindowNoTitleBarAttribute);
- if ((err = CreateNewWindow(kDocumentWindowClass, attr, &r, &carbon_window)) != noErr) {
+ if ((err = CreateNewWindow(kUtilityWindowClass, attr, &r, &carbon_window)) != noErr) {
error << string_compose (_("AUPluginUI: cannot create carbon window (err: %1)"), err) << endmsg;
+ CloseComponent (editView);
return -1;
}
if ((err = GetRootControl(carbon_window, &root_control)) != noErr) {
error << string_compose (_("AUPlugin: cannot get root control of carbon window (err: %1)"), err) << endmsg;
+ DisposeWindow (carbon_window);
+ CloseComponent (editView);
return -1;
}
if ((err = AudioUnitCarbonViewCreate (editView, *au->get_au(), carbon_window, root_control, &location, &size, &viewPane)) != noErr) {
error << string_compose (_("AUPluginUI: cannot create carbon plugin view (err: %1)"), err) << endmsg;
+ DisposeWindow (carbon_window);
+ CloseComponent (editView);
return -1;
}
low_box.set_size_request (prefwidth, prefheight);
return 0;
+#else
+ error << _("AU Carbon GUI is not supported.") << endmsg;
+ return -1;
+#endif
}
NSWindow*
void
AUPluginUI::activate ()
{
- if (carbon_window && cocoa_parent) {
- cerr << "APP activated, activate carbon window " << insert->name() << endl;
- _activating_from_app = true;
- ActivateWindow (carbon_window, TRUE);
- _activating_from_app = false;
- [cocoa_parent makeKeyAndOrderFront:nil];
- }
+#ifdef WITH_CARBON
+ ActivateWindow (carbon_window, TRUE);
+#endif
}
void
AUPluginUI::deactivate ()
{
- return;
- cerr << "APP DEactivated, for " << insert->name() << endl;
- _activating_from_app = true;
+#ifdef WITH_CARBON
ActivateWindow (carbon_window, FALSE);
- _activating_from_app = false;
-}
-
-
-OSStatus
-_carbon_event (EventHandlerCallRef nextHandlerRef, EventRef event, void *userData)
-{
- return ((AUPluginUI*)userData)->carbon_event (nextHandlerRef, event);
-}
-
-OSStatus
-AUPluginUI::carbon_event (EventHandlerCallRef nextHandlerRef, EventRef event)
-{
- cerr << "CARBON EVENT\n";
-
- UInt32 eventKind = GetEventKind(event);
- ClickActivationResult howToHandleClick;
- NSWindow* win = get_nswindow ();
-
- cerr << "window " << win << " carbon event type " << eventKind << endl;
-
- switch (eventKind) {
- case kEventWindowHandleActivate:
- cerr << "carbon window for " << insert->name() << " activated\n";
- if (_activating_from_app) {
- cerr << "app activation, ignore window activation\n";
- return noErr;
- }
- [win makeMainWindow];
- return eventNotHandledErr;
- break;
-
- case kEventWindowHandleDeactivate:
- cerr << "carbon window for " << insert->name() << " would have been deactivated\n";
- // never deactivate the carbon window
- return noErr;
- break;
-
- case kEventWindowGetClickActivation:
- cerr << "carbon window CLICK activated\n";
- [win makeKeyAndOrderFront:nil];
- howToHandleClick = kActivateAndHandleClick;
- SetEventParameter(event, kEventParamClickActivation, typeClickActivationResult,
- sizeof(ClickActivationResult), &howToHandleClick);
- break;
- }
-
- return noErr;
+#endif
}
int
AUPluginUI::parent_carbon_window ()
{
+#ifdef WITH_CARBON
NSWindow* win = get_nswindow ();
- int x, y;
+ Rect windowStructureBoundsRect;
if (!win) {
return -1;
return -1;
}
- toplevel->get_window()->get_root_origin (x, y);
+ /* figure out where the cocoa parent window is in carbon-coordinate space, which
+ differs from both cocoa-coordinate space and GTK-coordinate space
+ */
+
+ GetWindowBounds((WindowRef) [win windowRef], kWindowStructureRgn, &windowStructureBoundsRect);
/* compute how tall the title bar is, because we have to offset the position of the carbon window
by that much.
int packing_extra = 6; // this is the total vertical packing in our top level window
- MoveWindow (carbon_window, x, y + titlebar_height + top_box.get_height() + packing_extra, false);
+ /* move into position, based on parent window position */
+ MoveWindow (carbon_window,
+ windowStructureBoundsRect.left,
+ windowStructureBoundsRect.top + titlebar_height + top_box.get_height() + packing_extra,
+ false);
ShowWindow (carbon_window);
// create the cocoa window for the carbon one and make it visible
cocoa_parent = [[NSWindow alloc] initWithWindowRef: carbon_window];
- EventTypeSpec windowEventTypes[] = {
- {kEventClassWindow, kEventWindowGetClickActivation },
- {kEventClassWindow, kEventWindowHandleDeactivate }
- };
-
- EventHandlerUPP ehUPP = NewEventHandlerUPP(_carbon_event);
- OSStatus result = InstallWindowEventHandler (carbon_window, ehUPP,
- sizeof(windowEventTypes) / sizeof(EventTypeSpec),
- windowEventTypes, this, &carbon_event_handler);
- if (result != noErr) {
- return -1;
- }
+ SetWindowActivationScope (carbon_window, kWindowActivationScopeNone);
+
+ _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:cocoa_parent andTopLevelParent:win ];
[win addChildWindow:cocoa_parent ordered:NSWindowAbove];
+ [win setAutodisplay:1]; // turn of GTK stuff for this window
return 0;
+#else
+ return -1;
+#endif
}
int
AUPluginUI::parent_cocoa_window ()
{
NSWindow* win = get_nswindow ();
- NSRect packFrame;
if (!win) {
return -1;
}
- [win setAutodisplay:YES]; // turn of GTK stuff for this window
+ [win setAutodisplay:1]; // turn of GTK stuff for this window
Gtk::Container* toplevel = get_toplevel();
error << _("AUPluginUI: no top level window!") << endmsg;
return -1;
}
-
- // Get the size of the new AU View's frame
- packFrame = [au_view frame];
- NSView* view = gdk_quartz_window_get_nsview (low_box.get_window()->gobj());
-
+ NSView* view = gdk_quartz_window_get_nsview (get_toplevel()->get_window()->gobj());
+ GtkRequisition a = top_box.size_request ();
+
+ /* move the au_view down so that it doesn't overlap the top_box contents */
+
+ const int spacing = 6; // main vbox spacing
+ const int pad = 4; // box pad
+
+ NSPoint origin = { spacing + pad, static_cast<CGFloat> (a.height) + (2 * spacing) + pad };
- [view setFrame:packFrame];
- [view addSubview:packView];
+ [au_view setFrameOrigin:origin];
+ [view addSubview:au_view positioned:NSWindowBelow relativeTo:NULL];
- low_box.set_size_request (packFrame.size.width, packFrame.size.height);
+ last_au_frame = [au_view frame];
+
+ // watch for size changes of the view
+
+ _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ];
+
+ [[NSNotificationCenter defaultCenter] addObserver:_notify
+ selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
+ object:au_view];
return 0;
}
+void
+AUPluginUI::grab_focus()
+{
+ if (au_view) {
+ [au_view becomeFirstResponder];
+ }
+}
+void
+AUPluginUI::forward_key_event (GdkEventKey* ev)
+{
+ NSEvent* nsevent = gdk_quartz_event_get_nsevent ((GdkEvent*)ev);
+
+ if (au_view && nsevent) {
+
+ /* filter on nsevent type here because GDK massages FlagsChanged
+ messages into GDK_KEY_{PRESS,RELEASE} but Cocoa won't
+ handle a FlagsChanged message as a keyDown or keyUp
+ */
+
+ if ([nsevent type] == NSKeyDown) {
+ [[[au_view window] firstResponder] keyDown:nsevent];
+ } else if ([nsevent type] == NSKeyUp) {
+ [[[au_view window] firstResponder] keyUp:nsevent];
+ } else if ([nsevent type] == NSFlagsChanged) {
+ [[[au_view window] firstResponder] flagsChanged:nsevent];
+ }
+ }
+}
+
void
AUPluginUI::on_realize ()
{
NSWindow* win = get_nswindow ();
if (win) {
- [win setShowsResizeIndicator:NO];
+ [win setShowsResizeIndicator:0];
}
}
}
}
-void
-AUPluginUI::on_hide ()
-{
- // VBox::on_hide ();
- cerr << "AU plugin window hidden\n";
-}
-
bool
-AUPluginUI::on_map_event (GdkEventAny* ev)
+AUPluginUI::lower_box_visibility_notify (GdkEventVisibility* ev)
{
+#ifdef WITH_CARBON
+ if (carbon_window && ev->state != GDK_VISIBILITY_UNOBSCURED) {
+ ShowWindow (carbon_window);
+ ActivateWindow (carbon_window, TRUE);
+ return true;
+ }
+#endif
return false;
}
void
-AUPluginUI::on_show ()
+AUPluginUI::on_window_hide ()
{
- cerr << "AU plugin window shown\n";
+#ifdef WITH_CARBON
+ if (carbon_window) {
+ HideWindow (carbon_window);
+ ActivateWindow (carbon_window, FALSE);
+ }
+#endif
+ hide_all ();
+
+#if 0
+ NSArray* wins = [NSApp windows];
+ for (uint32_t i = 0; i < [wins count]; i++) {
+ id win = [wins objectAtIndex:i];
+ }
+#endif
+}
- VBox::on_show ();
+bool
+AUPluginUI::on_window_show (const string& /*title*/)
+{
+ /* this is idempotent so just call it every time we show the window */
gtk_widget_realize (GTK_WIDGET(low_box.gobj()));
- if (au_view) {
- show_all ();
- } else if (carbon_window) {
- [cocoa_parent setIsVisible:YES];
+ show_all ();
+
+#ifdef WITH_CARBON
+ if (carbon_window) {
ShowWindow (carbon_window);
+ ActivateWindow (carbon_window, TRUE);
}
+#endif
+
+ return true;
}
bool
-AUPluginUI::start_updating (GdkEventAny* any)
+AUPluginUI::start_updating (GdkEventAny*)
{
return false;
}
bool
-AUPluginUI::stop_updating (GdkEventAny* any)
+AUPluginUI::stop_updating (GdkEventAny*)
{
return false;
}
return aup;
}
-bool
-AUPluginUI::on_focus_in_event (GdkEventFocus* ev)
-{
- //cerr << "au plugin focus in\n";
- //Keyboard::magic_widget_grab_focus ();
- return false;
-}
-
-bool
-AUPluginUI::on_focus_out_event (GdkEventFocus* ev)
-{
- //cerr << "au plugin focus out\n";
- //Keyboard::magic_widget_drop_focus ();
- return false;
-}
projects / ardour.git / blobdiff