Charset fixes

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

diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h
index 04d912c2b11806f4cf301869d9956e6a9269c3de..4524d3ba872008395ffb9348996aaf4a000a4bd3 100644 (file)
--- a/modules/gui/macosx/extended.h
+++ b/modules/gui/macosx/extended.h
@@ -22,11 +22,12 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * VLCExtended 
+ * VLCExtended
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
-#import <vlc/vlc.h>
+#import "intf.h"
+#import <vlc_common.h>
 
 @interface VLCExtended : NSObject
 {
@@ -35,20 +36,11 @@
     IBOutlet id o_audioFlts_view;
     IBOutlet id o_videoFilters_view;
     IBOutlet id o_extended_window;
-    
+
     /* window content */
-    IBOutlet id o_expBtn_adjustImage;
-    IBOutlet id o_expBtn_audioFlts;
-    IBOutlet id o_expBtn_videoFlts;
-    IBOutlet id o_lbl_audioFlts;
-    IBOutlet id o_lbl_videoFlts;
-    IBOutlet id o_lbl_adjustImage;
-    IBOutlet id o_lbl_video;
-    IBOutlet id o_lbl_audio;
-    IBOutlet id o_box_vidFlts;
-    IBOutlet id o_box_audFlts;
-    IBOutlet id o_box_adjImg;
-    
+    IBOutlet id o_selector_pop;
+    IBOutlet id o_top_controls_box;
+
     /* video filters */
     IBOutlet id o_btn_vidFlts_mrInfo;
     IBOutlet id o_ckb_blur;
@@ -63,13 +55,13 @@
     IBOutlet id o_ckb_gradient;
     IBOutlet id o_lbl_general;
     IBOutlet id o_lbl_distort;
-    
+
     /* audio filters */
     IBOutlet id o_ckb_vlme_norm;
     IBOutlet id o_ckb_hdphnVirt;
     IBOutlet id o_lbl_maxLevel;
     IBOutlet id o_sld_maxLevel;
-    
+
     /* adjust image */
     IBOutlet id o_btn_rstrDefaults;
     IBOutlet id o_ckb_enblAdjustImg;
@@ -85,15 +77,13 @@
     IBOutlet id o_sld_hue;
     IBOutlet id o_sld_saturation;
     IBOutlet id o_sld_opaque;
-    
+
     /* global variables */
-    BOOL o_adjImg_expanded;
-    BOOL o_audFlts_expanded;
-    BOOL o_vidFlts_expanded;
-    
+    NSView * o_currentlyshown_view;
     BOOL o_config_changed;
 }
 
+- (IBAction)viewSelectorAction:(id)sender;
 - (IBAction)enableAdjustImage:(id)sender;
 - (IBAction)restoreDefaultsForAdjustImage:(id)sender;
 - (IBAction)sliderActionAdjustImage:(id)sender;
@@ -101,20 +91,16 @@
 - (IBAction)enableHeadphoneVirtualizer:(id)sender;
 - (IBAction)sliderActionMaximumAudioLevel:(id)sender;
 - (IBAction)enableVolumeNormalization:(id)sender;
-- (IBAction)expandAdjustImage:(id)sender;
-- (IBAction)expandAudioFilters:(id)sender;
-- (IBAction)expandVideoFilters:(id)sender;
 - (IBAction)videoFilterAction:(id)sender;
 - (IBAction)moreInfoVideoFilters:(id)sender;
 
 + (VLCExtended *)sharedInstance;
 - (BOOL)getConfigChanged;
-- (void)collapsAll;
 
 - (void)showPanel;
 - (void)initStrings;
-- (void)changeVoutFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
-- (void)changeVideoFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
-- (void)changeAFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
+- (void)changeVoutFiltersString: (char *)psz_name onOrOff: (bool )b_add;
+- (void)changeVideoFiltersString: (char *)psz_name onOrOff: (bool )b_add;
+- (void)changeAFiltersString: (char *)psz_name onOrOff: (bool )b_add;
 - (void)savePrefs;
 @end