Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
13bedc70
Commit
13bedc70
authored
Apr 10, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: deactivate compressor controls if compressor is disabled
parent
9d676f05
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1710 additions
and
1668 deletions
+1710
-1668
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
...s/package/macosx/Resources/English.lproj/AudioEffects.xib
+1703
-1666
modules/gui/macosx/AudioEffects.h
modules/gui/macosx/AudioEffects.h
+1
-0
modules/gui/macosx/AudioEffects.m
modules/gui/macosx/AudioEffects.m
+6
-2
No files found.
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
View file @
13bedc70
This source diff could not be displayed because it is too large. You can
view the blob
instead.
modules/gui/macosx/AudioEffects.h
View file @
13bedc70
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
IBOutlet
id
o_eq_preamp_sld
;
IBOutlet
id
o_eq_preamp_sld
;
/* Compressor */
/* Compressor */
IBOutlet
id
o_comp_view
;
IBOutlet
id
o_comp_enable_ckb
;
IBOutlet
id
o_comp_enable_ckb
;
IBOutlet
id
o_comp_reset_btn
;
IBOutlet
id
o_comp_reset_btn
;
IBOutlet
id
o_comp_band1_sld
;
IBOutlet
id
o_comp_band1_sld
;
...
...
modules/gui/macosx/AudioEffects.m
View file @
13bedc70
...
@@ -802,14 +802,17 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
...
@@ -802,14 +802,17 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
#pragma mark Compressor
#pragma mark Compressor
-
(
void
)
resetCompressor
-
(
void
)
resetCompressor
{
{
BOOL
b_enable_comp
=
NO
;
char
*
psz_afilters
;
char
*
psz_afilters
;
psz_afilters
=
config_GetPsz
(
p_intf
,
"audio-filter"
);
psz_afilters
=
config_GetPsz
(
p_intf
,
"audio-filter"
);
if
(
psz_afilters
)
{
if
(
psz_afilters
)
{
b_enable_comp
=
strstr
(
psz_afilters
,
"compressor"
)
!=
NULL
;
[
o_comp_enable_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"compressor"
)
];
[
o_comp_enable_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"compressor"
)
];
free
(
psz_afilters
);
free
(
psz_afilters
);
}
}
else
[
o_comp_enable_ckb
setState
:
NSOffState
];
[
o_comp_view
enableSubviews
:
b_enable_comp
];
[
o_comp_enable_ckb
setState
:(
b_enable_comp
?
NSOnState
:
NSOffState
)];
[
o_comp_band1_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"compressor-rms-peak"
)];
[
o_comp_band1_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"compressor-rms-peak"
)];
[
o_comp_band1_fld
setStringValue
:[
NSString
localizedStringWithFormat
:
@"%1.1f"
,
[
o_comp_band1_sld
floatValue
]]];
[
o_comp_band1_fld
setStringValue
:[
NSString
localizedStringWithFormat
:
@"%1.1f"
,
[
o_comp_band1_sld
floatValue
]]];
...
@@ -853,6 +856,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
...
@@ -853,6 +856,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
-
(
IBAction
)
comp_enable
:(
id
)
sender
-
(
IBAction
)
comp_enable
:(
id
)
sender
{
{
[
o_comp_view
enableSubviews
:[
sender
state
]];
[
self
setAudioFilter
:
"compressor"
on
:[
sender
state
]];
[
self
setAudioFilter
:
"compressor"
on
:[
sender
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