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
5ca7a2f0
Commit
5ca7a2f0
authored
Apr 10, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: disable normvol slider if filter is disabled
parent
ef7d8891
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
206 additions
and
141 deletions
+206
-141
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
...s/package/macosx/Resources/English.lproj/AudioEffects.xib
+197
-139
modules/gui/macosx/AudioEffects.m
modules/gui/macosx/AudioEffects.m
+9
-2
No files found.
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
View file @
5ca7a2f0
This diff is collapsed.
Click to expand it.
modules/gui/macosx/AudioEffects.m
View file @
5ca7a2f0
...
...
@@ -993,18 +993,23 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
#pragma mark Filter
-
(
void
)
resetAudioFilters
{
BOOL
b_enable_normvol
=
NO
;
char
*
psz_afilters
;
psz_afilters
=
config_GetPsz
(
p_intf
,
"audio-filter"
);
if
(
psz_afilters
)
{
[
o_filter_headPhone_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"headphone"
)
];
[
o_filter_normLevel_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"normvol"
)
];
[
o_filter_karaoke_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"karaoke"
)
];
b_enable_normvol
=
strstr
(
psz_afilters
,
"normvol"
)
!=
NULL
;
free
(
psz_afilters
);
}
else
{
[
o_filter_headPhone_ckb
setState
:
NSOffState
];
[
o_filter_normLevel_ckb
setState
:
NSOffState
];
[
o_filter_karaoke_ckb
setState
:
NSOffState
];
}
[
o_filter_normLevel_sld
setEnabled
:
b_enable_normvol
];
[
o_filter_normLevel_lbl
setEnabled
:
b_enable_normvol
];
[
o_filter_normLevel_ckb
setState
:(
b_enable_normvol
?
NSOnState
:
NSOffState
)];
[
o_filter_normLevel_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"norm-max-level"
)];
}
...
...
@@ -1015,6 +1020,8 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
-
(
IBAction
)
filter_enableVolumeNorm
:(
id
)
sender
{
[
o_filter_normLevel_sld
setEnabled
:[
sender
state
]];
[
o_filter_normLevel_lbl
setEnabled
:[
sender
state
]];
[
self
setAudioFilter
:
"normvol"
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