Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
4b709298
Commit
4b709298
authored
Jan 07, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: re-add the 'Reset' button to the image adjust filter, since it used be present in the past
parent
a690ab37
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
108 additions
and
11 deletions
+108
-11
extras/package/macosx/Resources/English.lproj/VideoEffects.xib
...s/package/macosx/Resources/English.lproj/VideoEffects.xib
+86
-7
modules/gui/macosx/VideoEffects.h
modules/gui/macosx/VideoEffects.h
+2
-1
modules/gui/macosx/VideoEffects.m
modules/gui/macosx/VideoEffects.m
+20
-3
No files found.
extras/package/macosx/Resources/English.lproj/VideoEffects.xib
View file @
4b709298
This diff is collapsed.
Click to expand it.
modules/gui/macosx/VideoEffects.h
View file @
4b709298
/*****************************************************************************
/*****************************************************************************
* VideoEffects.h: MacOS X interface module
* VideoEffects.h: MacOS X interface module
*****************************************************************************
*****************************************************************************
* Copyright (C) 2011 Felix Paul Kühne
* Copyright (C) 2011
-2012
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>
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
IBOutlet
id
o_adjust_saturation_sld
;
IBOutlet
id
o_adjust_saturation_sld
;
IBOutlet
id
o_adjust_gamma_lbl
;
IBOutlet
id
o_adjust_gamma_lbl
;
IBOutlet
id
o_adjust_gamma_sld
;
IBOutlet
id
o_adjust_gamma_sld
;
IBOutlet
id
o_adjust_reset_btn
;
IBOutlet
id
o_sharpen_ckb
;
IBOutlet
id
o_sharpen_ckb
;
IBOutlet
id
o_sharpen_lbl
;
IBOutlet
id
o_sharpen_lbl
;
IBOutlet
id
o_sharpen_sld
;
IBOutlet
id
o_sharpen_sld
;
...
...
modules/gui/macosx/VideoEffects.m
View file @
4b709298
/*****************************************************************************
/*****************************************************************************
* VideoEffects.m: MacOS X interface module
* VideoEffects.m: MacOS X interface module
*****************************************************************************
*****************************************************************************
* Copyright (C) 2011 Felix Paul Kühne
* Copyright (C) 2011
-2012
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>
...
@@ -78,6 +78,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
...
@@ -78,6 +78,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[
o_adjust_brightness_ckb
setTitle
:
_NS
(
"Brightness Threshold"
)];
[
o_adjust_brightness_ckb
setTitle
:
_NS
(
"Brightness Threshold"
)];
[
o_adjust_saturation_lbl
setStringValue
:
_NS
(
"Saturation"
)];
[
o_adjust_saturation_lbl
setStringValue
:
_NS
(
"Saturation"
)];
[
o_adjust_gamma_lbl
setStringValue
:
_NS
(
"Gamma"
)];
[
o_adjust_gamma_lbl
setStringValue
:
_NS
(
"Gamma"
)];
[
o_adjust_reset_btn
setTitle
:
_NS
(
"Reset"
)];
[
o_sharpen_ckb
setTitle
:
_NS
(
"Sharpen"
)];
[
o_sharpen_ckb
setTitle
:
_NS
(
"Sharpen"
)];
[
o_sharpen_lbl
setStringValue
:
_NS
(
"Sigma"
)];
[
o_sharpen_lbl
setStringValue
:
_NS
(
"Sigma"
)];
[
o_banding_ckb
setTitle
:
_NS
(
"Banding removal"
)];
[
o_banding_ckb
setTitle
:
_NS
(
"Banding removal"
)];
...
@@ -246,6 +247,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
...
@@ -246,6 +247,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[
o_adjust_gamma_lbl
setEnabled
:
b_state
];
[
o_adjust_gamma_lbl
setEnabled
:
b_state
];
[
o_adjust_hue_lbl
setEnabled
:
b_state
];
[
o_adjust_hue_lbl
setEnabled
:
b_state
];
[
o_adjust_saturation_lbl
setEnabled
:
b_state
];
[
o_adjust_saturation_lbl
setEnabled
:
b_state
];
[
o_adjust_reset_btn
setEnabled
:
b_state
];
[
o_sharpen_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"sharpen-sigma"
)];
[
o_sharpen_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"sharpen-sigma"
)];
[
o_sharpen_sld
setEnabled
:
[
o_sharpen_ckb
state
]];
[
o_sharpen_sld
setEnabled
:
[
o_sharpen_ckb
state
]];
[
o_sharpen_lbl
setEnabled
:
[
o_sharpen_ckb
state
]];
[
o_sharpen_lbl
setEnabled
:
[
o_sharpen_ckb
state
]];
...
@@ -572,6 +574,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
...
@@ -572,6 +574,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[
o_adjust_hue_lbl
setEnabled
:
b_state
];
[
o_adjust_hue_lbl
setEnabled
:
b_state
];
[
o_adjust_saturation_sld
setEnabled
:
b_state
];
[
o_adjust_saturation_sld
setEnabled
:
b_state
];
[
o_adjust_saturation_lbl
setEnabled
:
b_state
];
[
o_adjust_saturation_lbl
setEnabled
:
b_state
];
[
o_adjust_reset_btn
setEnabled
:
b_state
];
}
}
-
(
IBAction
)
adjustSliderChanged
:(
id
)
sender
-
(
IBAction
)
adjustSliderChanged
:(
id
)
sender
...
@@ -590,6 +593,20 @@ static VLCVideoEffects *_o_sharedInstance = nil;
...
@@ -590,6 +593,20 @@ static VLCVideoEffects *_o_sharedInstance = nil;
-
(
IBAction
)
enableAdjustBrightnessThreshold
:(
id
)
sender
-
(
IBAction
)
enableAdjustBrightnessThreshold
:(
id
)
sender
{
{
if
(
sender
==
o_adjust_reset_btn
)
{
[
o_adjust_brightness_sld
setFloatValue
:
1
.
0
];
[
o_adjust_contrast_sld
setFloatValue
:
1
.
0
];
[
o_adjust_gamma_sld
setFloatValue
:
1
.
0
];
[
o_adjust_hue_sld
setIntValue
:
0
.
0
];
[
o_adjust_saturation_sld
setFloatValue
:
1
.
0
];
[
self
setVideoFilterProperty
:
"brightness"
forFilter
:
"adjust"
float
:
[
o_adjust_brightness_sld
floatValue
]];
[
self
setVideoFilterProperty
:
"contrast"
forFilter
:
"adjust"
float
:
[
o_adjust_contrast_sld
floatValue
]];
[
self
setVideoFilterProperty
:
"gamma"
forFilter
:
"adjust"
float
:
[
o_adjust_gamma_sld
floatValue
]];
[
self
setVideoFilterProperty
:
"hue"
forFilter
:
"adjust"
integer
:
[
o_adjust_hue_sld
intValue
]];
[
self
setVideoFilterProperty
:
"saturation"
forFilter
:
"adjust"
float
:
[
o_adjust_saturation_sld
floatValue
]];
}
else
config_PutInt
(
p_intf
,
"brightness-threshold"
,
[
o_adjust_brightness_ckb
state
]
);
config_PutInt
(
p_intf
,
"brightness-threshold"
,
[
o_adjust_brightness_ckb
state
]
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment