All: equalizer window for MacOS. Need a bit of corrections for the presets part.

Reviews welcome

Makefile.am

@@ -193,6 +193,8 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/display.png \
 	extras/MacOSX/Resources/display_slider.png \
 	extras/MacOSX/Resources/display_track.png \
+	extras/MacOSX/Resources/equalizerdrawer_active.png \
+	extras/MacOSX/Resources/equalizerdrawer_blue.png \
 	extras/MacOSX/Resources/fullscreen_active.png \
 	extras/MacOSX/Resources/fullscreen_blue.png \
 	extras/MacOSX/Resources/next_active.png \
@@ -478,6 +480,8 @@ VLC.app: vlc
 	    applescript.m \
 	    controls.h \
 	    controls.m \
+	    equalizer.h \
+	    equalizer.m \
 	    intf.h \
 	    intf.m \
 	    macosx.m \

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -51,6 +51,37 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
+        {
+            ACTIONS = {
+                bandSliderUpdated = id; 
+                changePreset = id; 
+                enable = id; 
+                preampSliderUpdated = id; 
+                toggleWindow = id; 
+                twopass = id; 
+            }; 
+            CLASS = VLCEqualizer; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_btn_2pass" = id; 
+                "o_btn_enable" = id; 
+                "o_btn_equalizer" = id; 
+                "o_popup_presets" = id; 
+                "o_slider_band1" = id; 
+                "o_slider_band10" = id; 
+                "o_slider_band2" = id; 
+                "o_slider_band3" = id; 
+                "o_slider_band4" = id; 
+                "o_slider_band5" = id; 
+                "o_slider_band6" = id; 
+                "o_slider_band7" = id; 
+                "o_slider_band8" = id; 
+                "o_slider_band9" = id; 
+                "o_slider_preamp" = id; 
+                "o_window" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
         {
             ACTIONS = {
                 createOutlineGroup = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>571 224 505 517 0 0 1024 746 </string>
+	<string>793 27 505 517 0 0 1280 1002 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
-		<string>542 480 104 149 0 0 1024 746 </string>
+		<string>693 686 104 149 0 0 1280 1002 </string>
 		<key>29</key>
-		<string>366 655 419 44 0 0 1024 746 </string>
+		<string>521 894 419 44 0 0 1280 1002 </string>
 		<key>915</key>
 		<string>54 452 185 199 0 0 1024 746 </string>
 	</dict>
@@ -21,9 +21,11 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>1617</integer>
 		<integer>21</integer>
+		<integer>1647</integer>
 		<integer>29</integer>
-		<integer>1617</integer>
+		<integer>2029</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>7H63</string>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -7,15 +7,12 @@
 	objects = {
 		014CEA410018CDE011CA2923 = {
 			explicitFileType = wrapper.cfbundle;
-			fallbackIsa = PBXFileReference;
-			isa = PBXBundleReference;
+			isa = PBXFileReference;
 			path = VLC.bundle;
 			refType = 3;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		014CEA420018CDE011CA2923 = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -29,8 +26,6 @@
 			name = Development;
 		};
 		014CEA430018CDE011CA2923 = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -87,8 +82,7 @@
 			sourceTree = "<group>";
 		};
 		089C1672FE841209C02AAC07 = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = Foundation.framework;
 			path = /System/Library/Frameworks/Foundation.framework;
@@ -717,6 +711,10 @@
 				8E9390CD0565D6D300C7661C,
 				8E49720206417F6800370C9F,
 				8E49720306417F6800370C9F,
+				2A16E04106C4F08700C87B09,
+				2A16E04206C4F08700C87B09,
+				2A16E08006C5074F00C87B09,
+				2A16E08106C5074F00C87B09,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -758,8 +756,7 @@
 			sourceTree = "<group>";
 		};
 		089C167FFE841241C02AAC07 = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = AppKit.framework;
 			path = /System/Library/Frameworks/AppKit.framework;
@@ -792,6 +789,8 @@
 				8E55FB800459B0FD00FB3317,
 				8ED6C28703E2EB1C0059A3A7,
 				8ED6C28803E2EB1C0059A3A7,
+				2A16E03F06C4F08700C87B09,
+				2A16E04006C4F08700C87B09,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -818,8 +817,7 @@
 			sourceTree = "<group>";
 		};
 		1058C7ADFEA557BF11CA2CBB = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = Cocoa.framework;
 			path = /System/Library/Frameworks/Cocoa.framework;
@@ -866,6 +864,74 @@
 //192
 //193
 //194
+//2A0
+//2A1
+//2A2
+//2A3
+//2A4
+		2A16E03F06C4F08700C87B09 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = equalizer.h;
+			path = "/Users/djc/src/videolan/vlc-trunk/modules/gui/macosx/equalizer.h";
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		2A16E04006C4F08700C87B09 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			name = equalizer.m;
+			path = "/Users/djc/src/videolan/vlc-trunk/modules/gui/macosx/equalizer.m";
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		2A16E04106C4F08700C87B09 = {
+			fileRef = 2A16E03F06C4F08700C87B09;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2A16E04206C4F08700C87B09 = {
+			fileRef = 2A16E04006C4F08700C87B09;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2A16E07E06C5074F00C87B09 = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.png;
+			name = equalizerdrawer_active.png;
+			path = Resources/equalizerdrawer_active.png;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		2A16E07F06C5074F00C87B09 = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.png;
+			name = equalizerdrawer_blue.png;
+			path = Resources/equalizerdrawer_blue.png;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		2A16E08006C5074F00C87B09 = {
+			fileRef = 2A16E07E06C5074F00C87B09;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2A16E08106C5074F00C87B09 = {
+			fileRef = 2A16E07F06C5074F00C87B09;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//2A0
+//2A1
+//2A2
+//2A3
+//2A4
 //8E0
 //8E1
 //8E2
@@ -1710,6 +1776,8 @@
 		};
 		8ECA7E520563CD9500DFC000 = {
 			children = (
+				2A16E07E06C5074F00C87B09,
+				2A16E07F06C5074F00C87B09,
 				8E93909A0565D6D300C7661C,
 				8E93909B0565D6D300C7661C,
 				8E93909C0565D6D300C7661C,

modules/gui/macosx/Modules.am

@@ -5,6 +5,8 @@ SOURCES_macosx = \
 	applescript.m \
 	controls.h \
 	controls.m \
+	equalizer.m \
+	equalizer.h \
 	intf.m \
 	intf.h \
 	macosx.m \

modules/gui/macosx/equalizer.h

+/*****************************************************************************
+ * equalizer.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id: equalizer.h 1 2004-08-07 23:51:00Z djc $
+ *
+ * Authors: Jrme Decoodt <djc@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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * VLCEqualizer interface 
+ *****************************************************************************/
+@interface VLCEqualizer : NSObject
+{
+    IBOutlet id o_btn_2pass;
+    IBOutlet id o_btn_enable;
+    IBOutlet id o_btn_equalizer;
+    IBOutlet id o_popup_presets;
+    IBOutlet id o_slider_band1;
+    IBOutlet id o_slider_band10;
+    IBOutlet id o_slider_band2;
+    IBOutlet id o_slider_band3;
+    IBOutlet id o_slider_band4;
+    IBOutlet id o_slider_band5;
+    IBOutlet id o_slider_band6;
+    IBOutlet id o_slider_band7;
+    IBOutlet id o_slider_band8;
+    IBOutlet id o_slider_band9;
+    IBOutlet id o_slider_preamp;
+    IBOutlet id o_window;
+}
+- (IBAction)bandSliderUpdated:(id)sender;
+- (IBAction)changePreset:(id)sender;
+- (IBAction)enable:(id)sender;
+- (IBAction)preampSliderUpdated:(id)sender;
+- (IBAction)toggleWindow:(id)sender;
+- (IBAction)twopass:(id)sender;
+@end