Revert "macosx: clean code of objectAtIndex"

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

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 358ef97343cb8a07479da420b88f6c5630ca0db6..120b0bda1731edf12141c2487658edbcc177025b 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * simple_prefs.h: Simple Preferences for Mac OS X
 *****************************************************************************
-* Copyright (C) 2008-2011 VLC authors and VideoLAN
+* Copyright (C) 2008-2013 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
@@ -46,7 +46,9 @@
     IBOutlet id o_audio_visual_txt;
     IBOutlet id o_audio_vol_fld;
     IBOutlet id o_audio_vol_sld;
-    IBOutlet id o_audio_vol_txt;
+    IBOutlet id o_audio_autosavevol_matrix;
+    IBOutlet id o_audio_autosavevol_yes_bcell;
+    IBOutlet id o_audio_autosavevol_no_bcell;
 
     IBOutlet id o_hotkeys_change_btn;
     IBOutlet id o_hotkeys_change_lbl;
@@ -69,18 +71,17 @@
     IBOutlet id o_input_cachelevel_txt;
     IBOutlet id o_input_cachelevel_custom_txt;
     IBOutlet id o_input_caching_box;
-    IBOutlet id o_input_httpproxy_fld;
-    IBOutlet id o_input_httpproxy_txt;
-    IBOutlet id o_input_httpproxypwd_sfld;
-    IBOutlet id o_input_httpproxypwd_txt;
     IBOutlet id o_input_mux_box;
     IBOutlet id o_input_net_box;
+    IBOutlet id o_input_avcodec_hw_txt;
+    IBOutlet id o_input_avcodec_hw_pop;
     IBOutlet id o_input_postproc_fld;
     IBOutlet id o_input_postproc_txt;
     IBOutlet id o_input_rtsp_ckb;
     IBOutlet id o_input_skipLoop_txt;
     IBOutlet id o_input_skipLoop_pop;
     IBOutlet id o_input_mkv_preload_dir_ckb;
+    IBOutlet id o_input_urlhandler_btn;
     IBOutlet id o_input_view;
 
     IBOutlet id o_intf_style_txt;
@@ -90,16 +91,17 @@
     IBOutlet id o_intf_art_txt;
     IBOutlet id o_intf_embedded_ckb;
     IBOutlet id o_intf_fspanel_ckb;
-       IBOutlet id o_intf_appleremote_ckb;
-       IBOutlet id o_intf_mediakeys_ckb;
-    IBOutlet id o_intf_lang_pop;
-    IBOutlet id o_intf_lang_txt;
+    IBOutlet id o_intf_appleremote_ckb;
+    IBOutlet id o_intf_appleremote_sysvol_ckb;
+    IBOutlet id o_intf_mediakeys_ckb;
     IBOutlet id o_intf_network_box;
     IBOutlet id o_intf_view;
     IBOutlet id o_intf_update_ckb;
     IBOutlet id o_intf_last_update_lbl;
     IBOutlet id o_intf_enableGrowl_ckb;
     IBOutlet id o_intf_nativefullscreen_ckb;
+    IBOutlet id o_intf_autoresize_ckb;
+    IBOutlet id o_intf_pauseminimized_ckb;
 
     IBOutlet id o_osd_encoding_pop;
     IBOutlet id o_osd_encoding_txt;
@@ -117,8 +119,11 @@
     IBOutlet id o_osd_opacity_txt;
     IBOutlet id o_osd_opacity_fld;
     IBOutlet id o_osd_opacity_sld;
+    IBOutlet id o_osd_outline_color_pop;
+    IBOutlet id o_osd_outline_color_txt;
+    IBOutlet id o_osd_outline_thickness_pop;
+    IBOutlet id o_osd_outline_thickness_txt;
     IBOutlet id o_osd_forcebold_ckb;
-    IBOutlet id o_osd_moreoptions_txt;
     IBOutlet id o_osd_osd_box;
     IBOutlet id o_osd_osd_ckb;
     IBOutlet id o_osd_view;
@@ -136,6 +141,7 @@
     IBOutlet id o_video_display_box;
     IBOutlet id o_video_enable_ckb;
     IBOutlet id o_video_fullscreen_ckb;
+    IBOutlet id o_video_videodeco_ckb;
     IBOutlet id o_video_onTop_ckb;
     IBOutlet id o_video_output_pop;
     IBOutlet id o_video_output_txt;
@@ -149,8 +155,27 @@
     IBOutlet id o_video_snap_prefix_fld;
     IBOutlet id o_video_snap_prefix_txt;
     IBOutlet id o_video_snap_seqnum_ckb;
+    IBOutlet id o_video_deinterlace_txt;
+    IBOutlet id o_video_deinterlace_pop;
+    IBOutlet id o_video_deinterlace_mode_txt;
+    IBOutlet id o_video_deinterlace_mode_pop;
+    IBOutlet id o_video_video_box;
     IBOutlet id o_video_view;
 
+    IBOutlet id o_urlhandler_title_txt;
+    IBOutlet id o_urlhandler_subtitle_txt;
+    IBOutlet id o_urlhandler_save_btn;
+    IBOutlet id o_urlhandler_cancel_btn;
+    IBOutlet id o_urlhandler_ftp_pop;
+    IBOutlet id o_urlhandler_mms_pop;
+    IBOutlet id o_urlhandler_rtmp_pop;
+    IBOutlet id o_urlhandler_rtp_pop;
+    IBOutlet id o_urlhandler_rtsp_pop;
+    IBOutlet id o_urlhandler_sftp_pop;
+    IBOutlet id o_urlhandler_smb_pop;
+    IBOutlet id o_urlhandler_udp_pop;
+    IBOutlet id o_urlhandler_win;
+
     BOOL b_audioSettingChanged;
     BOOL b_intfSettingChanged;
     BOOL b_videoSettingChanged;
@@ -169,11 +194,10 @@
     intf_thread_t *p_intf;
 }
 + (VLCSimplePrefs *)sharedInstance;
-- (NSString *)OSXStringKeyToString:(NSString *)theString;
 
 /* toolbar */
-- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar 
-      itemForItemIdentifier: (NSString *)o_itemIdent 
+- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar
+      itemForItemIdentifier: (NSString *)o_itemIdent
   willBeInsertedIntoToolbar: (BOOL)b_willBeInserted;
 - (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar;
 - (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar;
@@ -181,9 +205,11 @@
 - (void)initStrings;
 - (void)resetControls;
 - (void)showSimplePrefs;
+- (void)showSimplePrefsWithLevel:(NSInteger)i_window_level;
 
 - (IBAction)buttonAction:(id)sender;
-- (void)sheetDidEnd:(NSWindow *)o_sheet 
+- (IBAction)resetPreferences:(id)sender;
+- (void)sheetDidEnd:(NSWindow *)o_sheet
          returnCode:(int)i_return
         contextInfo:(void *)o_context;
 
@@ -210,6 +236,7 @@
 /* input & codecs */
 - (IBAction)inputSettingChanged:(id)sender;
 - (void)showInputSettings;
+- (IBAction)urlHandlerAction:(id)sender;
 
 /* hotkeys */
 - (IBAction)hotkeySettingChanged:(id)sender;
@@ -226,4 +253,4 @@
 
 @interface VLCSimplePrefsWindow : NSWindow
 
-@end
\ No newline at end of file
+@end