macosx: fixed playlist/video toggling and some memory leaks

[vlc] / modules / gui / macosx / coredialogs.h

diff --git a/modules/gui/macosx/coredialogs.h b/modules/gui/macosx/coredialogs.h
index 882d87a2b2f1bf9a0faaf02be35450ef8674c819..ea3829c0b9d602949af2d2bd63f866cc25c6214d 100644 (file)
--- a/modules/gui/macosx/coredialogs.h
+++ b/modules/gui/macosx/coredialogs.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * interaction.h: Mac OS X interaction dialogs
+ * coredialogs.h: Mac OS X Core Dialogs
  *****************************************************************************
  * Copyright (C) 2005-2009 the VideoLAN team
  * $Id$
@@ -40,7 +40,7 @@
     NSMutableArray * o_errors;
     NSMutableArray * o_icons;
     
-    BOOL nib_loaded;
+    BOOL b_nib_loaded;
 }
 - (IBAction)cleanupTable:(id)sender;
 - (IBAction)showMessages:(id)sender;
@@ -50,7 +50,6 @@
 
 @end
 
-
 /*****************************************************************************
  * VLCCoreDialogProvider interface
  *****************************************************************************/
@@ -70,22 +69,30 @@
     IBOutlet id o_auth_win;
 
     /* progress dialogue */
-    IBOutlet id o_prog_bar;
+    IBOutlet NSProgressIndicator * o_prog_bar;
     IBOutlet id o_prog_cancel_btn;
-    IBOutlet id o_prog_description;
-    IBOutlet id o_prog_title;
+    IBOutlet id o_prog_description_txt;
+    IBOutlet id o_prog_title_txt;
     IBOutlet id o_prog_win;
-    IBOutlet id o_prog_timeToGo;
+    BOOL b_progress_cancelled;
 }
 + (VLCCoreDialogProvider *)sharedInstance;
 
--(void)performDialogEvent: (NSNotification *)o_notification;
+-(void)performEventWithObject: (NSValue *)o_value ofType: (const char*)type;
 
 -(void)showFatalDialog: (NSValue *)o_value;
+-(void)showFatalWaitDialog: (NSValue *)o_value;
 -(void)showQuestionDialog: (NSValue *)o_value;
+
 -(void)showLoginDialog: (NSValue *)o_value;
 -(IBAction)loginDialogAction:(id)sender;
 
--(id)getErrorPanel;
+-(void)showProgressDialog: (NSValue *)o_value;
+-(IBAction)progDialogAction:(id)sender;
+-(BOOL)progressCancelled;
+-(void)updateProgressPanelWithText: (NSString *)string andNumber: (double)d_number;
+-(void)destroyProgressPanel;
 
-@end
\ No newline at end of file
+-(id)errorPanel;
+
+@end