macosx: added skeleton for the video effects panel

Makefile.am

@@ -141,6 +141,8 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/AudioEffects.nib/keyedobjects.nib \
 	extras/package/macosx/Resources/English.lproj/SyncTracks.nib/designable.nib \
 	extras/package/macosx/Resources/English.lproj/SyncTracks.nib/keyedobjects.nib \
+	extras/package/macosx/Resources/English.lproj/VideoEffects.nib/designable.nib \
+	extras/package/macosx/Resources/English.lproj/VideoEffects.nib/keyedobjects.nib \
 	extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
 	extras/package/macosx/Resources/dsa_pub.pem \
 	extras/package/macosx/Resources/aiff.icns \

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -156,6 +156,7 @@
 		CC84FB2D130083BB00816D38 /* BGHUDAppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; };
 		CC84FB481300843200816D38 /* BGHUDAppKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; };
 		CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; };
+		CCC0C2AA13A285F700AC92B3 /* VideoEffects.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCC0C2A813A285F700AC92B3 /* VideoEffects.nib */; };
 		CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF11B520F8BFB520088542D /* ErrorPanel.nib */; };
 /* End PBXBuildFile section */
 
@@ -348,6 +349,7 @@
 		CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; };
 		CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; };
 		CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+		CCC0C2A913A285F700AC92B3 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/VideoEffects.nib; sourceTree = "<group>"; };
 		CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
 		CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
 		CCC895830D9A8A82005AE59C /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/access/eyetv.m; sourceTree = SOURCE_ROOT; };
@@ -379,6 +381,8 @@
 		CCCB86D80ACFDFB300CF1E10 /* fs_stop_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop_highlight.png; path = Resources/fs_stop_highlight.png; sourceTree = "<group>"; };
 		CCCB86D90ACFDFB300CF1E10 /* fs_stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop.png; path = Resources/fs_stop.png; sourceTree = "<group>"; };
 		CCCB86DA0ACFDFB300CF1E10 /* fs_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_background.png; path = Resources/fs_background.png; sourceTree = "<group>"; };
+		CCCE366D13817E4500694F2A /* VideoEffects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VideoEffects.h; path = ../../../modules/gui/macosx/VideoEffects.h; sourceTree = "<group>"; };
+		CCCE366E13817E4500694F2A /* VideoEffects.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VideoEffects.m; path = ../../../modules/gui/macosx/VideoEffects.m; sourceTree = "<group>"; };
 		CCD590F010E5B73200D39094 /* dialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogProvider.h; path = ../../../modules/gui/macosx_dialog_provider/dialogProvider.h; sourceTree = SOURCE_ROOT; };
 		CCD590F110E5B73200D39094 /* dialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = dialogProvider.m; path = ../../../modules/gui/macosx_dialog_provider/dialogProvider.m; sourceTree = SOURCE_ROOT; };
 		CCD590F210E5B76300D39094 /* VLCLoginPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLoginPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.h; sourceTree = SOURCE_ROOT; };
@@ -530,6 +534,8 @@
 				CC5560241365CDC800D54038 /* AudioEffects.m */,
 				CC707EC3137464CD0003010A /* TrackSynchronization.h */,
 				CC707EC4137464CD0003010A /* TrackSynchronization.m */,
+				CCCE366D13817E4500694F2A /* VideoEffects.h */,
+				CCCE366E13817E4500694F2A /* VideoEffects.m */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -805,6 +811,7 @@
 				DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
 				CC5560261365CE4800D54038 /* AudioEffects.nib */,
 				CC707EC6137474A50003010A /* SyncTracks.nib */,
+				CCC0C2A813A285F700AC92B3 /* VideoEffects.nib */,
 			);
 			name = nibs;
 			sourceTree = "<group>";
@@ -840,6 +847,7 @@
 			};
 			buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -1001,6 +1009,7 @@
 				CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */,
 				CC5560281365CE4800D54038 /* AudioEffects.nib in Resources */,
 				CC707EC8137474A50003010A /* SyncTracks.nib in Resources */,
