Revert "macosx: clean code of objectAtIndex"

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

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index e361147a9b8d4088e17da483ed639b870aa7ffa4..d457e9be8375ab978c3f9768ea7154df6339c208 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.h: Open dialogues for VLC's MacOS X port
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -24,13 +24,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#define kVLCMediaAudioCD @"AudioCD"
+#define kVLCMediaDVD @"DVD"
+#define kVLCMediaVCD @"VCD"
+#define kVLCMediaSVCD @"SVCD"
+#define kVLCMediaBD @"Blu-ray"
+#define kVLCMediaVideoTSFolder @"VIDEO_TS"
+#define kVLCMediaBDMVFolder @"BDMV"
+#define kVLCMediaUnknown @"Unknown"
+
 /*****************************************************************************
  * Intf_Open interface
  *****************************************************************************/
 @interface VLCOpen : NSObject
 {
-    IBOutlet id o_playlist;
-
     IBOutlet id o_panel;
 
     IBOutlet id o_mrl_fld;
@@ -58,6 +65,11 @@
     IBOutlet id o_file_slave_icon_well;
     IBOutlet id o_file_subtitles_filename_lbl;
     IBOutlet id o_file_subtitles_icon_well;
+    IBOutlet id o_file_custom_timing_ckb;
+    IBOutlet id o_file_starttime_fld;
+    IBOutlet id o_file_starttime_lbl;
+    IBOutlet id o_file_stoptime_fld;
+    IBOutlet id o_file_stoptime_lbl;
 
     /* open disc */
     IBOutlet id o_disc_selector_pop;
@@ -136,7 +148,9 @@
     IBOutlet id o_file_sub_ckbox;
     IBOutlet id o_file_sub_btn_settings;
     IBOutlet id o_file_sub_sheet;
-    IBOutlet id o_file_sub_path;
+    IBOutlet id o_file_sub_path_lbl;
+    IBOutlet id o_file_sub_path_fld;
+    IBOutlet id o_file_sub_icon_view;
     IBOutlet id o_file_sub_btn_browse;
     IBOutlet id o_file_sub_override;
     IBOutlet id o_file_sub_delay;
@@ -181,6 +195,8 @@
     IBOutlet id o_screen_fps_fld;
     IBOutlet id o_screen_fps_lbl;
     IBOutlet id o_screen_fps_stp;
+    IBOutlet id o_screen_screen_lbl;
+    IBOutlet id o_screen_screen_pop;
     IBOutlet id o_screen_left_fld;
     IBOutlet id o_screen_left_lbl;
     IBOutlet id o_screen_left_stp;
@@ -194,12 +210,15 @@
     IBOutlet id o_screen_height_lbl;
     IBOutlet id o_screen_height_stp;
     IBOutlet id o_screen_follow_mouse_ckb;
+    IBOutlet id o_screen_qtk_audio_pop;
+    IBOutlet id o_screen_qtk_audio_ckb;
 
     /* QTK support */
     IBOutlet id o_qtk_view;
-    IBOutlet id o_qtk_long_lbl;
-    IBOutlet id o_qtk_device_pop;
-    IBOutlet id o_qtk_label_view;
+    IBOutlet id o_qtk_video_device_pop;
+    IBOutlet id o_qtk_video_ckb;
+    IBOutlet id o_qtk_audio_device_pop;
+    IBOutlet id o_qtk_audio_ckb;
     IBOutlet id o_capture_width_lbl;
     IBOutlet id o_capture_width_fld;
     IBOutlet id o_capture_width_stp;
@@ -208,28 +227,33 @@
     IBOutlet id o_capture_height_stp;
 
     NSArray         *qtkvideoDevices;
+    NSArray         *qtkaudioDevices;
     NSString        *qtk_currdevice_uid;
+    NSString        *qtkaudio_currdevice_uid;
 
     BOOL b_autoplay;
     BOOL b_nodvdmenus;
     id o_currentOpticalMediaView;
     id o_currentOpticalMediaIconView;
-    NSMutableArray *o_opticalDevices;
+    NSMutableArray *o_allMediaDevices;
+    NSArray *o_opticalDevices;
     NSMutableArray *o_specialMediaFolders;
     NSString *o_file_path;
     id o_currentCaptureView;
     NSString *o_file_slave_path;
+    NSString *o_sub_path;
     NSString *o_mrl;
-    intf_thread_t * p_intf;
+    NSMutableArray *o_displayInfos;
 }
 
 + (VLCOpen *)sharedInstance;
 
-- (void)setMRL:(NSString *)mrl;
-- (NSString *)MRL;
+@property (readwrite, assign) NSString *MRL;
+@property (readonly) NSArray *qtkvideoDevices;
+@property (readonly) NSArray *qtkaudioDevices;
 
-- (NSArray *)qtkvideoDevices;
-- (void)qtkrefreshDevices;
+- (void)qtkrefreshVideoDevices;
+- (void)qtkrefreshAudioDevices;
 
 - (void)setSubPanel;
 - (void)openTarget:(int)i_type;
@@ -237,11 +261,11 @@
 - (void)textFieldWasClicked:(NSNotification *)o_notification;
 - (IBAction)expandMRLfieldAction:(id)sender;
 - (IBAction)inputSlaveAction:(id)sender;
+- (IBAction)fileTimeCustomization:(id)sender;
 
 - (void)openFileGeneric;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
 - (IBAction)openFileBrowse:(id)sender;
-- (void)pathChosenInPanel: (NSOpenPanel *)sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo;
 - (IBAction)openFileStreamChanged:(id)sender;
 
 - (void)openDisc;
@@ -250,6 +274,8 @@
 - (IBAction)openSpecialMediaFolder:(id)sender;
 - (IBAction)dvdreadOptionChanged:(id)sender;
 - (IBAction)vcdOptionChanged:(id)sender;
+- (NSString *)getVolumeTypeFromMountPath:(NSString *)mountPath;
+- (NSString *)getBSDNodeFromMountPath:(NSString *)mountPath;
 
 - (void)openNet;
 - (IBAction)openNetModeChanged:(id)sender;
@@ -261,12 +287,14 @@
 - (void)showCaptureView: theView;
 - (IBAction)openCaptureModeChanged:(id)sender;
 - (IBAction)qtkChanged:(id)sender;
+- (IBAction)qtkAudioChanged:(id)sender;
+- (IBAction)qtkToggleUIElements:(id)sender;
+- (IBAction)screenChanged:(id)sender;
 - (IBAction)eyetvSwitchChannel:(id)sender;
 - (IBAction)eyetvLaunch:(id)sender;
 - (IBAction)eyetvGetPlugin:(id)sender;
 - (void)eyetvChanged:(NSNotification *)o_notification;
 - (void)setupChannelInfo;
-- (IBAction)screenStepperChanged:(id)sender;
 - (void)screenFPSfieldChanged:(NSNotification *)o_notification;
 
 - (IBAction)subsChanged:(id)sender;
@@ -284,7 +312,5 @@
 @end
 
 @interface VLCOpenTextField : NSTextField
-{
-}
 - (void)mouseDown:(NSEvent *)theEvent;
 @end