macosx: Fix a memleak.

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

diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h
index 66ec61b9f995f705e0047885efb60899f7536f8f..4524d3ba872008395ffb9348996aaf4a000a4bd3 100644 (file)
--- a/modules/gui/macosx/extended.h
+++ b/modules/gui/macosx/extended.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * extended.h: MacOS X Extended interface panel
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2007 the VideoLAN team
  * $Id$
  *
- * Authors: Felix Kühne <fkuehne@users.sf.net>
+ * Authors: Felix Paul Kühne <fkuehne@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,36 +77,30 @@
     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)adjImg_Enbl:(id)sender;
-- (IBAction)adjImg_rstrDefaults:(id)sender;
-- (IBAction)adjImg_sliders:(id)sender;
-- (IBAction)adjImg_opaque:(id)sender;
-- (IBAction)audFtls_hdphnVirt:(id)sender;
-- (IBAction)audFtls_maxLevelSld:(id)sender;
-- (IBAction)audFtls_vlmeNorm:(id)sender;
-- (IBAction)extWin_exp_adjImg:(id)sender;
-- (IBAction)extWin_exp_audFlts:(id)sender;
-- (IBAction)extWin_exp_vidFlts:(id)sender;
-- (IBAction)vidFlts:(id)sender;
-- (IBAction)vidFlts_mrInfo:(id)sender;
+- (IBAction)viewSelectorAction:(id)sender;
+- (IBAction)enableAdjustImage:(id)sender;
+- (IBAction)restoreDefaultsForAdjustImage:(id)sender;
+- (IBAction)sliderActionAdjustImage:(id)sender;
+- (IBAction)opaqueSliderAction:(id)sender;
+- (IBAction)enableHeadphoneVirtualizer:(id)sender;
+- (IBAction)sliderActionMaximumAudioLevel:(id)sender;
+- (IBAction)enableVolumeNormalization:(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