+				CCC0C2AA13A285F700AC92B3 /* VideoEffects.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1031,6 +1040,14 @@
 			name = SyncTracks.nib;
 			sourceTree = "<group>";
 		};
+		CCC0C2A813A285F700AC92B3 /* VideoEffects.nib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CCC0C2A913A285F700AC92B3 /* English */,
+			);
+			name = VideoEffects.nib;
+			sourceTree = "<group>";
+		};
 		CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */ = {
 			isa = PBXVariantGroup;
 			children = (

modules/gui/macosx/Modules.am

@@ -47,6 +47,8 @@ SOURCES_macosx = \
 	AudioEffects.m \
 	TrackSynchronization.h \
 	TrackSynchronization.m \
+	VideoEffects.h \
+	VideoEffects.m \
 	bookmarks.h \
 	bookmarks.m \
 	embeddedwindow.h \

modules/gui/macosx/VideoEffects.h

+/*****************************************************************************
+ * VideoEffects.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2011 Felix Paul Kühne
+ * $Id$
+ *
+ * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface VLCVideoEffects : NSObject {
+    /* generic */
+    intf_thread_t *p_intf;
+    IBOutlet id o_window;
+
+    /* basic */
+    IBOutlet id o_adjust_ckb;
+    IBOutlet id o_adjust_hue_lbl;
+    IBOutlet id o_adjust_hue_sld;
+    IBOutlet id o_adjust_contrast_lbl;
+    IBOutlet id o_adjust_contrast_sld;
+    IBOutlet id o_adjust_brightness_lbl;
+    IBOutlet id o_adjust_brightness_sld;
+    IBOutlet id o_adjust_brightness_ckb;
+    IBOutlet id o_adjust_saturation_lbl;
+    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_sharpen_ckb;
+    IBOutlet id o_sharpen_lbl;
+    IBOutlet id o_sharpen_sld;
+    IBOutlet id o_banding_ckb;
+    IBOutlet id o_banding_lbl;
+    IBOutlet id o_banding_sld;
+    IBOutlet id o_grain_ckb;
+    IBOutlet id o_grain_sld;
+    IBOutlet id o_grain_lbl;
+
+    /* crop */
+    IBOutlet id o_crop_top_lbl;
+    IBOutlet id o_crop_top_fld;
+    IBOutlet id o_crop_left_lbl;
+    IBOutlet id o_crop_left_fld;
+    IBOutlet id o_crop_right_lbl;
+    IBOutlet id o_crop_right_fld;
+    IBOutlet id o_crop_bottom_lbl;
+    IBOutlet id o_crop_bottom_fld;
+    IBOutlet id o_crop_sync_top_bottom_ckb;
+    IBOutlet id o_crop_sync_left_right_ckb;
+
+    /* geometry */
+    IBOutlet id o_transform_ckb;
+    IBOutlet id o_transform_pop;
+    IBOutlet id o_zoom_ckb;
+    IBOutlet id o_puzzle_ckb;
+    IBOutlet id o_puzzle_rows_lbl;
+    IBOutlet id o_puzzle_rows_fld;
+    IBOutlet id o_puzzle_columns_lbl;
+    IBOutlet id o_puzzle_columns_fld;
+    IBOutlet id o_puzzle_blackslot_ckb;
+
+    /* color */
+    IBOutlet id o_threshold_ckb;
+    IBOutlet id o_threshold_color_lbl;
+    IBOutlet id o_threshold_color_fld;
+    IBOutlet id o_threshold_saturation_lbl;
+    IBOutlet id o_threshold_saturation_sld;
+    IBOutlet id o_threshold_similarity_lbl;
+    IBOutlet id o_threshold_similarity_sld;
+    IBOutlet id o_sepia_ckb;
+    IBOutlet id o_sepia_lbl;
+    IBOutlet id o_sepia_fld;
+    IBOutlet id o_noise_ckb;
+    IBOutlet id o_gradient_ckb;
+    IBOutlet id o_gradient_mode_lbl;
+    IBOutlet id o_gradient_mode_pop;
+    IBOutlet id o_gradient_color_ckb;
+    IBOutlet id o_gradient_cartoon_ckb;
+    IBOutlet id o_extract_ckb;
+    IBOutlet id o_extract_lbl;
+    IBOutlet id o_extract_fld;
+    IBOutlet id o_invert_ckb;
+    IBOutlet id o_posterize_ckb;
+    IBOutlet id o_posterize_lbl;
+    IBOutlet id o_posterize_fld;
+    IBOutlet id o_blur_ckb;
+    IBOutlet id o_blur_sld;
+    IBOutlet id o_blur_lbl;
+    IBOutlet id o_motiondetect_ckb;
+    IBOutlet id o_watereffect_ckb;
+    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;
+    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_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;
+}
+
+/* generic */
++ (VLCVideoEffects *)sharedInstance;
+
+/* basic */
+- (IBAction)enableAdjust:(id)sender;
+- (IBAction)adjustSliderChanged:(id)sender;
+- (IBAction)enableAdjustBrightnessThreshold:(id)sender;
+- (IBAction)enableSharpen:(id)sender;
+- (IBAction)sharpenSliderChanged:(id)sender;
+- (IBAction)enableBanding:(id)sender;
+- (IBAction)bandingSliderChanged:(id)sender;
+- (IBAction)enableGrain:(id)sender;
+- (IBAction)grainSliderChanged:(id)sender;
+
+/* crop */
+- (IBAction)cropFieldChanged:(id)sender;
+- (IBAction)enableCropModifier:(id)sender;
+
+/* geometry */
+- (IBAction)enableTransform:(id)sender;
+- (IBAction)transformModifierChanged:(id)sender;
+- (IBAction)enableZoom:(id)sender;
+- (IBAction)enablePuzzle:(id)sender;
+- (IBAction)puzzleModifierChanged:(id)sender;
+
+/* color */
+- (IBAction)enableThreshold:(id)sender;
+- (IBAction)thresholdModifierChanged:(id)sender;
+- (IBAction)enableSepia:(id)sender;
+- (IBAction)sepiaModifierChanged:(id)sender;
+- (IBAction)enableNoise:(id)sender;
+- (IBAction)enableGradient:(id)sender;
+- (IBAction)gradientModifierChanged:(id)sender;
+- (IBAction)enableExtract:(id)sender;
+- (IBAction)extractModifierChanged:(id)sender;
+- (IBAction)enableInvert:(id)sender;
+- (IBAction)enablePosterize:(id)sender;
+- (IBAction)posterizeModifierChanged:(id)sender;
+- (IBAction)enableBlur:(id)sender;
+- (IBAction)blurModifierChanged:(id)sender;
+- (IBAction)enableMotionDetect:(id)sender;
+- (IBAction)enableWaterEffect:(id)sender;
+- (IBAction)enableWaves:(id)sender;
+- (IBAction)enablePsychedelic:(id)sender;
+
+/* video output & overlay */
+- (IBAction)enableClone:(id)sender;
+- (IBAction)cloneModifierChanged:(id)sender;
+- (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

modules/gui/macosx/VideoEffects.m

+/*****************************************************************************
+ * VideoEffects.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2011 Felix Paul Kühne
+ * $Id$
+ *
+ * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "intf.h"
+#import <vlc_common.h>
+#import "VideoEffects.h"
+
+@implementation VLCVideoEffects
+static VLCVideoEffects *_o_sharedInstance = nil;
+
++ (VLCVideoEffects *)sharedInstance
+{
+    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+    if (_o_sharedInstance) {
+        [self dealloc];
+    } else {
+        p_intf = VLCIntf;
+        _o_sharedInstance = [super init];
+    }
+    
+    return _o_sharedInstance;
+}
+
+#pragma mark -
+#pragma mark basic
+- (IBAction)enableAdjust:(id)sender
+{
+}
+
+- (IBAction)adjustSliderChanged:(id)sender
+{
+}
+
+- (IBAction)enableAdjustBrightnessThreshold:(id)sender
+{
+}
+
+- (IBAction)enableSharpen:(id)sender
+{
+}
+
+- (IBAction)sharpenSliderChanged:(id)sender
+{
+}
+
+- (IBAction)enableBanding:(id)sender
+{
+}
+
+- (IBAction)bandingSliderChanged:(id)sender
+{
+}
+
+- (IBAction)enableGrain:(id)sender
+{
+}
+
+- (IBAction)grainSliderChanged:(id)sender
+{
+}
+
+
+#pragma mark -
+#pragma mark crop
+- (IBAction)cropFieldChanged:(id)sender
+{
+}
+
+- (IBAction)enableCropModifier:(id)sender
+{
+}
+
+
+#pragma mark -
+#pragma mark geometry
+- (IBAction)enableTransform:(id)sender
+{
+}
+
+- (IBAction)transformModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableZoom:(id)sender
+{
+}
+
+- (IBAction)enablePuzzle:(id)sender
+{
+}
+
+- (IBAction)puzzleModifierChanged:(id)sender
+{
+}
+
+
+#pragma mark -
+#pragma mark color
+- (IBAction)enableThreshold:(id)sender
+{
+}
+
+- (IBAction)thresholdModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableSepia:(id)sender
+{
+}
+
+- (IBAction)sepiaModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableNoise:(id)sender
+{
+}
+
+- (IBAction)enableGradient:(id)sender
+{
+}
+
+- (IBAction)gradientModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableExtract:(id)sender
+{
+}
+
+- (IBAction)extractModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableInvert:(id)sender
+{
+}
+
+- (IBAction)enablePosterize:(id)sender
+{
+}
+
+- (IBAction)posterizeModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableBlur:(id)sender
+{
+}
+
+- (IBAction)blurModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableMotionDetect:(id)sender
+{
+}
+
+- (IBAction)enableWaterEffect:(id)sender
+{
+}
+
+- (IBAction)enableWaves:(id)sender
+{
+}
+
+- (IBAction)enablePsychedelic:(id)sender
+{
+}
+
+
+#pragma mark -
+#pragma mark video output & overlay
+- (IBAction)enableClone:(id)sender
+{
+}
+
+- (IBAction)cloneModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableAddText:(id)sender
+{
+}
+
+- (IBAction)addTextModifierChanged:(id)sender
+{
+}
+
+
+#pragma mark -
+#pragma mark logo
+- (IBAction)enableAddLogo:(id)sender
+{
+}
+
+- (IBAction)addLogoModifierChanged:(id)sender
+{
+}
+
+- (IBAction)enableEraseLogo:(id)sender
+{
+}
+
+- (IBAction)eraseLogoModifierChanged:(id)sender
+{
+}
+
+
+@end
\ No newline at end of file