Use var_Inherit* instead of var_CreateGet*.

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

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 1579799ee7167466eb7e824eb8a87a70bf787cbb..2c11578e6b4916fb0982b8963fe95b71e836a584 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -23,7 +23,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "intf.h"
-#import <vlc/vlc.h>
+#import <vlc_common.h>
 
 @interface VLCSimplePrefs : NSObject
 {
@@ -37,12 +37,13 @@
     IBOutlet id o_audio_lang_txt;
     IBOutlet id o_audio_last_box;
     IBOutlet id o_audio_last_ckb;
-    IBOutlet id o_audio_lastpwd_fld;
+    IBOutlet id o_audio_lastpwd_sfld;
     IBOutlet id o_audio_lastpwd_txt;
     IBOutlet id o_audio_lastuser_fld;
     IBOutlet id o_audio_lastuser_txt;
     IBOutlet id o_audio_norm_ckb;
     IBOutlet id o_audio_norm_fld;
+    IBOutlet id o_audio_norm_stepper;
     IBOutlet id o_audio_spdif_ckb;
     IBOutlet id o_audio_view;
     IBOutlet id o_audio_visual_pop;
@@ -63,36 +64,40 @@
     IBOutlet id o_hotkeys_listbox;
     IBOutlet id o_hotkeys_view;
 
-    IBOutlet id o_input_access_box;
     IBOutlet id o_input_avi_pop;
     IBOutlet id o_input_avi_txt;
-    IBOutlet id o_input_bandwidth_ckb;
     IBOutlet id o_input_cachelevel_pop;
     IBOutlet id o_input_cachelevel_txt;
+    IBOutlet id o_input_cachelevel_custom_txt;
     IBOutlet id o_input_caching_box;
-    IBOutlet id o_input_dump_ckb;
     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_postproc_fld;
     IBOutlet id o_input_postproc_txt;
-    IBOutlet id o_input_record_ckb;
     IBOutlet id o_input_rtsp_ckb;
+    IBOutlet id o_input_skipLoop_txt;
+    IBOutlet id o_input_skipLoop_pop;
     IBOutlet id o_input_serverport_fld;
     IBOutlet id o_input_serverport_txt;
-    IBOutlet id o_input_timeshift_ckb;
     IBOutlet id o_input_view;
 
     IBOutlet id o_intf_art_pop;
     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_mediakeys_bg_ckb;
     IBOutlet id o_intf_lang_pop;
     IBOutlet id o_intf_lang_txt;
-    IBOutlet id o_intf_meta_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_osd_encoding_pop;
     IBOutlet id o_osd_encoding_txt;
@@ -100,8 +105,6 @@
     IBOutlet id o_osd_font_btn;
     IBOutlet id o_osd_font_color_pop;
     IBOutlet id o_osd_font_color_txt;
-    IBOutlet id o_osd_font_effect_pop;
-    IBOutlet id o_osd_font_effect_txt;
     IBOutlet id o_osd_font_fld;
     IBOutlet id o_osd_font_size_pop;
     IBOutlet id o_osd_font_size_txt;
@@ -150,7 +153,6 @@
     BOOL b_hotkeyChanged;
     id o_currentlyShownCategoryView;
 
-    NSToolbar *o_sprefs_toolbar;
     NSOpenPanel *o_selectFolderPanel;
     NSArray *o_hotkeyDescriptions;
     NSArray *o_hotkeysNonUseableKeys;
@@ -194,7 +196,9 @@
 
 /* OSD / subtitles */
 - (IBAction)osdSettingChanged:(id)sender;
+- (IBAction)showFontPicker:(id)sender;
 - (void)showOSDSettings;
+- (void)changeFont:(id)sender;
 
 /* input & codecs */
 - (IBAction)inputSettingChanged:(id)sender;
@@ -203,14 +207,16 @@
 /* hotkeys */
 - (IBAction)hotkeySettingChanged:(id)sender;
 - (void)showHotkeySettings;
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
-- (void)changeHotkeyTo: (int)i_theNewKey;
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
+- (BOOL)changeHotkeyTo: (int)i_theNewKey;
 
 @end
 
 @interface VLCHotkeyChangeWindow : NSWindow
 
-- (void)keyDown:(NSEvent *)theEvent;
-
 @end
+
+@interface VLCSimplePrefsWindow : NSWindow
+
+@end
\ No newline at end of file