macosx: robustify media key trap handling

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

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 6ea1c877f9b8499a40ffaf914ca2141d91859836..1f044d52815065b2a5105fe4101d9a4adc5827db 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-2013 VLC authors and VideoLAN
+* Copyright (C) 2008-2014 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
@@ -25,7 +25,7 @@
 #import "intf.h"
 #import <vlc_common.h>
 
-@interface VLCSimplePrefs : NSObject <NSToolbarDelegate>
+@interface VLCSimplePrefs : NSObject <NSToolbarDelegate, NSWindowDelegate>
 {
     IBOutlet id o_audio_dolby_pop;
     IBOutlet id o_audio_dolby_txt;
@@ -84,11 +84,12 @@
     IBOutlet id o_input_urlhandler_btn;
     IBOutlet id o_input_view;
 
+    IBOutlet id o_intf_language_pop;
+    IBOutlet id o_intf_language_txt;
     IBOutlet id o_intf_style_txt;
     IBOutlet id o_intf_style_dark_bcell;
     IBOutlet id o_intf_style_bright_bcell;
-    IBOutlet id o_intf_art_pop;
-    IBOutlet id o_intf_art_txt;
+    IBOutlet id o_intf_art_ckb;
     IBOutlet id o_intf_embedded_ckb;
     IBOutlet id o_intf_fspanel_ckb;
     IBOutlet id o_intf_appleremote_ckb;
@@ -102,6 +103,13 @@
     IBOutlet id o_intf_nativefullscreen_ckb;
     IBOutlet id o_intf_autoresize_ckb;
     IBOutlet id o_intf_pauseminimized_ckb;
+    IBOutlet id o_intf_luahttp_box;
+    IBOutlet id o_intf_luahttppwd_lbl;
+    IBOutlet id o_intf_luahttppwd_fld;
+    IBOutlet id o_intf_pauseitunes_lbl;
+    IBOutlet id o_intf_pauseitunes_pop;
+    IBOutlet id o_intf_continueplayback_lbl;
+    IBOutlet id o_intf_continueplayback_pop;
 
     IBOutlet id o_osd_encoding_pop;
     IBOutlet id o_osd_encoding_txt;
@@ -143,8 +151,6 @@
     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;
     IBOutlet id o_video_skipFrames_ckb;
     IBOutlet id o_video_snap_box;
     IBOutlet id o_video_snap_folder_btn;
@@ -208,6 +214,7 @@
 - (void)showSimplePrefsWithLevel:(NSInteger)i_window_level;
 
 - (IBAction)buttonAction:(id)sender;
+- (IBAction)resetPreferences:(id)sender;
 - (void)sheetDidEnd:(NSWindow *)o_sheet
          returnCode:(int)i_return
         contextInfo:(void *)o_context;