macosx: don't initiate a modal dialog during a modal session (close #7575)

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

diff --git a/modules/gui/macosx/VideoEffects.h b/modules/gui/macosx/VideoEffects.h
index 2239382007f9c52278ac09054814ce7f0ea5925e..1d8f4240eeee8c25b6655b586c08a4ea9aadf654 100644 (file)
--- a/modules/gui/macosx/VideoEffects.h
+++ b/modules/gui/macosx/VideoEffects.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VideoEffects.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2011 Felix Paul Kühne
+ * Copyright (C) 2011-2012 Felix Paul Kühne
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -29,6 +29,7 @@
     intf_thread_t *p_intf;
     IBOutlet id o_window;
     IBOutlet id o_tableView;
+    IBOutlet id o_profile_pop;
 
     /* basic */
     IBOutlet id o_adjust_ckb;
@@ -43,8 +44,7 @@
     IBOutlet id o_adjust_saturation_sld;
     IBOutlet id o_adjust_gamma_lbl;
     IBOutlet id o_adjust_gamma_sld;
-    IBOutlet id o_adjust_opaque_lbl;
-    IBOutlet id o_adjust_opaque_sld;
+    IBOutlet id o_adjust_reset_btn;
     IBOutlet id o_sharpen_ckb;
     IBOutlet id o_sharpen_lbl;
     IBOutlet id o_sharpen_sld;
@@ -58,12 +58,16 @@
     /* crop */
     IBOutlet id o_crop_top_lbl;
     IBOutlet id o_crop_top_fld;
+    IBOutlet id o_crop_top_stp;
     IBOutlet id o_crop_left_lbl;
     IBOutlet id o_crop_left_fld;
+    IBOutlet id o_crop_left_stp;
     IBOutlet id o_crop_right_lbl;
     IBOutlet id o_crop_right_fld;
+    IBOutlet id o_crop_right_stp;
     IBOutlet id o_crop_bottom_lbl;
     IBOutlet id o_crop_bottom_fld;
+    IBOutlet id o_crop_bottom_stp;
     IBOutlet id o_crop_sync_top_bottom_ckb;
     IBOutlet id o_crop_sync_left_right_ckb;
 
@@ -110,40 +114,36 @@
     IBOutlet id o_waves_ckb;
     IBOutlet id o_psychedelic_ckb;
 
-    /* video output & overlay */
-    IBOutlet id o_clone_ckb;
-    IBOutlet id o_clone_lbl;
-    IBOutlet id o_clone_fld;
+    /* misc */
     IBOutlet id o_addtext_ckb;
     IBOutlet id o_addtext_text_fld;
     IBOutlet id o_addtext_text_lbl;
     IBOutlet id o_addtext_pos_lbl;
     IBOutlet id o_addtext_pos_pop;
-
-    /* Logo */
     IBOutlet id o_addlogo_ckb;
     IBOutlet id o_addlogo_logo_lbl;
     IBOutlet id o_addlogo_logo_fld;
-    IBOutlet id o_addlogo_top_lbl;
-    IBOutlet id o_addlogo_top_fld;
-    IBOutlet id o_addlogo_left_lbl;
-    IBOutlet id o_addlogo_left_fld;
+    IBOutlet id o_addlogo_pos_lbl;
+    IBOutlet id o_addlogo_pos_pop;
     IBOutlet id o_addlogo_transparency_lbl;
     IBOutlet id o_addlogo_transparency_sld;
-    IBOutlet id o_eraselogo_ckb;
-    IBOutlet id o_eraselogo_mask_lbl;
-    IBOutlet id o_eraselogo_mask_fld;
-    IBOutlet id o_eraselogo_top_lbl;
-    IBOutlet id o_eraselogo_top_fld;
-    IBOutlet id o_eraselogo_left_lbl;
-    IBOutlet id o_eraselogo_left_fld;
+    IBOutlet id o_anaglyph_ckb;
 }
 
 /* generic */
 + (VLCVideoEffects *)sharedInstance;
-- (IBAction)toggleWindow:(id)sender;
 - (void)resetValues;
 - (void)setVideoFilter: (char *)psz_name on:(BOOL)b_on;
+- (void)setVideoFilterProperty: (char *)psz_name forFilter: (char*)psz_filter integer: (int)i_value;
+- (void)setVideoFilterProperty: (char *)psz_name forFilter: (char*)psz_filter float: (float)f_value;
+- (void)setVideoFilterProperty: (char *)psz_name forFilter: (char *)psz_filter string: (char *)psz_value;
+- (void)setVideoFilterProperty: (char *)psz_name forFilter: (char *)psz_filter boolean: (BOOL)b_value;
+
+- (IBAction)toggleWindow:(id)sender;
+- (IBAction)profileSelectorAction:(id)sender;
+- (IBAction)addProfile:(id)sender;
+- (IBAction)removeProfile:(id)sender;
+
 
 /* basic */
 - (IBAction)enableAdjust:(id)sender;
@@ -157,8 +157,7 @@
 - (IBAction)grainSliderChanged:(id)sender;
 
 /* crop */
-- (IBAction)cropFieldChanged:(id)sender;
-- (IBAction)enableCropModifier:(id)sender;
+- (IBAction)cropObjectChanged:(id)sender;
 
 /* geometry */
 - (IBAction)enableTransform:(id)sender;
@@ -187,15 +186,10 @@
 - (IBAction)enableWaves:(id)sender;
 - (IBAction)enablePsychedelic:(id)sender;
 
-/* video output & overlay */
-- (IBAction)enableClone:(id)sender;
-- (IBAction)cloneModifierChanged:(id)sender;
+/* miscellaneous */
 - (IBAction)enableAddText:(id)sender;
 - (IBAction)addTextModifierChanged:(id)sender;
-
-/* logo */
 - (IBAction)enableAddLogo:(id)sender;
 - (IBAction)addLogoModifierChanged:(id)sender;
-- (IBAction)enableEraseLogo:(id)sender;
-- (IBAction)eraseLogoModifierChanged:(id)sender;
-@end
\ No newline at end of file
+- (IBAction)enableAnaglyph:(id)sender;
+@end