* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
+ * Pierre d'Herbemont <pdherbemont # videolan dot>
*
* 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
#import <vlc_common.h>
#import <vlc_plugin.h>
#import <vlc_dialog.h>
-#import <vlc_interface.h>
+#import <vlc_extensions.h>
+#import <vlc_modules.h>
-#import <Cocoa/Cocoa.h>
-#import "VLCLoginPanel.h"
-#import "VLCProgressPanel.h"
+#import "dialogProvider.h"
+#import "VLCUIWidgets.h"
/*****************************************************************************
* Prototypes
static int DisplayQuestion(vlc_object_t *,const char *,vlc_value_t,vlc_value_t,void * );
static int DisplayLogin(vlc_object_t *,const char *,vlc_value_t,vlc_value_t,void * );
static int DisplayProgressPanelAction(vlc_object_t *,const char *,vlc_value_t,vlc_value_t,void * );
+static int DisplayExtension(vlc_object_t *,const char *,vlc_value_t,vlc_value_t,void * );
static void updateProgressPanel (void *, const char *, float);
static bool checkProgressPanel (void *);
static void destroyProgressPanel (void *);
-@interface VLCDialogDisplayer : NSObject
-{
- VLCProgressPanel *_currentProgressBarPanel;
-}
-
-+ (NSDictionary *)dictionaryForDialog:(const char *)title :(const char *)message :(const char *)yes :(const char *)no :(const char *)cancel;
-
-- (void)displayError:(NSDictionary *)dialog;
-- (void)displayCritical:(NSDictionary *)dialog;
-- (NSNumber *)displayQuestion:(NSDictionary *)dialog;
-- (NSDictionary *)displayLogin:(NSDictionary *)dialog;
-
-- (void)displayProgressBar:(NSDictionary *)dict;
-- (void)updateProgressPanel:(NSDictionary *)dict;
-- (void)destroyProgressPanel;
-- (NSNumber *)checkProgressPanel;
-
-- (id)resultFromSelectorOnMainThread:(SEL)sel withObject:(id)object;
-@end
static inline NSDictionary *DictFromDialogFatal(dialog_fatal_t *dialog) {
return [VLCDialogDisplayer dictionaryForDialog:dialog->title :dialog->message :NULL :NULL :NULL];
vlc_module_begin()
/* Minimal interface. see intf.m */
set_shortname("Mac OS X Dialogs")
- add_shortcut("macosx_dialog_provider")
- add_shortcut("miosx")
+ add_shortcut("macosx_dialog_provider", "miosx")
set_description("Minimal Mac OS X Dialog Provider")
set_capability("interface", 0)
/* This setting is interesting, because when used with a libvlc app
* it's almost certain that the client program will display error by
- * itself. Moreover certain action might end up in an error, but
+ * itself. Moreover certain action might end up in an error, but
* the client wants to ignored them completely. */
add_bool(prefix "hide-no-user-action-dialogs", true, NULL, T_HIDE_NOACTION, LT_HIDE_NOACTION, false)
memset(p_intf->p_sys,0,sizeof(*p_intf->p_sys));
p_intf->p_sys->displayer = [[VLCDialogDisplayer alloc] init];
+ [p_intf->p_sys->displayer setIntf:p_intf];
bool hide = var_CreateGetBool(p_intf, prefix "hide-no-user-action-dialogs");
p_intf->p_sys->is_hidding_noaction_dialogs = hide;
/* subscribe to various interactive dialogues */
-
+
if (!hide)
{
var_Create(p_intf,"dialog-error",VLC_VAR_ADDRESS);
var_AddCallback(p_intf,"dialog-error",DisplayError,p_intf);
var_Create(p_intf,"dialog-critical",VLC_VAR_ADDRESS);
- var_AddCallback(p_intf,"dialog-critical",DisplayCritical,p_intf);
+ var_AddCallback(p_intf,"dialog-critical",DisplayCritical,p_intf);
}
var_Create(p_intf,"dialog-login",VLC_VAR_ADDRESS);
var_AddCallback(p_intf,"dialog-login",DisplayLogin,p_intf);
var_AddCallback(p_intf,"dialog-question",DisplayQuestion,p_intf);
var_Create(p_intf,"dialog-progress-bar",VLC_VAR_ADDRESS);
var_AddCallback(p_intf,"dialog-progress-bar",DisplayProgressPanelAction,p_intf);
+ var_Create(p_intf,"dialog-extension",VLC_VAR_ADDRESS);
+ var_AddCallback(p_intf,"dialog-extension",DisplayExtension,p_intf);
dialog_Register(p_intf);
+ /* subscribe to our last.fm announcements */
+ [[NSDistributedNotificationCenter defaultCenter] addObserver:p_intf->p_sys->displayer
+ selector:@selector(globalNotificationReceived:)
+ name:NULL
+ object:@"VLCLastFMSupport"
+ suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
+
msg_Dbg(p_intf,"Mac OS X dialog provider initialised");
-
+
return VLC_SUCCESS;
}
/* unsubscribe from the interactive dialogues */
dialog_Unregister(p_intf);
-
+
if (!p_intf->p_sys->is_hidding_noaction_dialogs)
{
var_DelCallback(p_intf,"dialog-error",DisplayError,p_intf);
var_DelCallback(p_intf,"dialog-login",DisplayLogin,p_intf);
var_DelCallback(p_intf,"dialog-question",DisplayQuestion,p_intf);
var_DelCallback(p_intf,"dialog-progress-bar",DisplayProgressPanelAction,p_intf);
-
+ var_DelCallback(p_intf,"dialog-extension",DisplayExtension,p_intf);
+
[p_intf->p_sys->displayer release];
msg_Dbg(p_intf,"Mac OS X dialog provider closed");
dialog_login_t *dialog = value.p_address;
intf_thread_t *p_intf = (intf_thread_t*) p_this;
intf_sys_t *sys = p_intf->p_sys;
- NSDictionary *dict = [sys->displayer resultFromSelectorOnMainThread:@selector(displayCritical:) withObject:DictFromDialogLogin(dialog)];
+ NSDictionary *dict = [sys->displayer resultFromSelectorOnMainThread:@selector(displayLogin:) withObject:DictFromDialogLogin(dialog)];
if (dict) {
*dialog->username = strdup([[dict objectForKey:@"username"] UTF8String]);
*dialog->password = strdup([[dict objectForKey:@"password"] UTF8String]);
intf_thread_t *p_intf = (intf_thread_t*) p_this;
intf_sys_t *sys = p_intf->p_sys;
- [sys->displayer performSelectorOnMainThread:@selector(displayProgressBar) withObject:DictFromDialogProgressBar(dialog) waitUntilDone:YES];
+ [sys->displayer performSelectorOnMainThread:@selector(displayProgressBar:) withObject:DictFromDialogProgressBar(dialog) waitUntilDone:YES];
dialog->pf_update = updateProgressPanel;
dialog->pf_check = checkProgressPanel;
return VLC_SUCCESS;
}
+static int DisplayExtension(vlc_object_t *p_this, const char *type, vlc_value_t previous, vlc_value_t value, void *data)
+{
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ intf_sys_t *sys = p_intf->p_sys;
+ extension_dialog_t *dialog = value.p_address;
+
+ // -updateExtensionDialog: Open its own runloop, so be sure to run on DefaultRunLoop.
+ [sys->displayer performSelectorOnMainThread:@selector(updateExtensionDialog:) withObject:[NSValue valueWithPointer:dialog] waitUntilDone:YES];
+ [pool release];
+ return VLC_SUCCESS;
+}
+
+
void updateProgressPanel (void *priv, const char *text, float value)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[NSNumber numberWithFloat:value], @"value",
text ? [NSString stringWithUTF8String:text] : nil, @"text",
nil];
-
- [sys->displayer performSelectorOnMainThread:@selector(updateProgressPanel) withObject:dict waitUntilDone:YES];
+
+ [sys->displayer performSelectorOnMainThread:@selector(updateProgressPanel:) withObject:dict waitUntilDone:YES];
[pool release];
}
intf_sys_t *sys = (intf_sys_t *)priv;
[sys->displayer performSelectorOnMainThread:@selector(destroyProgressPanel) withObject:nil waitUntilDone:YES];
-
+
[pool release];
}
@implementation VLCDialogDisplayer
- (void)dealloc
{
+ [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
assert(!_currentProgressBarPanel); // This has to be closed on main thread.
[super dealloc];
}
+- (void)setIntf: (intf_thread_t *)p_mainintf
+{
+ p_intf = p_mainintf;
+}
+
+- (intf_thread_t *)intf
+{
+ return p_intf;
+}
+
+ (NSDictionary *)dictionaryForDialog:(const char *)title :(const char *)message :(const char *)yes :(const char *)no :(const char *)cancel
{
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
[dict setObject:[NSString stringWithUTF8String:no] forKey:@"no"];
if (cancel)
[dict setObject:[NSString stringWithUTF8String:cancel] forKey:@"cancel"];
-
+
return dict;
}
#define VLCAssertIsMainThread() assert([NSThread isMainThread])
- (void)displayError:(NSDictionary *)dialog
{
VLCAssertIsMainThread();
-
+
NSRunInformationalAlertPanel([dialog objectForKey:@"title"],
[dialog objectForKey:@"message"],
@"OK", nil, nil);
- (void)displayCritical:(NSDictionary *)dialog
{
VLCAssertIsMainThread();
-
+
NSRunCriticalAlertPanel([dialog objectForKey:@"title"],
[dialog objectForKey:@"message"],
@"OK", nil, nil);
- (NSNumber *)displayQuestion:(NSDictionary *)dialog
{
VLCAssertIsMainThread();
-
+
NSInteger alertRet = 0;
-
+
NSAlert *alert = [NSAlert alertWithMessageText:[dialog objectForKey:@"title"]
defaultButton:[dialog objectForKey:@"yes"]
- alternateButton:[dialog objectForKey:@"no"]
+ alternateButton:[dialog objectForKey:@"no"]
otherButton:[dialog objectForKey:@"cancel"]
informativeTextWithFormat:[dialog objectForKey:@"message"]];
[alert setAlertStyle:NSInformationalAlertStyle];
[panel center];
NSInteger ret = [NSApp runModalForWindow:panel];
[panel close];
-
+
if (!ret)
return nil;
-
+
return [NSDictionary dictionaryWithObjectsAndKeys:
[panel userName], @"username",
[panel password], @"password",
_currentProgressBarPanel = [[VLCProgressPanel alloc] init];
[_currentProgressBarPanel createContentView];
[_currentProgressBarPanel setDialogTitle:[dialog objectForKey:@"title"]];
- [_currentProgressBarPanel setDialogMessage:[dialog objectForKey:@"message"]];
+ [_currentProgressBarPanel setDialogMessage:[dialog objectForKey:@"message"] ?: @""];
[_currentProgressBarPanel setCancelButtonLabel:[dialog objectForKey:@"cancel"]];
[_currentProgressBarPanel center];
- (NSNumber *)checkProgressPanel
{
VLCAssertIsMainThread();
-
+
return [NSNumber numberWithBool:[_currentProgressBarPanel isCancelled]];
}
+#pragma mark -
+#pragma mark Last.FM support
+- (void)globalNotificationReceived: (NSNotification *)theNotification
+{
+ NSLog(@"globalNotificationReceived");
+ NSDictionary *userData = [theNotification userInfo];
+ BOOL lastFMEnabled = [[userData objectForKey:@"enabled"] intValue];
+ NSString *lastFMUsername = [userData objectForKey:@"username"];
+ NSString *lastFMPassword = [userData objectForKey:@"password"];
+
+ if (module_exists("audioscrobbler")) {
+ if (lastFMEnabled)
+ config_AddIntf(p_intf, "audioscrobbler");
+ else
+ config_RemoveIntf(p_intf, "audioscrobbler");
+
+ config_PutPsz(p_intf, "lastfm-username", [lastFMUsername UTF8String]);
+ config_PutPsz(p_intf, "lastfm-password", [lastFMPassword UTF8String]);
+ config_SaveConfigFile(p_intf, "main");
+ config_SaveConfigFile(p_intf, "audioscrobbler");
+ }
+ else
+ msg_Err(p_intf,"Last.FM module not found, no action");
+}
+
+#pragma mark -
+#pragma mark Extensions Dialog
+
+- (void)triggerClick:(id)sender
+{
+ assert([sender isKindOfClass:[VLCDialogButton class]]);
+ VLCDialogButton *button = sender;
+ extension_widget_t *widget = [button widget];
+
+ NSLog(@"(triggerClick)");
+ vlc_mutex_lock(&widget->p_dialog->lock);
+ extension_WidgetClicked(widget->p_dialog, widget);
+ vlc_mutex_unlock(&widget->p_dialog->lock);
+}
+
+- (void)syncTextField:(NSNotification *)notifcation
+{
+ id sender = [notifcation object];
+ assert([sender isKindOfClass:[VLCDialogTextField class]]);
+ VLCDialogTextField *field = sender;
+ extension_widget_t *widget = [field widget];
+
+ vlc_mutex_lock(&widget->p_dialog->lock);
+ free(widget->psz_text);
+ widget->psz_text = strdup([[field stringValue] UTF8String]);
+ vlc_mutex_unlock(&widget->p_dialog->lock);
+}
+
+- (void)tableViewSelectionDidChange:(NSNotification *)notifcation
+{
+ id sender = [notifcation object];
+ assert(sender && [sender isKindOfClass:[VLCDialogList class]]);
+ VLCDialogList *list = sender;
+
+ struct extension_widget_value_t *value;
+ unsigned i = 0;
+ for(value = [list widget]->p_values; value != NULL; value = value->p_next, i++)
+ value->b_selected = (i == [list selectedRow]);
+}
+
+- (void)popUpSelectionChanged:(id)sender
+{
+ assert([sender isKindOfClass:[VLCDialogPopUpButton class]]);
+ VLCDialogPopUpButton *popup = sender;
+ struct extension_widget_value_t *value;
+ unsigned i = 0;
+ for(value = [popup widget]->p_values; value != NULL; value = value->p_next, i++)
+ value->b_selected = (i == [popup indexOfSelectedItem]);
+
+}
+
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize
+{
+ NSView *contentView = [sender contentView];
+ assert([contentView isKindOfClass:[VLCDialogGridView class]]);
+ VLCDialogGridView *gridView = (VLCDialogGridView *)contentView;
+
+ NSRect rect = NSMakeRect(0, 0, 0, 0);
+ rect.size = frameSize;
+ rect = [sender contentRectForFrameRect:rect];
+ rect.size = [gridView flexSize:rect.size];
+ rect = [sender frameRectForContentRect:rect];
+ return rect.size;
+}
+
+- (BOOL)windowShouldClose:(id)sender
+{
+ assert([sender isKindOfClass:[VLCDialogWindow class]]);
+ VLCDialogWindow *window = sender;
+ extension_dialog_t *dialog = [window dialog];
+ extension_DialogClosed(dialog);
+ dialog->p_sys_intf = NULL;
+ return YES;
+}
+
+static NSView *createControlFromWidget(extension_widget_t *widget, id self)
+{
+ assert(!widget->p_sys_intf);
+
+ switch (widget->type)
+ {
+ case EXTENSION_WIDGET_HTML:
+ {
+// NSScrollView *scrollView = [[NSScrollView alloc] init];
+// [scrollView setHasVerticalScroller:YES];
+// NSTextView *field = [[NSTextView alloc] init];
+// [scrollView setDocumentView:field];
+// [scrollView setAutoresizesSubviews:YES];
+// [scrollView setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
+// [field release];
+// return scrollView;
+ NSTextView *field = [[NSTextView alloc] init];
+ [field setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
+ [field setDrawsBackground:NO];
+ return field;
+ }
+ case EXTENSION_WIDGET_LABEL:
+ {
+ NSTextField *field = [[NSTextField alloc] init];
+ [field setEditable:NO];
+ [field setBordered:NO];
+ [field setDrawsBackground:NO];
+ [field setFont:[NSFont systemFontOfSize:0]];
+ [[field cell] setControlSize:NSRegularControlSize];
+ [field setAutoresizingMask:NSViewNotSizable];
+ return field;
+ }
+ case EXTENSION_WIDGET_TEXT_FIELD:
+ {
+ VLCDialogTextField *field = [[VLCDialogTextField alloc] init];
+ [field setWidget:widget];
+ [field setAutoresizingMask:NSViewWidthSizable];
+ [field setFont:[NSFont systemFontOfSize:0]];
+ [[field cell] setControlSize:NSRegularControlSize];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncTextField:) name:NSControlTextDidChangeNotification object:field];
+ return field;
+ }
+ case EXTENSION_WIDGET_BUTTON:
+ {
+ VLCDialogButton *button = [[VLCDialogButton alloc] init];
+ [button setBezelStyle:NSRoundedBezelStyle];
+ [button setWidget:widget];
+ [button setAction:@selector(triggerClick:)];
+ [button setTarget:self];
+ [[button cell] setControlSize:NSRegularControlSize];
+ [button setAutoresizingMask:NSViewNotSizable];
+ return button;
+ }
+ case EXTENSION_WIDGET_DROPDOWN:
+ {
+ VLCDialogPopUpButton *popup = [[VLCDialogPopUpButton alloc] init];
+ [popup setAction:@selector(popUpSelectionChanged:)];
+ [popup setTarget:self];
+ [popup setWidget:widget];
+ return popup;
+ }
+ case EXTENSION_WIDGET_LIST:
+ {
+ NSScrollView *scrollView = [[NSScrollView alloc] init];
+ [scrollView setHasVerticalScroller:YES];
+ VLCDialogList *list = [[VLCDialogList alloc] init];
+ [list setUsesAlternatingRowBackgroundColors:YES];
+ [list setHeaderView:nil];
+ [scrollView setDocumentView:list];
+ [scrollView setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
+
+ NSTableColumn *column = [[NSTableColumn alloc] init];
+ [list addTableColumn:column];
+ [column release];
+ [list setDataSource:list];
+ [list setDelegate:self];
+ [list setWidget:widget];
+ [list release];
+ return scrollView;
+ }
+ case EXTENSION_WIDGET_IMAGE:
+ {
+ NSImageView *imageView = [[NSImageView alloc] init];
+ [imageView setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
+ [imageView setImageFrameStyle:NSImageFramePhoto];
+ [imageView setImageScaling:NSImageScaleProportionallyUpOrDown];
+ return imageView;
+ }
+ default:
+ assert(0);
+ return nil;
+ }
+
+}
+
+static void updateControlFromWidget(NSView *control, extension_widget_t *widget, id self)
+{
+ switch (widget->type)
+ {
+ case EXTENSION_WIDGET_HTML:
+// {
+// // Get the scroll view
+// assert([control isKindOfClass:[NSScrollView class]]);
+// NSScrollView *scrollView = (NSScrollView *)control;
+// control = [scrollView documentView];
+//
+// assert([control isKindOfClass:[NSTextView class]]);
+// NSTextView *textView = (NSTextView *)control;
+// NSString *string = [NSString stringWithUTF8String:widget->psz_text];
+// NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding:NSUTF8StringEncoding] documentAttributes:NULL];
+// [[textView textStorage] setAttributedString:[[NSAttributedString alloc] initWithString:@"Hello"]];
+// NSLog(@"%@", string);
+// [textView setNeedsDisplay:YES];
+// [textView scrollRangeToVisible:NSMakeRange(0, 0)];
+// [attrString release];
+// break;
+//
+// }
+ {
+ assert([control isKindOfClass:[NSTextView class]]);
+ NSTextView *textView = (NSTextView *)control;
+ NSString *string = [NSString stringWithUTF8String:widget->psz_text];
+ NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding:NSUTF8StringEncoding] documentAttributes:NULL];
+ [[textView textStorage] setAttributedString:attrString];
+ [textView setNeedsDisplay:YES];
+ [textView scrollRangeToVisible:NSMakeRange(0, 0)];
+ [attrString release];
+ break;
+
+ }
+ case EXTENSION_WIDGET_LABEL:
+ case EXTENSION_WIDGET_PASSWORD:
+ case EXTENSION_WIDGET_TEXT_FIELD:
+ {
+ if (!widget->psz_text)
+ break;
+ assert([control isKindOfClass:[NSControl class]]);
+ NSControl *field = (NSControl *)control;
+ NSString *string = [NSString stringWithUTF8String:widget->psz_text];
+ NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding:NSUTF8StringEncoding] documentAttributes:NULL];
+ [field setAttributedStringValue:attrString];
+ [attrString release];
+ break;
+ }
+ case EXTENSION_WIDGET_BUTTON:
+ {
+ assert([control isKindOfClass:[NSButton class]]);
+ NSButton *button = (NSButton *)control;
+ if (!widget->psz_text)
+ break;
+ [button setTitle:[NSString stringWithUTF8String:widget->psz_text]];
+ break;
+ }
+ case EXTENSION_WIDGET_DROPDOWN:
+ {
+ assert([control isKindOfClass:[NSPopUpButton class]]);
+ NSPopUpButton *popup = (NSPopUpButton *)control;
+ [popup removeAllItems];
+ struct extension_widget_value_t *value;
+ for(value = widget->p_values; value != NULL; value = value->p_next)
+ {
+ [popup addItemWithTitle:[NSString stringWithUTF8String:value->psz_text]];
+ }
+ [popup synchronizeTitleAndSelectedItem];
+ [self popUpSelectionChanged:popup];
+ break;
+ }
+
+ case EXTENSION_WIDGET_LIST:
+ {
+ assert([control isKindOfClass:[NSScrollView class]]);
+ NSScrollView *scrollView = (NSScrollView *)control;
+ assert([[scrollView documentView] isKindOfClass:[VLCDialogList class]]);
+ VLCDialogList *list = (VLCDialogList *)[scrollView documentView];
+
+ NSMutableArray *contentArray = [NSMutableArray array];
+ struct extension_widget_value_t *value;
+ for(value = widget->p_values; value != NULL; value = value->p_next)
+ {
+ NSDictionary *entry = [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithInt:value->i_id], @"id",
+ [NSString stringWithUTF8String:value->psz_text], @"text",
+ nil];
+ [contentArray addObject:entry];
+ }
+ list.contentArray = contentArray;
+ [list reloadData];
+ break;
+ }
+ case EXTENSION_WIDGET_IMAGE:
+ {
+ assert([control isKindOfClass:[NSImageView class]]);
+ NSImageView *imageView = (NSImageView *)control;
+ NSString *string = widget->psz_text ? [NSString stringWithUTF8String:widget->psz_text] : nil;
+ NSImage *image = nil;
+ NSLog(@"Setting image to %@", string);
+ if (string)
+ image = [[NSImage alloc] initWithContentsOfURL:[NSURL fileURLWithPath:string]];
+ [imageView setImage:image];
+ [image release];
+ break;
+ }
+ }
+
+}
+
+- (void)updateWidgets:(extension_dialog_t *)dialog
+{
+ extension_widget_t *widget;
+ NSWindow *window = dialog->p_sys_intf;
+ FOREACH_ARRAY(widget, dialog->widgets)
+ {
+ if (!widget)
+ continue; /* Some widgets may be NULL at this point */
+
+ BOOL shouldDestroy = widget->b_kill;
+ NSView *control = widget->p_sys_intf;
+ BOOL update = widget->b_update;
+
+
+ if (!control && !shouldDestroy)
+ {
+ control = createControlFromWidget(widget, self);
+ updateControlFromWidget(control, widget, self);
+ widget->p_sys_intf = control;
+ update = YES; // Force update and repositionning
+ [control setHidden:widget->b_hide];
+ }
+
+ if (update && !shouldDestroy)
+ {
+ updateControlFromWidget(control, widget, self);
+ [control setHidden:widget->b_hide];
+
+ int row = widget->i_row - 1;
+ int col = widget->i_column - 1;
+ int hsp = __MAX( 1, widget->i_horiz_span );
+ int vsp = __MAX( 1, widget->i_vert_span );
+ if( row < 0 )
+ {
+ row = 4;
+ col = 0;
+ }
+
+ VLCDialogGridView *gridView = (VLCDialogGridView *)[window contentView];
+ [gridView addSubview:control atRow:row column:col rowSpan:vsp colSpan:hsp];
+
+ //this->resize( sizeHint() );
+ widget->b_update = false;
+ }
+
+ if (shouldDestroy)
+ {
+ VLCDialogGridView *gridView = (VLCDialogGridView *)[window contentView];
+ [gridView removeSubview:control];
+ [control release];
+ widget->p_sys_intf = NULL;
+ }
+ }
+ FOREACH_END()
+}
+
+- (void)updateExtensionDialog:(NSValue *)extensionDialog
+{
+ extension_dialog_t *dialog = [extensionDialog pointerValue];
+
+ vlc_mutex_lock(&dialog->lock);
+
+ NSSize size = NSMakeSize(dialog->i_width, dialog->i_height);
+
+ BOOL shouldDestroy = dialog->b_kill;
+
+ if (!dialog->i_width || !dialog->i_height)
+ size = NSMakeSize(640, 480);
+
+ VLCDialogWindow *window = dialog->p_sys_intf;
+ if (!window && !shouldDestroy)
+ {
+ NSRect content = NSMakeRect(0, 0, 1, 1);
+ window = [[VLCDialogWindow alloc] initWithContentRect:content styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask backing:NSBackingStoreBuffered defer:NO];
+ [window setDelegate:self];
+ [window setDialog:dialog];
+ [window setTitle:[NSString stringWithUTF8String:dialog->psz_title]];
+ VLCDialogGridView *gridView = [[VLCDialogGridView alloc] init];
+ [gridView setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
+ [window setContentView:gridView];
+ [gridView release];
+ dialog->p_sys_intf = window;
+ }
+
+ [self updateWidgets:dialog];
+
+ if (shouldDestroy)
+ {
+ [window setDelegate:nil];
+ [window close];
+ dialog->p_sys_intf = NULL;
+ window = nil;
+ }
+
+ if (![window isVisible]) {
+ [window center];
+ [window makeKeyAndOrderFront:self];
+ }
+
+ vlc_cond_signal(&dialog->cond);
+ vlc_mutex_unlock(&dialog->lock);
+}
+
/**
* Helper to execute a function on main thread and get its return value.
- (void)execute:(NSDictionary *)dict
{
SEL sel = [[dict objectForKey:@"sel"] pointerValue];
- id * result = [[dict objectForKey:@"result"] pointerValue];
+ id *result = [[dict objectForKey:@"result"] pointerValue];
id object = [dict objectForKey:@"object"];
+
+ NSAssert(sel, @"Try to execute a NULL selector");
+
*result = [self performSelector:sel withObject:object];
[*result retain]; // Balanced in -resultFromSelectorOnMainThread
}
- (id)resultFromSelectorOnMainThread:(SEL)sel withObject:(id)object
{
id result = nil;
- [NSDictionary dictionaryWithObjectsAndKeys:
+ NSAssert(sel, @"Try to execute a NULL selector");
+ NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
[NSValue valueWithPointer:sel], @"sel",
[NSValue valueWithPointer:&result], @"result",
object, @"object", nil];
- [self performSelectorOnMainThread:@selector(execute:) withObject:object waitUntilDone:YES];
+ [self performSelectorOnMainThread:@selector(execute:) withObject:dict waitUntilDone:YES];
return [result autorelease];
}
@end
-
-
+
+
projects / vlc / blobdiff