X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fsimple_prefs.h;h=a55b174a406d30400c734449b92ba538b688b654;hb=03c911f3425c95d5a0e8dfb7f73dfda7ceca5e37;hp=817801cad078e4ab3dd2b0675b7ca0d3804d5971;hpb=cff6fc15e4ddc8e31ddd2d7584c7d96ff74c19b0;p=vlc

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 817801cad0..a55b174a40 100644
--- 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-2012 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
@@ -77,6 +77,7 @@
     IBOutlet id o_input_httpproxypwd_txt;
     IBOutlet id o_input_mux_box;
     IBOutlet id o_input_net_box;
+    IBOutlet id o_input_avcodec_hw_ckb;
     IBOutlet id o_input_postproc_fld;
     IBOutlet id o_input_postproc_txt;
     IBOutlet id o_input_rtsp_ckb;
@@ -92,12 +93,9 @@
     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;
@@ -123,8 +121,11 @@ IBOutlet id o_intf_mediakeys_ckb;
     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;
@@ -142,6 +143,7 @@ IBOutlet id o_intf_mediakeys_ckb;
     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;
@@ -155,6 +157,11 @@ IBOutlet id o_intf_mediakeys_ckb;
     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;
 
     BOOL b_audioSettingChanged;
@@ -175,11 +182,10 @@ IBOutlet id o_intf_mediakeys_ckb;
     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;
@@ -187,9 +193,10 @@ IBOutlet id o_intf_mediakeys_ckb;
 - (void)initStrings;
 - (void)resetControls;
 - (void)showSimplePrefs;
+- (void)showSimplePrefsWithLevel:(NSInteger)i_window_level;
 
 - (IBAction)buttonAction:(id)sender;
-- (void)sheetDidEnd:(NSWindow *)o_sheet 
+- (void)sheetDidEnd:(NSWindow *)o_sheet
          returnCode:(int)i_return
         contextInfo:(void *)o_context;
 
@@ -232,4 +239,4 @@ IBOutlet id o_intf_mediakeys_ckb;
 
 @interface VLCSimplePrefsWindow : NSWindow
 
-@end
\ No newline at end of file
+@end