Skip to content

V
vlc
Commit 9e904e66 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx/video effects: remove object instance from xib file and further reduce the exposed class API

parent d53743bf
Hide whitespace changes
Inline Side-by-side
Showing with 2606 additions and 10897 deletions
extras/package/macosx/Resources/English.lproj/VideoEffects.xib
View file @ 9e904e66
This source diff could not be displayed because it is too large. You can view the blob instead.
modules/gui/macosx/MainMenu.m
View file @ 9e904e66
...@@ -1131,7 +1131,7 @@ ...@@ -1131,7 +1131,7 @@
o_videoeffects = [[VLCVideoEffects alloc] init]; o_videoeffects = [[VLCVideoEffects alloc] init];
if (!b_nib_videoeffects_loaded) if (!b_nib_videoeffects_loaded)
b_nib_videoeffects_loaded = [NSBundle loadNibNamed:@"VideoEffects" owner: NSApp]; b_nib_videoeffects_loaded = [NSBundle loadNibNamed:@"VideoEffects" owner: o_videoeffects];
[o_videoeffects toggleWindow:sender]; [o_videoeffects toggleWindow:sender];
} }
......
modules/gui/macosx/VideoEffects.h
View file @ 9e904e66
/***************************************************************************** /*****************************************************************************
* VideoEffects.h: MacOS X interface module * VideoEffects.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2011-2012 Felix Paul Kühne * Copyright (C) 2011-2015 Felix Paul Kühne
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -23,125 +23,124 @@ ...@@ -23,125 +23,124 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface VLCVideoEffects : NSObject
@interface VLCVideoEffects : NSObject { /* generic */
/* generic */ @property (readwrite, weak) IBOutlet NSWindow *window;
IBOutlet id o_window; @property (readwrite, weak) IBOutlet NSTabView *tabView;
IBOutlet id o_tableView; @property (readwrite, weak) IBOutlet NSPopUpButton *profilePopup;
IBOutlet id o_profile_pop;
/* basic */
/* basic */ @property (readwrite, weak) IBOutlet NSButton *adjustCheckbox;
IBOutlet id o_adjust_ckb; @property (readwrite, weak) IBOutlet NSTextField *adjustHueLabel;
IBOutlet id o_adjust_hue_lbl; @property (readwrite, weak) IBOutlet NSSlider *adjustHueSlider;
IBOutlet id o_adjust_hue_sld; @property (readwrite, weak) IBOutlet NSTextField *adjustContrastLabel;
IBOutlet id o_adjust_contrast_lbl; @property (readwrite, weak) IBOutlet NSSlider *adjustContrastSlider;
IBOutlet id o_adjust_contrast_sld; @property (readwrite, weak) IBOutlet NSTextField *adjustBrightnessLabel;
IBOutlet id o_adjust_brightness_lbl; @property (readwrite, weak) IBOutlet NSSlider *adjustBrightnessSlider;
IBOutlet id o_adjust_brightness_sld; @property (readwrite, weak) IBOutlet NSButton *adjustBrightnessCheckbox;
IBOutlet id o_adjust_brightness_ckb; @property (readwrite, weak) IBOutlet NSTextField *adjustSaturationLabel;
IBOutlet id o_adjust_saturation_lbl; @property (readwrite, weak) IBOutlet NSSlider *adjustSaturationSlider;
IBOutlet id o_adjust_saturation_sld; @property (readwrite, weak) IBOutlet NSTextField *adjustGammaLabel;
IBOutlet id o_adjust_gamma_lbl; @property (readwrite, weak) IBOutlet NSSlider *adjustGammaSlider;
IBOutlet id o_adjust_gamma_sld; @property (readwrite, weak) IBOutlet NSButton *adjustResetButton;
IBOutlet id o_adjust_reset_btn; @property (readwrite, weak) IBOutlet NSButton *sharpenCheckbox;
IBOutlet id o_sharpen_ckb; @property (readwrite, weak) IBOutlet NSTextField *sharpenLabel;
IBOutlet id o_sharpen_lbl; @property (readwrite, weak) IBOutlet NSSlider *sharpenSlider;
IBOutlet id o_sharpen_sld; @property (readwrite, weak) IBOutlet NSButton *bandingCheckbox;
IBOutlet id o_banding_ckb; @property (readwrite, weak) IBOutlet NSTextField *bandingLabel;
IBOutlet id o_banding_lbl; @property (readwrite, weak) IBOutlet NSSlider *bandingSlider;
IBOutlet id o_banding_sld; @property (readwrite, weak) IBOutlet NSButton *grainCheckbox;
IBOutlet id o_grain_ckb; @property (readwrite, weak) IBOutlet NSSlider *grainSlider;
IBOutlet id o_grain_sld; @property (readwrite, weak) IBOutlet NSTextField *grainLabel;
IBOutlet id o_grain_lbl;
/* crop */
/* crop */ @property (readwrite, weak) IBOutlet NSTextField *cropTopLabel;
IBOutlet id o_crop_top_lbl; @property (readwrite, weak) IBOutlet NSTextField *cropTopTextField;
IBOutlet id o_crop_top_fld; @property (readwrite, weak) IBOutlet NSStepper *cropTopStepper;
IBOutlet id o_crop_top_stp; @property (readwrite, weak) IBOutlet NSTextField *cropLeftLabel;
IBOutlet id o_crop_left_lbl; @property (readwrite, weak) IBOutlet NSTextField *cropLeftTextField;
IBOutlet id o_crop_left_fld; @property (readwrite, weak) IBOutlet NSStepper *cropLeftStepper;
IBOutlet id o_crop_left_stp; @property (readwrite, weak) IBOutlet NSTextField *cropRightLabel;
IBOutlet id o_crop_right_lbl; @property (readwrite, weak) IBOutlet NSTextField *cropRightTextField;
IBOutlet id o_crop_right_fld; @property (readwrite, weak) IBOutlet NSStepper *cropRightStepper;
IBOutlet id o_crop_right_stp; @property (readwrite, weak) IBOutlet NSTextField *cropBottomLabel;
IBOutlet id o_crop_bottom_lbl; @property (readwrite, weak) IBOutlet NSTextField *cropBottomTextField;
IBOutlet id o_crop_bottom_fld; @property (readwrite, weak) IBOutlet NSStepper *cropBottomStepper;
IBOutlet id o_crop_bottom_stp; @property (readwrite, weak) IBOutlet NSButton *cropSyncTopBottomCheckbox;
IBOutlet id o_crop_sync_top_bottom_ckb; @property (readwrite, weak) IBOutlet NSButton *cropSyncLeftRightCheckbox;
IBOutlet id o_crop_sync_left_right_ckb;
/* geometry */
/* geometry */ @property (readwrite, weak) IBOutlet NSButton *transformCheckbox;
IBOutlet id o_transform_ckb; @property (readwrite, weak) IBOutlet NSPopUpButton *transformPopup;
IBOutlet id o_transform_pop; @property (readwrite, weak) IBOutlet NSButton *zoomCheckbox;
IBOutlet id o_zoom_ckb; @property (readwrite, weak) IBOutlet NSButton *puzzleCheckbox;
IBOutlet id o_puzzle_ckb; @property (readwrite, weak) IBOutlet NSTextField *puzzleRowsLabel;
IBOutlet id o_puzzle_rows_lbl; @property (readwrite, weak) IBOutlet NSTextField *puzzleRowsTextField;
IBOutlet id o_puzzle_rows_fld; @property (readwrite, weak) IBOutlet NSStepper *puzzleRowsStepper;
IBOutlet id o_puzzle_rows_stp; @property (readwrite, weak) IBOutlet NSTextField *puzzleColumnsLabel;
IBOutlet id o_puzzle_columns_lbl; @property (readwrite, weak) IBOutlet NSTextField *puzzleColumnsTextField;
IBOutlet id o_puzzle_columns_fld; @property (readwrite, weak) IBOutlet NSStepper *puzzleColumnsStepper;
IBOutlet id o_puzzle_columns_stp; @property (readwrite, weak) IBOutlet NSButton *cloneCheckbox;
IBOutlet id o_clone_ckb; @property (readwrite, weak) IBOutlet NSTextField *cloneNumberTextField;
IBOutlet id o_clone_number_fld; @property (readwrite, weak) IBOutlet NSStepper *cloneNumberStepper;
IBOutlet id o_clone_number_stp; @property (readwrite, weak) IBOutlet NSTextField *cloneNumberLabel;
IBOutlet id o_clone_number_lbl; @property (readwrite, weak) IBOutlet NSButton *wallCheckbox;
IBOutlet id o_wall_ckb; @property (readwrite, weak) IBOutlet NSTextField *wallNumbersOfRowsTextField;
IBOutlet id o_wall_numofrows_fld; @property (readwrite, weak) IBOutlet NSStepper *wallNumbersOfRowsStepper;
IBOutlet id o_wall_numofrows_stp; @property (readwrite, weak) IBOutlet NSTextField *wallNumbersOfRowsLabel;
IBOutlet id o_wall_numofrows_lbl; @property (readwrite, weak) IBOutlet NSTextField *wallNumberOfColumnsTextField;
IBOutlet id o_wall_numofcols_fld; @property (readwrite, weak) IBOutlet NSStepper *wallNumberOfColumnsStepper;
IBOutlet id o_wall_numofcols_stp; @property (readwrite, weak) IBOutlet NSTextField *wallNumberOfColumnsLabel;
IBOutlet id o_wall_numofcols_lbl;
/* color */
/* color */ @property (readwrite, weak) IBOutlet NSButton *thresholdCheckbox;
IBOutlet id o_threshold_ckb; @property (readwrite, weak) IBOutlet NSTextField *thresholdColorLabel;
IBOutlet id o_threshold_color_lbl; @property (readwrite, weak) IBOutlet NSTextField *thresholdColorTextField;
IBOutlet id o_threshold_color_fld; @property (readwrite, weak) IBOutlet NSTextField *thresholdSaturationLabel;
IBOutlet id o_threshold_saturation_lbl; @property (readwrite, weak) IBOutlet NSSlider *thresholdSaturationSlider;
IBOutlet id o_threshold_saturation_sld; @property (readwrite, weak) IBOutlet NSTextField *thresholdSimilarityLabel;
IBOutlet id o_threshold_similarity_lbl; @property (readwrite, weak) IBOutlet NSSlider *thresholdSimilaritySlider;
IBOutlet id o_threshold_similarity_sld; @property (readwrite, weak) IBOutlet NSButton *sepiaCheckbox;
IBOutlet id o_sepia_ckb; @property (readwrite, weak) IBOutlet NSTextField *sepiaLabel;
IBOutlet id o_sepia_lbl; @property (readwrite, weak) IBOutlet NSTextField *sepiaTextField;
IBOutlet id o_sepia_fld; @property (readwrite, weak) IBOutlet NSStepper *sepiaStepper;
IBOutlet id o_sepia_stp; @property (readwrite, weak) IBOutlet NSButton *noiseCheckbox;
IBOutlet id o_noise_ckb; @property (readwrite, weak) IBOutlet NSButton *gradientCheckbox;
IBOutlet id o_gradient_ckb; @property (readwrite, weak) IBOutlet NSTextField *gradientModeLabel;
IBOutlet id o_gradient_mode_lbl; @property (readwrite, weak) IBOutlet NSPopUpButton *gradientModePopup;
IBOutlet id o_gradient_mode_pop; @property (readwrite, weak) IBOutlet NSButton *gradientColorCheckbox;
IBOutlet id o_gradient_color_ckb; @property (readwrite, weak) IBOutlet NSButton *gradientCartoonCheckbox;
IBOutlet id o_gradient_cartoon_ckb; @property (readwrite, weak) IBOutlet NSButton *extractCheckbox;
IBOutlet id o_extract_ckb; @property (readwrite, weak) IBOutlet NSTextField *extractLabel;
IBOutlet id o_extract_lbl; @property (readwrite, weak) IBOutlet NSTextField *extractTextField;
IBOutlet id o_extract_fld; @property (readwrite, weak) IBOutlet NSButton *invertCheckbox;
IBOutlet id o_invert_ckb; @property (readwrite, weak) IBOutlet NSButton *posterizeCheckbox;
IBOutlet id o_posterize_ckb; @property (readwrite, weak) IBOutlet NSTextField *posterizeLabel;
IBOutlet id o_posterize_lbl; @property (readwrite, weak) IBOutlet NSTextField *posterizeTextField;
IBOutlet id o_posterize_fld; @property (readwrite, weak) IBOutlet NSStepper *posterizeStepper;
IBOutlet id o_posterize_stp; @property (readwrite, weak) IBOutlet NSButton *blurCheckbox;
IBOutlet id o_blur_ckb; @property (readwrite, weak) IBOutlet NSSlider *blurSlider;
IBOutlet id o_blur_sld; @property (readwrite, weak) IBOutlet NSTextField *blurLabel;
IBOutlet id o_blur_lbl; @property (readwrite, weak) IBOutlet NSButton *motiondetectCheckbox;
IBOutlet id o_motiondetect_ckb; @property (readwrite, weak) IBOutlet NSButton *watereffectCheckbox;
IBOutlet id o_watereffect_ckb; @property (readwrite, weak) IBOutlet NSButton *wavesCheckbox;
IBOutlet id o_waves_ckb; @property (readwrite, weak) IBOutlet NSButton *psychedelicCheckbox;
IBOutlet id o_psychedelic_ckb;
/* misc */
/* misc */ @property (readwrite, weak) IBOutlet NSButton *addTextCheckbox;
IBOutlet id o_addtext_ckb; @property (readwrite, weak) IBOutlet NSTextField *addTextTextTextField;
IBOutlet id o_addtext_text_fld; @property (readwrite, weak) IBOutlet NSTextField *addTextTextLabel;
IBOutlet id o_addtext_text_lbl; @property (readwrite, weak) IBOutlet NSTextField *addTextPositionLabel;
IBOutlet id o_addtext_pos_lbl; @property (readwrite, weak) IBOutlet NSPopUpButton *addTextPositionPopup;
IBOutlet id o_addtext_pos_pop; @property (readwrite, weak) IBOutlet NSButton *addLogoCheckbox;
IBOutlet id o_addlogo_ckb; @property (readwrite, weak) IBOutlet NSTextField *addLogoLogoLabel;
IBOutlet id o_addlogo_logo_lbl; @property (readwrite, weak) IBOutlet NSTextField *addLogoLogoTextField;
IBOutlet id o_addlogo_logo_fld; @property (readwrite, weak) IBOutlet NSTextField *addLogoPositionLabel;
IBOutlet id o_addlogo_pos_lbl; @property (readwrite, weak) IBOutlet NSPopUpButton *addLogoPositionPopup;
IBOutlet id o_addlogo_pos_pop; @property (readwrite, weak) IBOutlet NSTextField *addLogoTransparencyLabel;
IBOutlet id o_addlogo_transparency_lbl; @property (readwrite, weak) IBOutlet NSSlider *addLogoTransparencySlider;
IBOutlet id o_addlogo_transparency_sld; @property (readwrite, weak) IBOutlet NSButton *anaglyphCheckbox;
IBOutlet id o_anaglyph_ckb;
}
/* text field / stepper binding values */ /* text field / stepper binding values */
/* use setter to modify gui elements */ /* use setter to modify gui elements */
...@@ -165,13 +164,10 @@ ...@@ -165,13 +164,10 @@
/* generic */ /* generic */
+ (VLCVideoEffects *)sharedInstance; + (VLCVideoEffects *)sharedInstance;
- (void)updateCocoaWindowLevel:(NSInteger)i_level; - (void)updateCocoaWindowLevel:(NSInteger)i_level;
- (void)saveCurrentProfile; - (void)saveCurrentProfile;
- (IBAction)toggleWindow:(id)sender; - (void)toggleWindow:(id)sender;
- (IBAction)profileSelectorAction:(id)sender; - (IBAction)profileSelectorAction:(id)sender;
- (IBAction)addProfile:(id)sender;
- (IBAction)removeProfile:(id)sender;
/* basic */ /* basic */
- (IBAction)enableAdjust:(id)sender; - (IBAction)enableAdjust:(id)sender;
......
modules/gui/macosx/VideoEffects.m
View file @ 9e904e66
/***************************************************************************** /*****************************************************************************
* VideoEffects.m: MacOS X interface module * VideoEffects.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2011-2012 Felix Paul Kühne * Copyright (C) 2011-2015 Felix Paul Kühne
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -29,10 +29,8 @@ ...@@ -29,10 +29,8 @@
@interface VLCVideoEffects() @interface VLCVideoEffects()
{ {
intf_thread_t *p_intf;
NSInteger i_old_profile_index; NSInteger i_old_profile_index;
} }
- (void)resetProfileSelector;
@end @end
#pragma mark - #pragma mark -
...@@ -62,7 +60,6 @@ ...@@ -62,7 +60,6 @@
- (id)init - (id)init
{ {
self = [super init]; self = [super init];
p_intf = VLCIntf;
i_old_profile_index = -1; i_old_profile_index = -1;
return self; return self;
...@@ -70,139 +67,139 @@ ...@@ -70,139 +67,139 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[o_window setTitle: _NS("Video Effects")]; [_window setTitle: _NS("Video Effects")];
[o_window setExcludedFromWindowsMenu:YES]; [_window setExcludedFromWindowsMenu:YES];
[o_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; [_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"basic"]] setLabel:_NS("Basic")]; [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"basic"]] setLabel:_NS("Basic")];
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"crop"]] setLabel:_NS("Crop")]; [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"crop"]] setLabel:_NS("Crop")];
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"geometry"]] setLabel:_NS("Geometry")]; [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"geometry"]] setLabel:_NS("Geometry")];
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"color"]] setLabel:_NS("Color")]; [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"color"]] setLabel:_NS("Color")];
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"misc"]] setLabel:_NS("Miscellaneous")]; [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"misc"]] setLabel:_NS("Miscellaneous")];
[self resetProfileSelector]; [self resetProfileSelector];
[o_adjust_ckb setTitle:_NS("Image Adjust")]; [_adjustCheckbox setTitle:_NS("Image Adjust")];
[o_adjust_hue_lbl setStringValue:_NS("Hue")]; [_adjustHueLabel setStringValue:_NS("Hue")];
[o_adjust_contrast_lbl setStringValue:_NS("Contrast")]; [_adjustContrastLabel setStringValue:_NS("Contrast")];
[o_adjust_brightness_lbl setStringValue:_NS("Brightness")]; [_adjustBrightnessLabel setStringValue:_NS("Brightness")];
[o_adjust_brightness_ckb setTitle:_NS("Brightness Threshold")]; [_adjustBrightnessCheckbox setTitle:_NS("Brightness Threshold")];
[o_adjust_saturation_lbl setStringValue:_NS("Saturation")]; [_adjustSaturationLabel setStringValue:_NS("Saturation")];
[o_adjust_gamma_lbl setStringValue:_NS("Gamma")]; [_adjustGammaLabel setStringValue:_NS("Gamma")];
[o_adjust_reset_btn setTitle: _NS("Reset")]; [_adjustResetButton setTitle: _NS("Reset")];
[o_sharpen_ckb setTitle:_NS("Sharpen")]; [_sharpenCheckbox setTitle:_NS("Sharpen")];
[o_sharpen_lbl setStringValue:_NS("Sigma")]; [_sharpenLabel setStringValue:_NS("Sigma")];
[o_banding_ckb setTitle:_NS("Banding removal")]; [_bandingCheckbox setTitle:_NS("Banding removal")];
[o_banding_lbl setStringValue:_NS("Radius")]; [_bandingLabel setStringValue:_NS("Radius")];
[o_grain_ckb setTitle:_NS("Film Grain")]; [_grainCheckbox setTitle:_NS("Film Grain")];
[o_grain_lbl setStringValue:_NS("Variance")]; [_grainLabel setStringValue:_NS("Variance")];
[o_crop_top_lbl setStringValue:_NS("Top")]; [_cropTopLabel setStringValue:_NS("Top")];
[o_crop_left_lbl setStringValue:_NS("Left")]; [_cropLeftLabel setStringValue:_NS("Left")];
[o_crop_right_lbl setStringValue:_NS("Right")]; [_cropRightLabel setStringValue:_NS("Right")];
[o_crop_bottom_lbl setStringValue:_NS("Bottom")]; [_cropBottomLabel setStringValue:_NS("Bottom")];
[o_crop_sync_top_bottom_ckb setTitle:_NS("Synchronize top and bottom")]; [_cropSyncTopBottomCheckbox setTitle:_NS("Synchronize top and bottom")];
[o_crop_sync_left_right_ckb setTitle:_NS("Synchronize left and right")]; [_cropSyncLeftRightCheckbox setTitle:_NS("Synchronize left and right")];
[o_transform_ckb setTitle:_NS("Transform")]; [_transformCheckbox setTitle:_NS("Transform")];
[o_transform_pop removeAllItems]; [_transformPopup removeAllItems];
[o_transform_pop addItemWithTitle: _NS("Rotate by 90 degrees")]; [_transformPopup addItemWithTitle: _NS("Rotate by 90 degrees")];
[[o_transform_pop lastItem] setTag: 90]; [[_transformPopup lastItem] setTag: 90];
[o_transform_pop addItemWithTitle: _NS("Rotate by 180 degrees")]; [_transformPopup addItemWithTitle: _NS("Rotate by 180 degrees")];
[[o_transform_pop lastItem] setTag: 180]; [[_transformPopup lastItem] setTag: 180];
[o_transform_pop addItemWithTitle: _NS("Rotate by 270 degrees")]; [_transformPopup addItemWithTitle: _NS("Rotate by 270 degrees")];
[[o_transform_pop lastItem] setTag: 270]; [[_transformPopup lastItem] setTag: 270];
[o_transform_pop addItemWithTitle: _NS("Flip horizontally")]; [_transformPopup addItemWithTitle: _NS("Flip horizontally")];
[[o_transform_pop lastItem] setTag: 1]; [[_transformPopup lastItem] setTag: 1];
[o_transform_pop addItemWithTitle: _NS("Flip vertically")]; [_transformPopup addItemWithTitle: _NS("Flip vertically")];
[[o_transform_pop lastItem] setTag: 2]; [[_transformPopup lastItem] setTag: 2];
[o_zoom_ckb setTitle:_NS("Magnification/Zoom")]; [_zoomCheckbox setTitle:_NS("Magnification/Zoom")];
[o_puzzle_ckb setTitle:_NS("Puzzle game")]; [_puzzleCheckbox setTitle:_NS("Puzzle game")];
[o_puzzle_rows_lbl setStringValue:_NS("Rows")]; [_puzzleRowsLabel setStringValue:_NS("Rows")];
[o_puzzle_columns_lbl setStringValue:_NS("Columns")]; [_puzzleColumnsLabel setStringValue:_NS("Columns")];
[o_clone_ckb setTitle:_NS("Clone")]; [_cloneCheckbox setTitle:_NS("Clone")];
[o_clone_number_lbl setStringValue:_NS("Number of clones")]; [_cloneNumberLabel setStringValue:_NS("Number of clones")];
[o_wall_ckb setTitle:_NS("Wall")]; [_wallCheckbox setTitle:_NS("Wall")];
[o_wall_numofrows_lbl setStringValue:_NS("Rows")]; [_wallNumbersOfRowsLabel setStringValue:_NS("Rows")];
[o_wall_numofcols_lbl setStringValue:_NS("Columns")]; [_wallNumberOfColumnsLabel setStringValue:_NS("Columns")];
[o_threshold_ckb setTitle:_NS("Color threshold")]; [_thresholdCheckbox setTitle:_NS("Color threshold")];
[o_threshold_color_lbl setStringValue:_NS("Color")]; [_thresholdColorLabel setStringValue:_NS("Color")];
[o_threshold_saturation_lbl setStringValue:_NS("Saturation")]; [_thresholdSaturationLabel setStringValue:_NS("Saturation")];
[o_threshold_similarity_lbl setStringValue:_NS("Similarity")]; [_thresholdSimilarityLabel setStringValue:_NS("Similarity")];
[o_sepia_ckb setTitle:_NS("Sepia")]; [_sepiaCheckbox setTitle:_NS("Sepia")];
[o_sepia_lbl setStringValue:_NS("Intensity")]; [_sepiaLabel setStringValue:_NS("Intensity")];
[o_noise_ckb setTitle:_NS("Noise")]; [_noiseCheckbox setTitle:_NS("Noise")];
[o_gradient_ckb setTitle:_NS("Gradient")]; [_gradientCheckbox setTitle:_NS("Gradient")];
[o_gradient_mode_lbl setStringValue:_NS("Mode")]; [_gradientModeLabel setStringValue:_NS("Mode")];
[o_gradient_mode_pop removeAllItems]; [_gradientModePopup removeAllItems];
[o_gradient_mode_pop addItemWithTitle: _NS("Gradient")]; [_gradientModePopup addItemWithTitle: _NS("Gradient")];
[[o_gradient_mode_pop lastItem] setTag: 1]; [[_gradientModePopup lastItem] setTag: 1];
[o_gradient_mode_pop addItemWithTitle: _NS("Edge")]; [_gradientModePopup addItemWithTitle: _NS("Edge")];
[[o_gradient_mode_pop lastItem] setTag: 2]; [[_gradientModePopup lastItem] setTag: 2];
[o_gradient_mode_pop addItemWithTitle: _NS("Hough")]; [_gradientModePopup addItemWithTitle: _NS("Hough")];
[[o_gradient_mode_pop lastItem] setTag: 3]; [[_gradientModePopup lastItem] setTag: 3];
[o_gradient_color_ckb setTitle:_NS("Color")]; [_gradientColorCheckbox setTitle:_NS("Color")];
[o_gradient_cartoon_ckb setTitle:_NS("Cartoon")]; [_gradientCartoonCheckbox setTitle:_NS("Cartoon")];
[o_extract_ckb setTitle:_NS("Color extraction")]; [_extractCheckbox setTitle:_NS("Color extraction")];
[o_extract_lbl setStringValue:_NS("Color")]; [_extractLabel setStringValue:_NS("Color")];
[o_invert_ckb setTitle:_NS("Invert colors")]; [_invertCheckbox setTitle:_NS("Invert colors")];
[o_posterize_ckb setTitle:_NS("Posterize")]; [_posterizeCheckbox setTitle:_NS("Posterize")];
[o_posterize_lbl setStringValue:_NS("Posterize level")]; [_posterizeLabel setStringValue:_NS("Posterize level")];
[o_blur_ckb setTitle:_NS("Motion blur")]; [_blurCheckbox setTitle:_NS("Motion blur")];
[o_blur_lbl setStringValue:_NS("Factor")]; [_blurLabel setStringValue:_NS("Factor")];
[o_motiondetect_ckb setTitle:_NS("Motion Detect")]; [_motiondetectCheckbox setTitle:_NS("Motion Detect")];
[o_watereffect_ckb setTitle:_NS("Water effect")]; [_watereffectCheckbox setTitle:_NS("Water effect")];
[o_waves_ckb setTitle:_NS("Waves")]; [_wavesCheckbox setTitle:_NS("Waves")];
[o_psychedelic_ckb setTitle:_NS("Psychedelic")]; [_psychedelicCheckbox setTitle:_NS("Psychedelic")];
[o_anaglyph_ckb setTitle:_NS("Anaglyph")]; [_anaglyphCheckbox setTitle:_NS("Anaglyph")];
[o_addtext_ckb setTitle:_NS("Add text")]; [_addTextCheckbox setTitle:_NS("Add text")];
[o_addtext_text_lbl setStringValue:_NS("Text")]; [_addTextTextLabel setStringValue:_NS("Text")];
[o_addtext_pos_lbl setStringValue:_NS("Position")]; [_addTextPositionLabel setStringValue:_NS("Position")];
[o_addtext_pos_pop removeAllItems]; [_addTextPositionPopup removeAllItems];
[o_addtext_pos_pop addItemWithTitle: _NS("Center")]; [_addTextPositionPopup addItemWithTitle: _NS("Center")];
[[o_addtext_pos_pop lastItem] setTag: 0]; [[_addTextPositionPopup lastItem] setTag: 0];
[o_addtext_pos_pop addItemWithTitle: _NS("Left")]; [_addTextPositionPopup addItemWithTitle: _NS("Left")];
[[o_addtext_pos_pop lastItem] setTag: 1]; [[_addTextPositionPopup lastItem] setTag: 1];
[o_addtext_pos_pop addItemWithTitle: _NS("Right")]; [_addTextPositionPopup addItemWithTitle: _NS("Right")];
[[o_addtext_pos_pop lastItem] setTag: 2]; [[_addTextPositionPopup lastItem] setTag: 2];
[o_addtext_pos_pop addItemWithTitle: _NS("Top")]; [_addTextPositionPopup addItemWithTitle: _NS("Top")];
[[o_addtext_pos_pop lastItem] setTag: 4]; [[_addTextPositionPopup lastItem] setTag: 4];
[o_addtext_pos_pop addItemWithTitle: _NS("Bottom")]; [_addTextPositionPopup addItemWithTitle: _NS("Bottom")];
[[o_addtext_pos_pop lastItem] setTag: 8]; [[_addTextPositionPopup lastItem] setTag: 8];
[o_addtext_pos_pop addItemWithTitle: _NS("Top-Left")]; [_addTextPositionPopup addItemWithTitle: _NS("Top-Left")];
[[o_addtext_pos_pop lastItem] setTag: 5]; [[_addTextPositionPopup lastItem] setTag: 5];
[o_addtext_pos_pop addItemWithTitle: _NS("Top-Right")]; [_addTextPositionPopup addItemWithTitle: _NS("Top-Right")];
[[o_addtext_pos_pop lastItem] setTag: 6]; [[_addTextPositionPopup lastItem] setTag: 6];
[o_addtext_pos_pop addItemWithTitle: _NS("Bottom-Left")]; [_addTextPositionPopup addItemWithTitle: _NS("Bottom-Left")];
[[o_addtext_pos_pop lastItem] setTag: 9]; [[_addTextPositionPopup lastItem] setTag: 9];
[o_addtext_pos_pop addItemWithTitle: _NS("Bottom-Right")]; [_addTextPositionPopup addItemWithTitle: _NS("Bottom-Right")];
[[o_addtext_pos_pop lastItem] setTag: 10]; [[_addTextPositionPopup lastItem] setTag: 10];
[o_addlogo_ckb setTitle:_NS("Add logo")]; [_addLogoCheckbox setTitle:_NS("Add logo")];
[o_addlogo_logo_lbl setStringValue:_NS("Logo")]; [_addLogoLogoLabel setStringValue:_NS("Logo")];
[o_addlogo_pos_lbl setStringValue:_NS("Position")]; [_addLogoPositionLabel setStringValue:_NS("Position")];
[o_addlogo_pos_pop removeAllItems]; [_addLogoPositionPopup removeAllItems];
[o_addlogo_pos_pop addItemWithTitle: _NS("Center")]; [_addLogoPositionPopup addItemWithTitle: _NS("Center")];
[[o_addlogo_pos_pop lastItem] setTag: 0]; [[_addLogoPositionPopup lastItem] setTag: 0];
[o_addlogo_pos_pop addItemWithTitle: _NS("Left")]; [_addLogoPositionPopup addItemWithTitle: _NS("Left")];
[[o_addlogo_pos_pop lastItem] setTag: 1]; [[_addLogoPositionPopup lastItem] setTag: 1];
[o_addlogo_pos_pop addItemWithTitle: _NS("Right")]; [_addLogoPositionPopup addItemWithTitle: _NS("Right")];
[[o_addlogo_pos_pop lastItem] setTag: 2]; [[_addLogoPositionPopup lastItem] setTag: 2];
[o_addlogo_pos_pop addItemWithTitle: _NS("Top")]; [_addLogoPositionPopup addItemWithTitle: _NS("Top")];
[[o_addlogo_pos_pop lastItem] setTag: 4]; [[_addLogoPositionPopup lastItem] setTag: 4];
[o_addlogo_pos_pop addItemWithTitle: _NS("Bottom")]; [_addLogoPositionPopup addItemWithTitle: _NS("Bottom")];
[[o_addlogo_pos_pop lastItem] setTag: 8]; [[_addLogoPositionPopup lastItem] setTag: 8];
[o_addlogo_pos_pop addItemWithTitle: _NS("Top-Left")]; [_addLogoPositionPopup addItemWithTitle: _NS("Top-Left")];
[[o_addlogo_pos_pop lastItem] setTag: 5]; [[_addLogoPositionPopup lastItem] setTag: 5];
[o_addlogo_pos_pop addItemWithTitle: _NS("Top-Right")]; [_addLogoPositionPopup addItemWithTitle: _NS("Top-Right")];
[[o_addlogo_pos_pop lastItem] setTag: 6]; [[_addLogoPositionPopup lastItem] setTag: 6];
[o_addlogo_pos_pop addItemWithTitle: _NS("Bottom-Left")]; [_addLogoPositionPopup addItemWithTitle: _NS("Bottom-Left")];
[[o_addlogo_pos_pop lastItem] setTag: 9]; [[_addLogoPositionPopup lastItem] setTag: 9];
[o_addlogo_pos_pop addItemWithTitle: _NS("Bottom-Right")]; [_addLogoPositionPopup addItemWithTitle: _NS("Bottom-Right")];
[[o_addlogo_pos_pop lastItem] setTag: 10]; [[_addLogoPositionPopup lastItem] setTag: 10];
[o_addlogo_transparency_lbl setStringValue:_NS("Transparency")]; [_addLogoTransparencyLabel setStringValue:_NS("Transparency")];
[o_tableView selectFirstTabViewItem:self]; [_tabView selectFirstTabViewItem:self];
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(inputChangedEvent:) selector:@selector(inputChangedEvent:)
...@@ -220,8 +217,8 @@ ...@@ -220,8 +217,8 @@
- (void)updateCocoaWindowLevel:(NSInteger)i_level - (void)updateCocoaWindowLevel:(NSInteger)i_level
{ {
if (o_window && [o_window isVisible] && [o_window level] != i_level) if (_window && [_window isVisible] && [_window level] != i_level)
[o_window setLevel: i_level]; [_window setLevel: i_level];
} }
#pragma mark - #pragma mark -
...@@ -239,28 +236,29 @@ ...@@ -239,28 +236,29 @@
- (void)resetProfileSelector - (void)resetProfileSelector
{ {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[o_profile_pop removeAllItems]; [_profilePopup removeAllItems];
NSArray * profileNames = [defaults objectForKey:@"VideoEffectProfileNames"]; NSArray *profileNames = [defaults objectForKey:@"VideoEffectProfileNames"];
[o_profile_pop addItemsWithTitles:profileNames]; [_profilePopup addItemsWithTitles:profileNames];
[[o_profile_pop menu] addItem:[NSMenuItem separatorItem]]; [[_profilePopup menu] addItem:[NSMenuItem separatorItem]];
[o_profile_pop addItemWithTitle:_NS("Duplicate current profile...")]; [_profilePopup addItemWithTitle:_NS("Duplicate current profile...")];
[[o_profile_pop lastItem] setTarget: self]; [[_profilePopup lastItem] setTarget: self];
[[o_profile_pop lastItem] setAction: @selector(addProfile:)]; [[_profilePopup lastItem] setAction: @selector(addProfile:)];
if ([profileNames count] > 1) { if ([profileNames count] > 1) {
[o_profile_pop addItemWithTitle:_NS("Organize profiles...")]; [_profilePopup addItemWithTitle:_NS("Organize profiles...")];
[[o_profile_pop lastItem] setTarget: self]; [[_profilePopup lastItem] setTarget: self];
[[o_profile_pop lastItem] setAction: @selector(removeProfile:)]; [[_profilePopup lastItem] setAction: @selector(removeProfile:)];
} }
[o_profile_pop selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]]; [_profilePopup selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]];
[self profileSelectorAction:self]; [self profileSelectorAction:self];
} }
- (void)resetValues - (void)resetValues
{ {
intf_thread_t *p_intf = VLCIntf;
NSString *tmpString; NSString *tmpString;
char *tmpChar; char *tmpChar;
BOOL b_state; BOOL b_state;
...@@ -269,240 +267,246 @@ ...@@ -269,240 +267,246 @@
char * psz_vfilters; char * psz_vfilters;
psz_vfilters = config_GetPsz(p_intf, "video-filter"); psz_vfilters = config_GetPsz(p_intf, "video-filter");
if (psz_vfilters) { if (psz_vfilters) {
[o_adjust_ckb setState: (NSInteger)strstr(psz_vfilters, "adjust")]; [_adjustCheckbox setState: (NSInteger)strstr(psz_vfilters, "adjust")];
[o_sharpen_ckb setState: (NSInteger)strstr(psz_vfilters, "sharpen")]; [_sharpenCheckbox setState: (NSInteger)strstr(psz_vfilters, "sharpen")];
[o_banding_ckb setState: (NSInteger)strstr(psz_vfilters, "gradfun")]; [_bandingCheckbox setState: (NSInteger)strstr(psz_vfilters, "gradfun")];
[o_grain_ckb setState: (NSInteger)strstr(psz_vfilters, "grain")]; [_grainCheckbox setState: (NSInteger)strstr(psz_vfilters, "grain")];
[o_transform_ckb setState: (NSInteger)strstr(psz_vfilters, "transform")]; [_transformCheckbox setState: (NSInteger)strstr(psz_vfilters, "transform")];
[o_zoom_ckb setState: (NSInteger)strstr(psz_vfilters, "magnify")]; [_zoomCheckbox setState: (NSInteger)strstr(psz_vfilters, "magnify")];
[o_puzzle_ckb setState: (NSInteger)strstr(psz_vfilters, "puzzle")]; [_puzzleCheckbox setState: (NSInteger)strstr(psz_vfilters, "puzzle")];
[o_threshold_ckb setState: (NSInteger)strstr(psz_vfilters, "colorthres")]; [_thresholdCheckbox setState: (NSInteger)strstr(psz_vfilters, "colorthres")];
[o_sepia_ckb setState: (NSInteger)strstr(psz_vfilters, "sepia")]; [_sepiaCheckbox setState: (NSInteger)strstr(psz_vfilters, "sepia")];
[o_noise_ckb setState: (NSInteger)strstr(psz_vfilters, "noise")]; [_noiseCheckbox setState: (NSInteger)strstr(psz_vfilters, "noise")];
[o_gradient_ckb setState: (NSInteger)strstr(psz_vfilters, "gradient")]; [_gradientCheckbox setState: (NSInteger)strstr(psz_vfilters, "gradient")];
[o_extract_ckb setState: (NSInteger)strstr(psz_vfilters, "extract")]; [_extractCheckbox setState: (NSInteger)strstr(psz_vfilters, "extract")];
[o_invert_ckb setState: (NSInteger)strstr(psz_vfilters, "invert")]; [_invertCheckbox setState: (NSInteger)strstr(psz_vfilters, "invert")];
[o_posterize_ckb setState: (NSInteger)strstr(psz_vfilters, "posterize")]; [_posterizeCheckbox setState: (NSInteger)strstr(psz_vfilters, "posterize")];
[o_blur_ckb setState: (NSInteger)strstr(psz_vfilters, "motionblur")]; [_blurCheckbox setState: (NSInteger)strstr(psz_vfilters, "motionblur")];
[o_motiondetect_ckb setState: (NSInteger)strstr(psz_vfilters, "motiondetect")]; [_motiondetectCheckbox setState: (NSInteger)strstr(psz_vfilters, "motiondetect")];
[o_watereffect_ckb setState: (NSInteger)strstr(psz_vfilters, "ripple")]; [_watereffectCheckbox setState: (NSInteger)strstr(psz_vfilters, "ripple")];
[o_waves_ckb setState: (NSInteger)strstr(psz_vfilters, "wave")]; [_wavesCheckbox setState: (NSInteger)strstr(psz_vfilters, "wave")];
[o_psychedelic_ckb setState: (NSInteger)strstr(psz_vfilters, "psychedelic")]; [_psychedelicCheckbox setState: (NSInteger)strstr(psz_vfilters, "psychedelic")];
[o_anaglyph_ckb setState: (NSInteger)strstr(psz_vfilters, "anaglyph")]; [_anaglyphCheckbox setState: (NSInteger)strstr(psz_vfilters, "anaglyph")];
free(psz_vfilters); free(psz_vfilters);
} else { } else {
[o_adjust_ckb setState: NSOffState]; [_adjustCheckbox setState: NSOffState];
[o_sharpen_ckb setState: NSOffState]; [_sharpenCheckbox setState: NSOffState];
[o_banding_ckb setState: NSOffState]; [_bandingCheckbox setState: NSOffState];
[o_grain_ckb setState: NSOffState]; [_grainCheckbox setState: NSOffState];
[o_transform_ckb setState: NSOffState]; [_transformCheckbox setState: NSOffState];
[o_zoom_ckb setState: NSOffState]; [_zoomCheckbox setState: NSOffState];
[o_puzzle_ckb setState: NSOffState]; [_puzzleCheckbox setState: NSOffState];
[o_threshold_ckb setState: NSOffState]; [_thresholdCheckbox setState: NSOffState];
[o_sepia_ckb setState: NSOffState]; [_sepiaCheckbox setState: NSOffState];
[o_noise_ckb setState: NSOffState]; [_noiseCheckbox setState: NSOffState];
[o_gradient_ckb setState: NSOffState]; [_gradientCheckbox setState: NSOffState];
[o_extract_ckb setState: NSOffState]; [_extractCheckbox setState: NSOffState];
[o_invert_ckb setState: NSOffState]; [_invertCheckbox setState: NSOffState];
[o_posterize_ckb setState: NSOffState]; [_posterizeCheckbox setState: NSOffState];
[o_blur_ckb setState: NSOffState]; [_blurCheckbox setState: NSOffState];
[o_motiondetect_ckb setState: NSOffState]; [_motiondetectCheckbox setState: NSOffState];
[o_watereffect_ckb setState: NSOffState]; [_watereffectCheckbox setState: NSOffState];
[o_waves_ckb setState: NSOffState]; [_wavesCheckbox setState: NSOffState];
[o_psychedelic_ckb setState: NSOffState]; [_psychedelicCheckbox setState: NSOffState];
[o_anaglyph_ckb setState: NSOffState]; [_anaglyphCheckbox setState: NSOffState];
} }
psz_vfilters = config_GetPsz(p_intf, "sub-source"); psz_vfilters = config_GetPsz(p_intf, "sub-source");
if (psz_vfilters) { if (psz_vfilters) {
[o_addtext_ckb setState: (NSInteger)strstr(psz_vfilters, "marq")]; [_addTextCheckbox setState: (NSInteger)strstr(psz_vfilters, "marq")];
[o_addlogo_ckb setState: (NSInteger)strstr(psz_vfilters, "logo")]; [_addLogoCheckbox setState: (NSInteger)strstr(psz_vfilters, "logo")];
free(psz_vfilters); free(psz_vfilters);
} else { } else {
[o_addtext_ckb setState: NSOffState]; [_addTextCheckbox setState: NSOffState];
[o_addlogo_ckb setState: NSOffState]; [_addLogoCheckbox setState: NSOffState];
} }
psz_vfilters = config_GetPsz(p_intf, "video-splitter"); psz_vfilters = config_GetPsz(p_intf, "video-splitter");
if (psz_vfilters) { if (psz_vfilters) {
[o_clone_ckb setState: (NSInteger)strstr(psz_vfilters, "clone")]; [_cloneCheckbox setState: (NSInteger)strstr(psz_vfilters, "clone")];
[o_wall_ckb setState: (NSInteger)strstr(psz_vfilters, "wall")]; [_wallCheckbox setState: (NSInteger)strstr(psz_vfilters, "wall")];
free(psz_vfilters); free(psz_vfilters);
} else { } else {
[o_clone_ckb setState: NSOffState]; [_cloneCheckbox setState: NSOffState];
[o_wall_ckb setState: NSOffState]; [_wallCheckbox setState: NSOffState];
} }
/* fetch and show the various values */ /* fetch and show the various values */
[o_adjust_hue_sld setFloatValue: config_GetFloat(p_intf, "hue")]; [_adjustHueSlider setFloatValue: config_GetFloat(p_intf, "hue")];
[o_adjust_contrast_sld setFloatValue: config_GetFloat(p_intf, "contrast")]; [_adjustContrastSlider setFloatValue: config_GetFloat(p_intf, "contrast")];
[o_adjust_brightness_sld setFloatValue: config_GetFloat(p_intf, "brightness")]; [_adjustBrightnessSlider setFloatValue: config_GetFloat(p_intf, "brightness")];
[o_adjust_saturation_sld setFloatValue: config_GetFloat(p_intf, "saturation")]; [_adjustSaturationSlider setFloatValue: config_GetFloat(p_intf, "saturation")];
[o_adjust_brightness_ckb setState:(config_GetInt(p_intf, "brightness-threshold") != 0 ? NSOnState : NSOffState)]; [_adjustBrightnessCheckbox setState:(config_GetInt(p_intf, "brightness-threshold") != 0 ? NSOnState : NSOffState)];
[o_adjust_gamma_sld setFloatValue: config_GetFloat(p_intf, "gamma")]; [_adjustGammaSlider setFloatValue: config_GetFloat(p_intf, "gamma")];
[o_adjust_brightness_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "brightness")]]; [_adjustBrightnessSlider setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "brightness")]];
[o_adjust_contrast_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "contrast")]]; [_adjustContrastSlider setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "contrast")]];
[o_adjust_gamma_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "gamma")]]; [_adjustGammaSlider setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "gamma")]];
[o_adjust_hue_sld setToolTip: [NSString stringWithFormat:@"%.0f", config_GetFloat(p_intf, "hue")]]; [_adjustHueSlider setToolTip: [NSString stringWithFormat:@"%.0f", config_GetFloat(p_intf, "hue")]];
[o_adjust_saturation_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "saturation")]]; [_adjustSaturationSlider setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "saturation")]];
b_state = [o_adjust_ckb state]; b_state = [_adjustCheckbox state];
[o_adjust_brightness_sld setEnabled: b_state]; #if 0
[o_adjust_brightness_ckb setEnabled: b_state]; [_adjustBrightnessSlider setEnabled: b_state];
[o_adjust_contrast_sld setEnabled: b_state]; [_adjustBrightnessCheckbox setEnabled: b_state];
[o_adjust_gamma_sld setEnabled: b_state]; [_adjustContrastSlider setEnabled: b_state];
[o_adjust_hue_sld setEnabled: b_state]; [_adjustGammaSlider setEnabled: b_state];
[o_adjust_saturation_sld setEnabled: b_state]; [_adjustHueSlider setEnabled: b_state];
[o_adjust_brightness_lbl setEnabled: b_state]; [_adjustSaturationSlider setEnabled: b_state];
[o_adjust_contrast_lbl setEnabled: b_state]; [_adjustBrightnessLabel setEnabled: b_state];
[o_adjust_gamma_lbl setEnabled: b_state]; [_adjustContrastLabel setEnabled: b_state];
[o_adjust_hue_lbl setEnabled: b_state]; [_adjustGammaLabel setEnabled: b_state];
[o_adjust_saturation_lbl setEnabled: b_state]; [_adjustHueLabel setEnabled: b_state];
[o_adjust_reset_btn setEnabled: b_state]; [_adjustSaturationLabel setEnabled: b_state];
[_adjustResetButton setEnabled: b_state];
[o_sharpen_sld setFloatValue: config_GetFloat(p_intf, "sharpen-sigma")];
[o_sharpen_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "sharpen-sigma")]]; [_sharpenSlider setFloatValue: config_GetFloat(p_intf, "sharpen-sigma")];
[o_sharpen_sld setEnabled: [o_sharpen_ckb state]]; [_sharpenSlider setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "sharpen-sigma")]];
[o_sharpen_lbl setEnabled: [o_sharpen_ckb state]]; [_sharpenSlider setEnabled: [_sharpenCheckbox state]];
[_sharpenLabel setEnabled: [_sharpenCheckbox state]];
[o_banding_sld setIntValue: config_GetInt(p_intf, "gradfun-radius")];
[o_banding_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "gradfun-radius")]]; [_bandingSlider setIntValue: config_GetInt(p_intf, "gradfun-radius")];
[o_banding_sld setEnabled: [o_banding_ckb state]]; [_bandingSlider setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "gradfun-radius")]];
[o_banding_lbl setEnabled: [o_banding_ckb state]]; [_bandingSlider setEnabled: [_bandingCheckbox state]];
[_bandingLabel setEnabled: [_bandingCheckbox state]];
[o_grain_sld setFloatValue: config_GetFloat(p_intf, "grain-variance")];
[o_grain_sld setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "grain-variance")]]; [_grainSlider setFloatValue: config_GetFloat(p_intf, "grain-variance")];
[o_grain_sld setEnabled: [o_grain_ckb state]]; [_grainSlider setToolTip: [NSString stringWithFormat:@"%0.3f", config_GetFloat(p_intf, "grain-variance")]];
[o_grain_lbl setEnabled: [o_grain_ckb state]]; [_grainSlider setEnabled: [_grainCheckbox state]];
[_grainLabel setEnabled: [_grainCheckbox state]];
[self setCropLeftValue: 0]; [self setCropLeftValue: 0];
[self setCropTopValue: 0]; [self setCropTopValue: 0];
[self setCropRightValue: 0]; [self setCropRightValue: 0];
[self setCropBottomValue: 0]; [self setCropBottomValue: 0];
[o_crop_sync_top_bottom_ckb setState: NSOffState]; [_cropSyncTopBottomCheckbox setState: NSOffState];
[o_crop_sync_left_right_ckb setState: NSOffState]; [_cropSyncLeftRightCheckbox setState: NSOffState];
tmpChar = config_GetPsz(p_intf, "transform-type"); tmpChar = config_GetPsz(p_intf, "transform-type");
tmpString = [NSString stringWithUTF8String:tmpChar]; tmpString = [NSString stringWithUTF8String:tmpChar];
if ([tmpString isEqualToString:@"hflip"]) if ([tmpString isEqualToString:@"hflip"])
[o_transform_pop selectItemWithTag: 1]; [_transformPopup selectItemWithTag: 1];
else if ([tmpString isEqualToString:@"vflip"]) else if ([tmpString isEqualToString:@"vflip"])
[o_transform_pop selectItemWithTag: 2]; [_transformPopup selectItemWithTag: 2];
else else
[o_transform_pop selectItemWithTag:[tmpString intValue]]; [_transformPopup selectItemWithTag:[tmpString intValue]];
FREENULL(tmpChar); FREENULL(tmpChar);
[o_transform_pop setEnabled: [o_transform_ckb state]]; [_transformPopup setEnabled: [_transformCheckbox state]];
[self setPuzzleColumnsValue: config_GetInt(p_intf, "puzzle-cols")]; [self setPuzzleColumnsValue: config_GetInt(p_intf, "puzzle-cols")];
[self setPuzzleRowsValue: config_GetInt(p_intf, "puzzle-rows")]; [self setPuzzleRowsValue: config_GetInt(p_intf, "puzzle-rows")];
b_state = [o_puzzle_ckb state]; b_state = [_puzzleCheckbox state];
[o_puzzle_rows_fld setEnabled: b_state]; [_puzzleRowsTextField setEnabled: b_state];
[o_puzzle_rows_stp setEnabled: b_state]; [_puzzleRowsStepper setEnabled: b_state];
[o_puzzle_rows_lbl setEnabled: b_state]; [_puzzleRowsLabel setEnabled: b_state];
[o_puzzle_columns_fld setEnabled: b_state]; [_puzzleColumnsTextField setEnabled: b_state];
[o_puzzle_columns_stp setEnabled: b_state]; [_puzzleColumnsStepper setEnabled: b_state];
[o_puzzle_columns_lbl setEnabled: b_state]; [_puzzleColumnsLabel setEnabled: b_state];
#endif
#if 0
[self setCloneValue: config_GetInt(p_intf, "clone-count")]; [self setCloneValue: config_GetInt(p_intf, "clone-count")];
b_state = [o_clone_ckb state]; b_state = [_cloneCheckbox state];
[o_clone_number_lbl setEnabled: b_state]; [_cloneNumberLabel setEnabled: b_state];
[o_clone_number_fld setEnabled: b_state]; [_cloneNumberTextField setEnabled: b_state];
[o_clone_number_stp setEnabled: b_state]; [_cloneNumberStepper setEnabled: b_state];
b_state = [o_wall_ckb state]; b_state = [_wallCheckbox state];
[self setWallRowsValue: config_GetInt(p_intf, "wall-rows")]; [self setWallRowsValue: config_GetInt(p_intf, "wall-rows")];
[o_wall_numofrows_lbl setEnabled: b_state]; [_wallNumbersOfRowsLabel setEnabled: b_state];
[o_wall_numofrows_fld setEnabled: b_state]; [_wallNumbersOfRowsTextField setEnabled: b_state];
[o_wall_numofrows_stp setEnabled: b_state]; [_wallNumbersOfRowsStepper setEnabled: b_state];
[self setWallColumnsValue: config_GetInt(p_intf, "wall-cols")]; [self setWallColumnsValue: config_GetInt(p_intf, "wall-cols")];
[o_wall_numofcols_lbl setEnabled: b_state]; [_wallNumberOfColumnsLabel setEnabled: b_state];
[o_wall_numofcols_fld setEnabled: b_state]; [_wallNumberOfColumnsTextField setEnabled: b_state];
[o_wall_numofcols_stp setEnabled: b_state]; [_wallNumberOfColumnsStepper setEnabled: b_state];
[o_threshold_color_fld setStringValue: [[NSString stringWithFormat:@"%llx", config_GetInt(p_intf, "colorthres-color")] uppercaseString]]; [_thresholdColorTextField setStringValue: [[NSString stringWithFormat:@"%llx", config_GetInt(p_intf, "colorthres-color")] uppercaseString]];
[o_threshold_saturation_sld setIntValue: config_GetInt(p_intf, "colorthres-saturationthres")]; [_thresholdSaturationSlider setIntValue: config_GetInt(p_intf, "colorthres-saturationthres")];
[o_threshold_saturation_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "colorthres-saturationthres")]]; [_thresholdSaturationSlider setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "colorthres-saturationthres")]];
[o_threshold_similarity_sld setIntValue: config_GetInt(p_intf, "colorthres-similaritythres")]; [_thresholdSimilaritySlider setIntValue: config_GetInt(p_intf, "colorthres-similaritythres")];
[o_threshold_similarity_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "colorthres-similaritythres")]]; [_thresholdSimilaritySlider setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "colorthres-similaritythres")]];
b_state = [o_threshold_ckb state]; b_state = [_thresholdCheckbox state];
[o_threshold_color_fld setEnabled: b_state]; [_thresholdColorTextField setEnabled: b_state];
[o_threshold_color_lbl setEnabled: b_state]; [_thresholdColorLabel setEnabled: b_state];
[o_threshold_saturation_sld setEnabled: b_state]; [_thresholdSaturationSlider setEnabled: b_state];
[o_threshold_saturation_lbl setEnabled: b_state]; [_thresholdSaturationLabel setEnabled: b_state];
[o_threshold_similarity_sld setEnabled: b_state]; [_thresholdSimilaritySlider setEnabled: b_state];
[o_threshold_similarity_lbl setEnabled: b_state]; [_thresholdSimilarityLabel setEnabled: b_state];
[self setSepiaValue: config_GetInt(p_intf, "sepia-intensity")]; [self setSepiaValue: config_GetInt(p_intf, "sepia-intensity")];
b_state = [o_sepia_ckb state]; b_state = [_sepiaCheckbox state];
[o_sepia_fld setEnabled: b_state]; [_sepiaTextField setEnabled: b_state];
[o_sepia_stp setEnabled: b_state]; [_sepiaStepper setEnabled: b_state];
[o_sepia_lbl setEnabled: b_state]; [_sepiaLabel setEnabled: b_state];
tmpChar = config_GetPsz(p_intf, "gradient-mode"); tmpChar = config_GetPsz(p_intf, "gradient-mode");
tmpString = [NSString stringWithUTF8String:tmpChar]; tmpString = [NSString stringWithUTF8String:tmpChar];
if ([tmpString isEqualToString:@"hough"]) if ([tmpString isEqualToString:@"hough"])
[o_gradient_mode_pop selectItemWithTag: 3]; [_gradientModePopup selectItemWithTag: 3];
else if ([tmpString isEqualToString:@"edge"]) else if ([tmpString isEqualToString:@"edge"])
[o_gradient_mode_pop selectItemWithTag: 2]; [_gradientModePopup selectItemWithTag: 2];
else else
[o_gradient_mode_pop selectItemWithTag: 1]; [_gradientModePopup selectItemWithTag: 1];
FREENULL(tmpChar); FREENULL(tmpChar);
[o_gradient_cartoon_ckb setState: config_GetInt(p_intf, "gradient-cartoon")]; [_gradientCartoonCheckbox setState: config_GetInt(p_intf, "gradient-cartoon")];
[o_gradient_color_ckb setState: config_GetInt(p_intf, "gradient-type")]; [_gradientColorCheckbox setState: config_GetInt(p_intf, "gradient-type")];
b_state = [o_gradient_ckb state]; b_state = [_gradientCheckbox state];
[o_gradient_mode_pop setEnabled: b_state]; [_gradientModePopup setEnabled: b_state];
[o_gradient_mode_lbl setEnabled: b_state]; [_gradientModeLabel setEnabled: b_state];
[o_gradient_cartoon_ckb setEnabled: b_state]; [_gradientCartoonCheckbox setEnabled: b_state];
[o_gradient_color_ckb setEnabled: b_state]; [_gradientColorCheckbox setEnabled: b_state];
#endif
[o_extract_fld setStringValue: [[NSString stringWithFormat:@"%llx", config_GetInt(p_intf, "extract-component")] uppercaseString]]; #if 0
[o_extract_fld setEnabled: [o_extract_ckb state]]; [_extractTextField setStringValue: [[NSString stringWithFormat:@"%llx", config_GetInt(p_intf, "extract-component")] uppercaseString]];
[o_extract_lbl setEnabled: [o_extract_ckb state]]; [_extractTextField setEnabled: [_extractCheckbox state]];
[_extractLabel setEnabled: [_extractCheckbox state]];
[self setPosterizeValue: config_GetInt(p_intf, "posterize-level")]; [self setPosterizeValue: config_GetInt(p_intf, "posterize-level")];
b_state = [o_posterize_ckb state]; b_state = [_posterizeCheckbox state];
[o_posterize_fld setEnabled: b_state]; [_posterizeTextField setEnabled: b_state];
[o_posterize_stp setEnabled: b_state]; [_posterizeStepper setEnabled: b_state];
[o_posterize_lbl setEnabled: b_state]; [_posterizeLabel setEnabled: b_state];
[o_blur_sld setIntValue: config_GetInt(p_intf, "blur-factor")]; [_blurSlider setIntValue: config_GetInt(p_intf, "blur-factor")];
[o_blur_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "blur-factor")]]; [_blurSlider setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "blur-factor")]];
[o_blur_sld setEnabled: [o_blur_ckb state]]; [_blurSlider setEnabled: [_blurCheckbox state]];
[o_blur_lbl setEnabled: [o_blur_ckb state]]; [_blurLabel setEnabled: [_blurCheckbox state]];
tmpChar = config_GetPsz(p_intf, "marq-marquee"); tmpChar = config_GetPsz(p_intf, "marq-marquee");
if (tmpChar) { if (tmpChar) {
[o_addtext_text_fld setStringValue: [NSString stringWithUTF8String:tmpChar]]; [_addTextTextTextField setStringValue: [NSString stringWithUTF8String:tmpChar]];
FREENULL(tmpChar); FREENULL(tmpChar);
} else } else
[o_addtext_text_fld setStringValue: @""]; [_addTextTextTextField setStringValue: @""];
[o_addtext_pos_pop selectItemWithTag: config_GetInt(p_intf, "marq-position")]; [_addTextPositionPopup selectItemWithTag: config_GetInt(p_intf, "marq-position")];
b_state = [o_addtext_ckb state]; b_state = [_addTextCheckbox state];
[o_addtext_pos_pop setEnabled: b_state]; [_addTextPositionPopup setEnabled: b_state];
[o_addtext_pos_lbl setEnabled: b_state]; [_addTextPositionLabel setEnabled: b_state];
[o_addtext_text_lbl setEnabled: b_state]; [_addTextTextLabel setEnabled: b_state];
[o_addtext_text_fld setEnabled: b_state]; [_addTextTextTextField setEnabled: b_state];
tmpChar = config_GetPsz(p_intf, "logo-file"); tmpChar = config_GetPsz(p_intf, "logo-file");
if (tmpChar) { if (tmpChar) {
[o_addlogo_logo_fld setStringValue: [NSString stringWithUTF8String:tmpChar]]; [_addLogoLogoTextField setStringValue: [NSString stringWithUTF8String:tmpChar]];
FREENULL(tmpChar); FREENULL(tmpChar);
} else } else
[o_addlogo_logo_fld setStringValue: @""]; [_addLogoLogoTextField setStringValue: @""];
[o_addlogo_pos_pop selectItemWithTag: config_GetInt(p_intf, "logo-position")]; [_addLogoPositionPopup selectItemWithTag: config_GetInt(p_intf, "logo-position")];
[o_addlogo_transparency_sld setIntValue: config_GetInt(p_intf, "logo-opacity")]; [_addLogoTransparencySlider setIntValue: config_GetInt(p_intf, "logo-opacity")];
[o_addlogo_transparency_sld setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "logo-opacity")]]; [_addLogoTransparencySlider setToolTip: [NSString stringWithFormat:@"%lli", config_GetInt(p_intf, "logo-opacity")]];
b_state = [o_addlogo_ckb state]; b_state = [_addLogoCheckbox state];
[o_addlogo_pos_pop setEnabled: b_state]; [_addLogoPositionPopup setEnabled: b_state];
[o_addlogo_pos_lbl setEnabled: b_state]; [_addLogoPositionLabel setEnabled: b_state];
[o_addlogo_logo_fld setEnabled: b_state]; [_addLogoLogoTextField setEnabled: b_state];
[o_addlogo_logo_lbl setEnabled: b_state]; [_addLogoLogoLabel setEnabled: b_state];
[o_addlogo_transparency_sld setEnabled: b_state]; [_addLogoTransparencySlider setEnabled: b_state];
[o_addlogo_transparency_lbl setEnabled: b_state]; [_addLogoTransparencyLabel setEnabled: b_state];
#endif
} }
- (NSString *)generateProfileString - (NSString *)generateProfileString
{ {
intf_thread_t *p_intf = VLCIntf;
return [NSString stringWithFormat:@"%@;%@;%@;%lli;%f;%f;%f;%f;%f;%lli;%f;%@;%lli;%lli;%lli;%lli;%lli;%lli;%@;%lli;%lli;%lli;%lli;%lli;%@;%lli;%@;%lli;%lli;%lli;%lli;%lli;%lli;%f", return [NSString stringWithFormat:@"%@;%@;%@;%lli;%f;%f;%f;%f;%f;%lli;%f;%@;%lli;%lli;%lli;%lli;%lli;%lli;%@;%lli;%lli;%lli;%lli;%lli;%@;%lli;%@;%lli;%lli;%lli;%lli;%lli;%lli;%f",
B64EncAndFree(config_GetPsz(p_intf, "video-filter")), B64EncAndFree(config_GetPsz(p_intf, "video-filter")),
B64EncAndFree(config_GetPsz(p_intf, "sub-source")), B64EncAndFree(config_GetPsz(p_intf, "sub-source")),
...@@ -566,22 +570,23 @@ ...@@ -566,22 +570,23 @@
- (IBAction)toggleWindow:(id)sender - (IBAction)toggleWindow:(id)sender
{ {
if ([o_window isKeyWindow]) if ([_window isKeyWindow])
[o_window orderOut:sender]; [_window orderOut:sender];
else { else {
[o_window setLevel: [[[VLCMain sharedInstance] voutController] currentStatusWindowLevel]]; [_window setLevel: [[[VLCMain sharedInstance] voutController] currentStatusWindowLevel]];
[o_window makeKeyAndOrderFront:sender]; [_window makeKeyAndOrderFront:sender];
} }
} }
- (IBAction)profileSelectorAction:(id)sender - (IBAction)profileSelectorAction:(id)sender
{ {
intf_thread_t *p_intf = VLCIntf;
[self saveCurrentProfile]; [self saveCurrentProfile];
i_old_profile_index = [o_profile_pop indexOfSelectedItem]; i_old_profile_index = [_profilePopup indexOfSelectedItem];
VLCCoreInteraction *vci_si = [VLCCoreInteraction sharedInstance]; VLCCoreInteraction *vci_si = [VLCCoreInteraction sharedInstance];
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSUInteger selectedProfile = [o_profile_pop indexOfSelectedItem]; NSUInteger selectedProfile = [_profilePopup indexOfSelectedItem];
/* fetch preset */ /* fetch preset */
NSArray *items = [[[defaults objectForKey:@"VideoEffectProfiles"] objectAtIndex:selectedProfile] componentsSeparatedByString:@";"]; NSArray *items = [[[defaults objectForKey:@"VideoEffectProfiles"] objectAtIndex:selectedProfile] componentsSeparatedByString:@";"];
...@@ -676,7 +681,7 @@ ...@@ -676,7 +681,7 @@
[self resetValues]; [self resetValues];
} }
- (IBAction)addProfile:(id)sender - (void)addProfile:(id)sender
{ {
/* show panel */ /* show panel */
VLCEnterTextPanel * panel = [VLCEnterTextPanel sharedInstance]; VLCEnterTextPanel * panel = [VLCEnterTextPanel sharedInstance];
...@@ -686,7 +691,7 @@ ...@@ -686,7 +691,7 @@
[panel setOKButtonLabel: _NS("Save")]; [panel setOKButtonLabel: _NS("Save")];
[panel setTarget:self]; [panel setTarget:self];
[panel runModalForWindow:o_window]; [panel runModalForWindow:_window];
} }
- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text - (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text
...@@ -694,7 +699,7 @@ ...@@ -694,7 +699,7 @@
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if (value != NSOKButton) { if (value != NSOKButton) {
[o_profile_pop selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]]; [_profilePopup selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]];
return; return;
} }
...@@ -702,14 +707,14 @@ ...@@ -702,14 +707,14 @@
// duplicate names are not allowed in the popup control // duplicate names are not allowed in the popup control
if ([text length] == 0 || [profileNames containsObject:text]) { if ([text length] == 0 || [profileNames containsObject:text]) {
[o_profile_pop selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]]; [_profilePopup selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]];
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
[alert setAlertStyle:NSCriticalAlertStyle]; [alert setAlertStyle:NSCriticalAlertStyle];
[alert setMessageText:_NS("Please enter a unique name for the new profile.")]; [alert setMessageText:_NS("Please enter a unique name for the new profile.")];
[alert setInformativeText:_NS("Multiple profiles with the same name are not allowed.")]; [alert setInformativeText:_NS("Multiple profiles with the same name are not allowed.")];
[alert beginSheetModalForWindow:o_window [alert beginSheetModalForWindow:_window
modalDelegate:nil modalDelegate:nil
didEndSelector:nil didEndSelector:nil
contextInfo:nil]; contextInfo:nil];
...@@ -737,7 +742,7 @@ ...@@ -737,7 +742,7 @@
[self resetProfileSelector]; [self resetProfileSelector];
} }
- (IBAction)removeProfile:(id)sender - (void)removeProfile:(id)sender
{ {
/* show panel */ /* show panel */
VLCSelectItemInPopupPanel * panel = [VLCSelectItemInPopupPanel sharedInstance]; VLCSelectItemInPopupPanel * panel = [VLCSelectItemInPopupPanel sharedInstance];
...@@ -748,7 +753,7 @@ ...@@ -748,7 +753,7 @@
[panel setPopupButtonContent:[[NSUserDefaults standardUserDefaults] objectForKey:@"VideoEffectProfileNames"]]; [panel setPopupButtonContent:[[NSUserDefaults standardUserDefaults] objectForKey:@"VideoEffectProfileNames"]];
[panel setTarget:self]; [panel setTarget:self];
[panel runModalForWindow:o_window]; [panel runModalForWindow:_window];
} }
- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item - (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item
...@@ -756,7 +761,7 @@ ...@@ -756,7 +761,7 @@
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if (value != NSOKButton) { if (value != NSOKButton) {
[o_profile_pop selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]]; [_profilePopup selectItemAtIndex:[defaults integerForKey:@"VideoEffectSelectedProfile"]];
return; return;
} }
...@@ -785,38 +790,38 @@ ...@@ -785,38 +790,38 @@
#pragma mark basic #pragma mark basic
- (IBAction)enableAdjust:(id)sender - (IBAction)enableAdjust:(id)sender
{ {
BOOL b_state = [o_adjust_ckb state]; BOOL b_state = [_adjustCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "adjust" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "adjust" on: b_state];
[o_adjust_brightness_sld setEnabled: b_state]; [_adjustBrightnessSlider setEnabled: b_state];
[o_adjust_brightness_ckb setEnabled: b_state]; [_adjustBrightnessCheckbox setEnabled: b_state];
[o_adjust_brightness_lbl setEnabled: b_state]; [_adjustBrightnessLabel setEnabled: b_state];
[o_adjust_contrast_sld setEnabled: b_state]; [_adjustContrastSlider setEnabled: b_state];
[o_adjust_contrast_lbl setEnabled: b_state]; [_adjustContrastLabel setEnabled: b_state];
[o_adjust_gamma_sld setEnabled: b_state]; [_adjustGammaSlider setEnabled: b_state];
[o_adjust_gamma_lbl setEnabled: b_state]; [_adjustGammaLabel setEnabled: b_state];
[o_adjust_hue_sld setEnabled: b_state]; [_adjustHueSlider setEnabled: b_state];
[o_adjust_hue_lbl setEnabled: b_state]; [_adjustHueLabel setEnabled: b_state];
[o_adjust_saturation_sld setEnabled: b_state]; [_adjustSaturationSlider setEnabled: b_state];
[o_adjust_saturation_lbl setEnabled: b_state]; [_adjustSaturationLabel setEnabled: b_state];
[o_adjust_reset_btn setEnabled: b_state]; [_adjustResetButton setEnabled: b_state];
} }
- (IBAction)adjustSliderChanged:(id)sender - (IBAction)adjustSliderChanged:(id)sender
{ {
if (sender == o_adjust_brightness_sld) if (sender == _adjustBrightnessSlider)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "brightness" forFilter: "adjust" float: [o_adjust_brightness_sld floatValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "brightness" forFilter: "adjust" float: [_adjustBrightnessSlider floatValue]];
else if (sender == o_adjust_contrast_sld) else if (sender == _adjustContrastSlider)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "contrast" forFilter: "adjust" float: [o_adjust_contrast_sld floatValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "contrast" forFilter: "adjust" float: [_adjustContrastSlider floatValue]];
else if (sender == o_adjust_gamma_sld) else if (sender == _adjustGammaSlider)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gamma" forFilter: "adjust" float: [o_adjust_gamma_sld floatValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gamma" forFilter: "adjust" float: [_adjustGammaSlider floatValue]];
else if (sender == o_adjust_hue_sld) else if (sender == _adjustHueSlider)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "hue" forFilter: "adjust" float: [o_adjust_hue_sld floatValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "hue" forFilter: "adjust" float: [_adjustHueSlider floatValue]];
else if (sender == o_adjust_saturation_sld) else if (sender == _adjustSaturationSlider)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "saturation" forFilter: "adjust" float: [o_adjust_saturation_sld floatValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "saturation" forFilter: "adjust" float: [_adjustSaturationSlider floatValue]];
if (sender == o_adjust_hue_sld) if (sender == _adjustHueSlider)
[o_adjust_hue_sld setToolTip: [NSString stringWithFormat:@"%.0f", [o_adjust_hue_sld floatValue]]]; [_adjustHueSlider setToolTip: [NSString stringWithFormat:@"%.0f", [_adjustHueSlider floatValue]]];
else else
[sender setToolTip: [NSString stringWithFormat:@"%0.3f", [sender floatValue]]]; [sender setToolTip: [NSString stringWithFormat:@"%0.3f", [sender floatValue]]];
} }
...@@ -825,34 +830,34 @@ ...@@ -825,34 +830,34 @@
{ {
VLCCoreInteraction *vci_si = [VLCCoreInteraction sharedInstance]; VLCCoreInteraction *vci_si = [VLCCoreInteraction sharedInstance];
if (sender == o_adjust_reset_btn) { if (sender == _adjustResetButton) {
[o_adjust_brightness_sld setFloatValue: 1.0]; [_adjustBrightnessSlider setFloatValue: 1.0];
[o_adjust_contrast_sld setFloatValue: 1.0]; [_adjustContrastSlider setFloatValue: 1.0];
[o_adjust_gamma_sld setFloatValue: 1.0]; [_adjustGammaSlider setFloatValue: 1.0];
[o_adjust_hue_sld setFloatValue: 0]; [_adjustHueSlider setFloatValue: 0];
[o_adjust_saturation_sld setFloatValue: 1.0]; [_adjustSaturationSlider setFloatValue: 1.0];
[o_adjust_brightness_sld setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]]; [_adjustBrightnessSlider setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]];
[o_adjust_contrast_sld setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]]; [_adjustContrastSlider setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]];
[o_adjust_gamma_sld setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]]; [_adjustGammaSlider setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]];
[o_adjust_hue_sld setToolTip: [NSString stringWithFormat:@"%.0f", 0.0]]; [_adjustHueSlider setToolTip: [NSString stringWithFormat:@"%.0f", 0.0]];
[o_adjust_saturation_sld setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]]; [_adjustSaturationSlider setToolTip: [NSString stringWithFormat:@"%0.3f", 1.0]];
[vci_si setVideoFilterProperty: "brightness" forFilter: "adjust" float: 1.0]; [vci_si setVideoFilterProperty: "brightness" forFilter: "adjust" float: 1.0];
[vci_si setVideoFilterProperty: "contrast" forFilter: "adjust" float: 1.0]; [vci_si setVideoFilterProperty: "contrast" forFilter: "adjust" float: 1.0];
[vci_si setVideoFilterProperty: "gamma" forFilter: "adjust" float: 1.0]; [vci_si setVideoFilterProperty: "gamma" forFilter: "adjust" float: 1.0];
[vci_si setVideoFilterProperty: "hue" forFilter: "adjust" float: 0.0]; [vci_si setVideoFilterProperty: "hue" forFilter: "adjust" float: 0.0];
[vci_si setVideoFilterProperty: "saturation" forFilter: "adjust" float: 1.0]; [vci_si setVideoFilterProperty: "saturation" forFilter: "adjust" float: 1.0];
} else } else
[vci_si setVideoFilterProperty: "brightness-threshold" forFilter: "adjust" boolean: [o_adjust_brightness_ckb state]]; [vci_si setVideoFilterProperty: "brightness-threshold" forFilter: "adjust" boolean: [_adjustBrightnessCheckbox state]];
} }
- (IBAction)enableSharpen:(id)sender - (IBAction)enableSharpen:(id)sender
{ {
BOOL b_state = [o_sharpen_ckb state]; BOOL b_state = [_sharpenCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "sharpen" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "sharpen" on: b_state];
[o_sharpen_sld setEnabled: b_state]; [_sharpenSlider setEnabled: b_state];
[o_sharpen_lbl setEnabled: b_state]; [_sharpenLabel setEnabled: b_state];
} }
- (IBAction)sharpenSliderChanged:(id)sender - (IBAction)sharpenSliderChanged:(id)sender
...@@ -863,11 +868,11 @@ ...@@ -863,11 +868,11 @@
- (IBAction)enableBanding:(id)sender - (IBAction)enableBanding:(id)sender
{ {
BOOL b_state = [o_banding_ckb state]; BOOL b_state = [_bandingCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "gradfun" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "gradfun" on: b_state];
[o_banding_sld setEnabled: b_state]; [_bandingSlider setEnabled: b_state];
[o_banding_lbl setEnabled: b_state]; [_bandingLabel setEnabled: b_state];
} }
- (IBAction)bandingSliderChanged:(id)sender - (IBAction)bandingSliderChanged:(id)sender
...@@ -878,11 +883,11 @@ ...@@ -878,11 +883,11 @@
- (IBAction)enableGrain:(id)sender - (IBAction)enableGrain:(id)sender
{ {
BOOL b_state = [o_grain_ckb state]; BOOL b_state = [_grainCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "grain" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "grain" on: b_state];
[o_grain_sld setEnabled: b_state]; [_grainSlider setEnabled: b_state];
[o_grain_lbl setEnabled: b_state]; [_grainLabel setEnabled: b_state];
} }
- (IBAction)grainSliderChanged:(id)sender - (IBAction)grainSliderChanged:(id)sender
...@@ -897,14 +902,14 @@ ...@@ -897,14 +902,14 @@
- (IBAction)cropObjectChanged:(id)sender - (IBAction)cropObjectChanged:(id)sender
{ {
if ([o_crop_sync_top_bottom_ckb state]) { if ([_cropSyncTopBottomCheckbox state]) {
if (sender == o_crop_bottom_fld || sender == o_crop_bottom_stp) if (sender == _cropBottomTextField || sender == _cropBottomStepper)
[self setCropTopValue: [self cropBottomValue]]; [self setCropTopValue: [self cropBottomValue]];
else else
[self setCropBottomValue: [self cropTopValue]]; [self setCropBottomValue: [self cropTopValue]];
} }
if ([o_crop_sync_left_right_ckb state]) { if ([_cropSyncLeftRightCheckbox state]) {
if (sender == o_crop_right_fld || sender == o_crop_right_stp) if (sender == _cropRightTextField || sender == _cropRightStepper)
[self setCropLeftValue: [self cropRightValue]]; [self setCropLeftValue: [self cropRightValue]];
else else
[self setCropRightValue: [self cropLeftValue]]; [self setCropRightValue: [self cropLeftValue]];
...@@ -912,10 +917,10 @@ ...@@ -912,10 +917,10 @@
vout_thread_t *p_vout = getVout(); vout_thread_t *p_vout = getVout();
if (p_vout) { if (p_vout) {
var_SetInteger(p_vout, "crop-top", [o_crop_top_fld intValue]); var_SetInteger(p_vout, "crop-top", [_cropTopTextField intValue]);
var_SetInteger(p_vout, "crop-bottom", [o_crop_bottom_fld intValue]); var_SetInteger(p_vout, "crop-bottom", [_cropBottomTextField intValue]);
var_SetInteger(p_vout, "crop-left", [o_crop_left_fld intValue]); var_SetInteger(p_vout, "crop-left", [_cropLeftTextField intValue]);
var_SetInteger(p_vout, "crop-right", [o_crop_right_fld intValue]); var_SetInteger(p_vout, "crop-right", [_cropRightTextField intValue]);
vlc_object_release(p_vout); vlc_object_release(p_vout);
} }
} }
...@@ -924,13 +929,13 @@ ...@@ -924,13 +929,13 @@
#pragma mark geometry #pragma mark geometry
- (IBAction)enableTransform:(id)sender - (IBAction)enableTransform:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "transform" on: [o_transform_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "transform" on: [_transformCheckbox state]];
[o_transform_pop setEnabled: [o_transform_ckb state]]; [_transformPopup setEnabled: [_transformCheckbox state]];
} }
- (IBAction)transformModifierChanged:(id)sender - (IBAction)transformModifierChanged:(id)sender
{ {
NSInteger tag = [[o_transform_pop selectedItem] tag]; NSInteger tag = [[_transformPopup selectedItem] tag];
const char *psz_string = [[NSString stringWithFormat:@"%li", tag] UTF8String]; const char *psz_string = [[NSString stringWithFormat:@"%li", tag] UTF8String];
if (tag == 1) if (tag == 1)
psz_string = "hflip"; psz_string = "hflip";
...@@ -942,25 +947,25 @@ ...@@ -942,25 +947,25 @@
- (IBAction)enableZoom:(id)sender - (IBAction)enableZoom:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "magnify" on: [o_zoom_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "magnify" on: [_zoomCheckbox state]];
} }
- (IBAction)enablePuzzle:(id)sender - (IBAction)enablePuzzle:(id)sender
{ {
BOOL b_state = [o_puzzle_ckb state]; BOOL b_state = [_puzzleCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "puzzle" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "puzzle" on: b_state];
[o_puzzle_columns_fld setEnabled: b_state]; [_puzzleColumnsTextField setEnabled: b_state];
[o_puzzle_columns_stp setEnabled: b_state]; [_puzzleColumnsStepper setEnabled: b_state];
[o_puzzle_columns_lbl setEnabled: b_state]; [_puzzleColumnsLabel setEnabled: b_state];
[o_puzzle_rows_fld setEnabled: b_state]; [_puzzleRowsTextField setEnabled: b_state];
[o_puzzle_rows_stp setEnabled: b_state]; [_puzzleRowsStepper setEnabled: b_state];
[o_puzzle_rows_lbl setEnabled: b_state]; [_puzzleRowsLabel setEnabled: b_state];
} }
- (IBAction)puzzleModifierChanged:(id)sender - (IBAction)puzzleModifierChanged:(id)sender
{ {
if (sender == o_puzzle_columns_fld || sender == o_puzzle_columns_stp) if (sender == _puzzleColumnsTextField || sender == _puzzleColumnsStepper)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "puzzle-cols" forFilter: "puzzle" integer: [sender intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "puzzle-cols" forFilter: "puzzle" integer: [sender intValue]];
else else
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "puzzle-rows" forFilter: "puzzle" integer: [sender intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "puzzle-rows" forFilter: "puzzle" integer: [sender intValue]];
...@@ -968,46 +973,46 @@ ...@@ -968,46 +973,46 @@
- (IBAction)enableClone:(id)sender - (IBAction)enableClone:(id)sender
{ {
BOOL b_state = [o_clone_ckb state]; BOOL b_state = [_cloneCheckbox state];
if (b_state && [o_wall_ckb state]) { if (b_state && [_wallCheckbox state]) {
[o_wall_ckb setState: NSOffState]; [_wallCheckbox setState: NSOffState];
[self enableWall: o_wall_ckb]; [self enableWall:_wallCheckbox];
} }
[[VLCCoreInteraction sharedInstance] setVideoFilter: "clone" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "clone" on: b_state];
[o_clone_number_lbl setEnabled: b_state]; [_cloneNumberLabel setEnabled: b_state];
[o_clone_number_fld setEnabled: b_state]; [_cloneNumberTextField setEnabled: b_state];
[o_clone_number_stp setEnabled: b_state]; [_cloneNumberStepper setEnabled: b_state];
} }
- (IBAction)cloneModifierChanged:(id)sender - (IBAction)cloneModifierChanged:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "clone-count" forFilter: "clone" integer: [o_clone_number_fld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "clone-count" forFilter: "clone" integer: [_cloneNumberTextField intValue]];
} }
- (IBAction)enableWall:(id)sender - (IBAction)enableWall:(id)sender
{ {
BOOL b_state = [o_wall_ckb state]; BOOL b_state = [_wallCheckbox state];
if (b_state && [o_clone_ckb state]) { if (b_state && [_cloneCheckbox state]) {
[o_clone_ckb setState: NSOffState]; [_cloneCheckbox setState: NSOffState];
[self enableClone: o_clone_ckb]; [self enableClone:_cloneCheckbox];
} }
[[VLCCoreInteraction sharedInstance] setVideoFilter: "wall" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "wall" on: b_state];
[o_wall_numofcols_fld setEnabled: b_state]; [_wallNumberOfColumnsTextField setEnabled: b_state];
[o_wall_numofcols_stp setEnabled: b_state]; [_wallNumberOfColumnsStepper setEnabled: b_state];
[o_wall_numofcols_lbl setEnabled: b_state]; [_wallNumberOfColumnsLabel setEnabled: b_state];
[o_wall_numofrows_fld setEnabled: b_state]; [_wallNumbersOfRowsTextField setEnabled: b_state];
[o_wall_numofrows_stp setEnabled: b_state]; [_wallNumbersOfRowsStepper setEnabled: b_state];
[o_wall_numofrows_lbl setEnabled: b_state]; [_wallNumbersOfRowsLabel setEnabled: b_state];
} }
- (IBAction)wallModifierChanged:(id)sender - (IBAction)wallModifierChanged:(id)sender
{ {
if (sender == o_wall_numofcols_fld || sender == o_wall_numofcols_stp) if (sender == _wallNumberOfColumnsTextField || sender == _wallNumberOfColumnsStepper)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "wall-cols" forFilter: "wall" integer: [sender intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "wall-cols" forFilter: "wall" integer: [sender intValue]];
else else
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "wall-rows" forFilter: "wall" integer: [sender intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "wall-rows" forFilter: "wall" integer: [sender intValue]];
...@@ -1017,116 +1022,116 @@ ...@@ -1017,116 +1022,116 @@
#pragma mark color #pragma mark color
- (IBAction)enableThreshold:(id)sender - (IBAction)enableThreshold:(id)sender
{ {
BOOL b_state = [o_threshold_ckb state]; BOOL b_state = [_thresholdCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "colorthres" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "colorthres" on: b_state];
[o_threshold_color_fld setEnabled: b_state]; [_thresholdColorTextField setEnabled: b_state];
[o_threshold_color_lbl setEnabled: b_state]; [_thresholdColorLabel setEnabled: b_state];
[o_threshold_saturation_sld setEnabled: b_state]; [_thresholdSaturationSlider setEnabled: b_state];
[o_threshold_saturation_lbl setEnabled: b_state]; [_thresholdSaturationLabel setEnabled: b_state];
[o_threshold_similarity_sld setEnabled: b_state]; [_thresholdSimilaritySlider setEnabled: b_state];
[o_threshold_similarity_lbl setEnabled: b_state]; [_thresholdSimilarityLabel setEnabled: b_state];
} }
- (IBAction)thresholdModifierChanged:(id)sender - (IBAction)thresholdModifierChanged:(id)sender
{ {
if (sender == o_threshold_color_fld) if (sender == _thresholdColorTextField)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "colorthres-color" forFilter: "colorthres" integer: [o_threshold_color_fld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "colorthres-color" forFilter: "colorthres" integer: [_thresholdColorTextField intValue]];
else if (sender == o_threshold_saturation_sld) { else if (sender == _thresholdSaturationSlider) {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "colorthres-saturationthres" forFilter: "colorthres" integer: [o_threshold_saturation_sld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "colorthres-saturationthres" forFilter: "colorthres" integer: [_thresholdSaturationSlider intValue]];
[o_threshold_saturation_sld setToolTip: [NSString stringWithFormat:@"%i", [o_threshold_saturation_sld intValue]]]; [_thresholdSaturationSlider setToolTip: [NSString stringWithFormat:@"%i", [_thresholdSaturationSlider intValue]]];
} else { } else {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "colorthres-similaritythres" forFilter: "colorthres" integer: [o_threshold_similarity_sld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "colorthres-similaritythres" forFilter: "colorthres" integer: [_thresholdSimilaritySlider intValue]];
[o_threshold_similarity_sld setToolTip: [NSString stringWithFormat:@"%i", [o_threshold_similarity_sld intValue]]]; [_thresholdSimilaritySlider setToolTip: [NSString stringWithFormat:@"%i", [_thresholdSimilaritySlider intValue]]];
} }
} }
- (IBAction)enableSepia:(id)sender - (IBAction)enableSepia:(id)sender
{ {
BOOL b_state = [o_sepia_ckb state]; BOOL b_state = [_sepiaCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "sepia" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "sepia" on: b_state];
[o_sepia_fld setEnabled: b_state]; [_sepiaTextField setEnabled: b_state];
[o_sepia_stp setEnabled: b_state]; [_sepiaStepper setEnabled: b_state];
[o_sepia_lbl setEnabled: b_state]; [_sepiaLabel setEnabled: b_state];
} }
- (IBAction)sepiaModifierChanged:(id)sender - (IBAction)sepiaModifierChanged:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "sepia-intensity" forFilter: "sepia" integer: [o_sepia_fld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "sepia-intensity" forFilter: "sepia" integer: [_sepiaTextField intValue]];
} }
- (IBAction)enableNoise:(id)sender - (IBAction)enableNoise:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "noise" on: [o_noise_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "noise" on: [_noiseCheckbox state]];
} }
- (IBAction)enableGradient:(id)sender - (IBAction)enableGradient:(id)sender
{ {
BOOL b_state = [o_gradient_ckb state]; BOOL b_state = [_gradientCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "gradient" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "gradient" on: b_state];
[o_gradient_mode_pop setEnabled: b_state]; [_gradientModePopup setEnabled: b_state];
[o_gradient_mode_lbl setEnabled: b_state]; [_gradientModeLabel setEnabled: b_state];
[o_gradient_color_ckb setEnabled: b_state]; [_gradientColorCheckbox setEnabled: b_state];
[o_gradient_cartoon_ckb setEnabled: b_state]; [_gradientCartoonCheckbox setEnabled: b_state];
} }
- (IBAction)gradientModifierChanged:(id)sender - (IBAction)gradientModifierChanged:(id)sender
{ {
if (sender == o_gradient_mode_pop) { if (sender == _gradientModePopup) {
if ([[o_gradient_mode_pop selectedItem] tag] == 3) if ([[_gradientModePopup selectedItem] tag] == 3)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-mode" forFilter: "gradient" string: "hough"]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-mode" forFilter: "gradient" string: "hough"];
else if ([[o_gradient_mode_pop selectedItem] tag] == 2) else if ([[_gradientModePopup selectedItem] tag] == 2)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-mode" forFilter: "gradient" string: "edge"]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-mode" forFilter: "gradient" string: "edge"];
else else
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-mode" forFilter: "gradient" string: "gradient"]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-mode" forFilter: "gradient" string: "gradient"];
} else if (sender == o_gradient_color_ckb) } else if (sender == _gradientColorCheckbox)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-type" forFilter: "gradient" integer: [o_gradient_color_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-type" forFilter: "gradient" integer: [_gradientColorCheckbox state]];
else else
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-cartoon" forFilter: "gradient" boolean: [o_gradient_cartoon_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "gradient-cartoon" forFilter: "gradient" boolean: [_gradientCartoonCheckbox state]];
} }
- (IBAction)enableExtract:(id)sender - (IBAction)enableExtract:(id)sender
{ {
BOOL b_state = [o_extract_ckb state]; BOOL b_state = [_extractCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "extract" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "extract" on: b_state];
[o_extract_fld setEnabled: b_state]; [_extractTextField setEnabled: b_state];
[o_extract_lbl setEnabled: b_state]; [_extractLabel setEnabled: b_state];
} }
- (IBAction)extractModifierChanged:(id)sender - (IBAction)extractModifierChanged:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "extract-component" forFilter: "extract" integer: [o_extract_fld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "extract-component" forFilter: "extract" integer: [_extractTextField intValue]];
} }
- (IBAction)enableInvert:(id)sender - (IBAction)enableInvert:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "invert" on: [o_invert_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "invert" on: [_invertCheckbox state]];
} }
- (IBAction)enablePosterize:(id)sender - (IBAction)enablePosterize:(id)sender
{ {
BOOL b_state = [o_posterize_ckb state]; BOOL b_state = [_posterizeCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "posterize" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "posterize" on: b_state];
[o_posterize_fld setEnabled: b_state]; [_posterizeTextField setEnabled: b_state];
[o_posterize_stp setEnabled: b_state]; [_posterizeStepper setEnabled: b_state];
[o_posterize_lbl setEnabled: b_state]; [_posterizeLabel setEnabled: b_state];
} }
- (IBAction)posterizeModifierChanged:(id)sender - (IBAction)posterizeModifierChanged:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "posterize-level" forFilter: "posterize" integer: [o_posterize_fld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "posterize-level" forFilter: "posterize" integer: [_posterizeTextField intValue]];
} }
- (IBAction)enableBlur:(id)sender - (IBAction)enableBlur:(id)sender
{ {
BOOL b_state = [o_blur_ckb state]; BOOL b_state = [_blurCheckbox state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "motionblur" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "motionblur" on: b_state];
[o_blur_sld setEnabled: b_state]; [_blurSlider setEnabled: b_state];
[o_blur_lbl setEnabled: b_state]; [_blurLabel setEnabled: b_state];
} }
- (IBAction)blurModifierChanged:(id)sender - (IBAction)blurModifierChanged:(id)sender
...@@ -1137,76 +1142,76 @@ ...@@ -1137,76 +1142,76 @@
- (IBAction)enableMotionDetect:(id)sender - (IBAction)enableMotionDetect:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "motiondetect" on: [o_motiondetect_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "motiondetect" on: [_motiondetectCheckbox state]];
} }
- (IBAction)enableWaterEffect:(id)sender - (IBAction)enableWaterEffect:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "ripple" on: [o_watereffect_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "ripple" on: [_watereffectCheckbox state]];
} }
- (IBAction)enableWaves:(id)sender - (IBAction)enableWaves:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "wave" on: [o_waves_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "wave" on: [_wavesCheckbox state]];
} }
- (IBAction)enablePsychedelic:(id)sender - (IBAction)enablePsychedelic:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "psychedelic" on: [o_psychedelic_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "psychedelic" on: [_psychedelicCheckbox state]];
} }
#pragma mark - #pragma mark -
#pragma mark Miscellaneous #pragma mark Miscellaneous
- (IBAction)enableAddText:(id)sender - (IBAction)enableAddText:(id)sender
{ {
BOOL b_state = [o_addtext_ckb state]; BOOL b_state = [_addTextCheckbox state];
VLCCoreInteraction *vci_si = [VLCCoreInteraction sharedInstance]; VLCCoreInteraction *vci_si = [VLCCoreInteraction sharedInstance];
[o_addtext_pos_pop setEnabled: b_state]; [_addTextPositionPopup setEnabled: b_state];
[o_addtext_pos_lbl setEnabled: b_state]; [_addTextPositionLabel setEnabled: b_state];
[o_addtext_text_lbl setEnabled: b_state]; [_addTextTextLabel setEnabled: b_state];
[o_addtext_text_fld setEnabled: b_state]; [_addTextTextTextField setEnabled: b_state];
[vci_si setVideoFilter: "marq" on: b_state]; [vci_si setVideoFilter: "marq" on: b_state];
[vci_si setVideoFilterProperty: "marq-marquee" forFilter: "marq" string: [[o_addtext_text_fld stringValue] UTF8String]]; [vci_si setVideoFilterProperty: "marq-marquee" forFilter: "marq" string: [[_addTextTextTextField stringValue] UTF8String]];
[vci_si setVideoFilterProperty: "marq-position" forFilter: "marq" integer: [[o_addtext_pos_pop selectedItem] tag]]; [vci_si setVideoFilterProperty: "marq-position" forFilter: "marq" integer: [[_addTextPositionPopup selectedItem] tag]];
} }
- (IBAction)addTextModifierChanged:(id)sender - (IBAction)addTextModifierChanged:(id)sender
{ {
if (sender == o_addtext_text_fld) if (sender == _addTextTextTextField)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "marq-marquee" forFilter: "marq" string:[[o_addtext_text_fld stringValue] UTF8String]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "marq-marquee" forFilter: "marq" string:[[_addTextTextTextField stringValue] UTF8String]];
else else
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "marq-position" forFilter: "marq" integer: [[o_addtext_pos_pop selectedItem] tag]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "marq-position" forFilter: "marq" integer: [[_addTextPositionPopup selectedItem] tag]];
} }
- (IBAction)enableAddLogo:(id)sender - (IBAction)enableAddLogo:(id)sender
{ {
BOOL b_state = [o_addlogo_ckb state]; BOOL b_state = [_addLogoCheckbox state];
[o_addlogo_pos_pop setEnabled: b_state]; [_addLogoPositionPopup setEnabled: b_state];
[o_addlogo_pos_lbl setEnabled: b_state]; [_addLogoPositionLabel setEnabled: b_state];
[o_addlogo_logo_fld setEnabled: b_state]; [_addLogoLogoTextField setEnabled: b_state];
[o_addlogo_logo_lbl setEnabled: b_state]; [_addLogoLogoLabel setEnabled: b_state];
[o_addlogo_transparency_sld setEnabled: b_state]; [_addLogoTransparencySlider setEnabled: b_state];
[o_addlogo_transparency_lbl setEnabled: b_state]; [_addLogoTransparencyLabel setEnabled: b_state];
[[VLCCoreInteraction sharedInstance] setVideoFilter: "logo" on: b_state]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "logo" on: b_state];
} }
- (IBAction)addLogoModifierChanged:(id)sender - (IBAction)addLogoModifierChanged:(id)sender
{ {
if (sender == o_addlogo_logo_fld) if (sender == _addLogoLogoTextField)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "logo-file" forFilter: "logo" string: [[o_addlogo_logo_fld stringValue] UTF8String]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "logo-file" forFilter: "logo" string: [[_addLogoLogoTextField stringValue] UTF8String]];
else if (sender == o_addlogo_pos_pop) else if (sender == _addLogoPositionPopup)
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "logo-position" forFilter: "logo" integer: [[o_addlogo_pos_pop selectedItem] tag]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "logo-position" forFilter: "logo" integer: [[_addLogoPositionPopup selectedItem] tag]];
else { else {
[[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "logo-opacity" forFilter: "logo" integer: [o_addlogo_transparency_sld intValue]]; [[VLCCoreInteraction sharedInstance] setVideoFilterProperty: "logo-opacity" forFilter: "logo" integer: [_addLogoTransparencySlider intValue]];
[o_addlogo_transparency_sld setToolTip: [NSString stringWithFormat:@"%i", [o_addlogo_transparency_sld intValue]]]; [_addLogoTransparencySlider setToolTip: [NSString stringWithFormat:@"%i", [_addLogoTransparencySlider intValue]]];
} }
} }
- (IBAction)enableAnaglyph:(id)sender - (IBAction)enableAnaglyph:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] setVideoFilter: "anaglyph" on: [o_anaglyph_ckb state]]; [[VLCCoreInteraction sharedInstance] setVideoFilter: "anaglyph" on: [_anaglyphCheckbox state]];
} }
@end @end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment