-#include <gtkmm/stock.h>
-
#undef Marker
#define Marker FuckYouAppleAndYourLackOfNameSpaces
+#include <gtkmm/button.h>
+#include <gdk/gdkquartz.h>
+
#include "pbd/convert.h"
#include "pbd/error.h"
#undef check // stupid gtk, stupid apple
-#include <gtkmm/button.h>
-#include <gdk/gdkquartz.h>
-
#include <gtkmm2ext/utils.h>
#include "au_pluginui.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
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cocoaParentActivationHandler:)
name:NSWindowDidBecomeMainNotification
- object:nil];
+ object:NULL];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cocoaParentBecameKeyHandler:)
name:NSWindowDidBecomeKeyNotification
- object:nil];
+ object:NULL];
}
}
}
}
-- (void)auViewResized:(NSNotification *)notification;
+- (void)auViewResized:(NSNotification *)notification
{
(void) notification; // stop complaints about unusued argument
plugin_ui->cocoa_view_resized();
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);
top_box.show ();
low_box.show ();
- _activating_from_app = false;
cocoa_parent = 0;
- _notify = 0;
cocoa_window = 0;
- carbon_window = 0;
+
+#ifdef WITH_CARBON
+ _activating_from_app = false;
+ _notify = 0;
au_view = 0;
editView = 0;
+ carbon_window = 0;
+#endif
/* prefer cocoa, fall back to cocoa, but use carbon if its there */
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 ()
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;
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle));
- if (viewBundle == nil) {
+ if (viewBundle == NULL) {
error << _("AUPluginUI: error loading AU view's bundle") << endmsg;
return -1;
} else {
}
// make a factory
id factory = [[[factoryClass alloc] init] autorelease];
- if (factory == nil) {
+ if (factory == NULL) {
error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg;
return -1;
}
free (cocoaViewInfo);
}
- wasAbleToLoadCustomView = YES;
+ wasAbleToLoadCustomView = true;
}
}
au->get_au()));
au_view = [[AUGenericView alloc] initWithAudioUnit:*au->get_au()];
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("view created @ %1\n", au_view));
- [(AUGenericView *)au_view setShowsExpertParameters:YES];
+ [(AUGenericView *)au_view setShowsExpertParameters:1];
}
// 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 ()
{
- GtkRequisition topsize = top_box.size_request ();
NSWindow* window = get_nswindow ();
- NSSize oldContentSize= [window contentRectForFrameRect:[window frame]].size;
- NSSize newContentSize= [au_view frame].size;
NSRect windowFrame= [window frame];
-
- oldContentSize.height -= topsize.height;
+ NSRect new_frame = [au_view frame];
- float dy = oldContentSize.height - newContentSize.height;
- float dx = oldContentSize.width - newContentSize.width;
+ 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;
NSUInteger old_auto_resize = [au_view autoresizingMask];
[au_view setAutoresizingMask:NSViewNotSizable];
- [window setFrame:windowFrame display:YES];
+ [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
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;
#ifdef WITH_CARBON
ActivateWindow (carbon_window, TRUE);
#endif
- // [cocoa_parent makeKeyAndOrderFront:nil];
}
void
_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;
}
- [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();
/* move the au_view down so that it doesn't overlap the top_box contents */
- NSPoint origin = { 0, a.height };
+ 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 };
[au_view setFrameOrigin:origin];
- [view addSubview:au_view positioned:NSWindowBelow relativeTo:nil];
+ [view addSubview:au_view positioned:NSWindowBelow relativeTo:NULL];
+
+ last_au_frame = [au_view frame];
// watch for size changes of the view
- _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:nil andTopLevelParent:win ];
+ _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ];
[[NSNotificationCenter defaultCenter] addObserver:_notify
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
return 0;
}
-static void
-dump_view_tree (NSView* view, int depth)
+void
+AUPluginUI::grab_focus()
{
- NSArray* subviews = [view subviews];
- unsigned long cnt = [subviews count];
-
- for (int d = 0; d < depth; d++) {
- cerr << '\t';
- }
- cerr << " view @ " << view << endl;
-
- for (unsigned long i = 0; i < cnt; ++i) {
- NSView* subview = [subviews objectAtIndex:i];
- dump_view_tree (subview, depth+1);
+ if (au_view) {
+ [au_view becomeFirstResponder];
}
}
-
void
AUPluginUI::forward_key_event (GdkEventKey* ev)
{
NSWindow* win = get_nswindow ();
if (win) {
- [win setShowsResizeIndicator:NO];
+ [win setShowsResizeIndicator:0];
}
}
}
bool
-AUPluginUI::on_map_event (GdkEventAny*)
+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;
}
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
}
bool
return aup;
}
-bool
-AUPluginUI::on_focus_in_event (GdkEventFocus*)
-{
- //cerr << "au plugin focus in\n";
- //Keyboard::magic_widget_grab_focus ();
- return false;
-}
-
-bool
-AUPluginUI::on_focus_out_event (GdkEventFocus*)
-{
- //cerr << "au plugin focus out\n";
- //Keyboard::magic_widget_drop_focus ();
- return false;
-}
projects / ardour.git / blobdiff