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
79a5d687
Commit
79a5d687
authored
Sep 29, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: expose the 'Karaoke' filter in the UI because we can
parent
85aa3320
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
108 additions
and
6 deletions
+108
-6
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
...s/package/macosx/Resources/English.lproj/AudioEffects.xib
+97
-6
modules/gui/macosx/AudioEffects.h
modules/gui/macosx/AudioEffects.h
+2
-0
modules/gui/macosx/AudioEffects.m
modules/gui/macosx/AudioEffects.m
+9
-0
No files found.
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
View file @
79a5d687
This diff is collapsed.
Click to expand it.
modules/gui/macosx/AudioEffects.h
View file @
79a5d687
...
@@ -98,6 +98,7 @@
...
@@ -98,6 +98,7 @@
IBOutlet
id
o_filter_normLevel_ckb
;
IBOutlet
id
o_filter_normLevel_ckb
;
IBOutlet
id
o_filter_normLevel_sld
;
IBOutlet
id
o_filter_normLevel_sld
;
IBOutlet
id
o_filter_normLevel_lbl
;
IBOutlet
id
o_filter_normLevel_lbl
;
IBOutlet
id
o_filter_karaoke_ckb
;
}
}
/* generic */
/* generic */
...
@@ -137,5 +138,6 @@
...
@@ -137,5 +138,6 @@
-
(
IBAction
)
filter_enableHeadPhoneVirt
:(
id
)
sender
;
-
(
IBAction
)
filter_enableHeadPhoneVirt
:(
id
)
sender
;
-
(
IBAction
)
filter_enableVolumeNorm
:(
id
)
sender
;
-
(
IBAction
)
filter_enableVolumeNorm
:(
id
)
sender
;
-
(
IBAction
)
filter_volNormSliderUpdated
:(
id
)
sender
;
-
(
IBAction
)
filter_volNormSliderUpdated
:(
id
)
sender
;
-
(
IBAction
)
filter_enableKaraoke
:(
id
)
sender
;
@end
@end
modules/gui/macosx/AudioEffects.m
View file @
79a5d687
...
@@ -132,6 +132,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
...
@@ -132,6 +132,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
[
o_filter_headPhone_ckb
setTitle
:
_NS
(
"Headphone virtualization"
)];
[
o_filter_headPhone_ckb
setTitle
:
_NS
(
"Headphone virtualization"
)];
[
o_filter_normLevel_ckb
setTitle
:
_NS
(
"Volume normalization"
)];
[
o_filter_normLevel_ckb
setTitle
:
_NS
(
"Volume normalization"
)];
[
o_filter_normLevel_lbl
setStringValue
:
_NS
(
"Maximum level"
)];
[
o_filter_normLevel_lbl
setStringValue
:
_NS
(
"Maximum level"
)];
[
o_filter_karaoke_ckb
setTitle
:
_NS
(
"Karaoke"
)];
/* generic */
/* generic */
[[
o_tableView
tabViewItemAtIndex
:[
o_tableView
indexOfTabViewItemWithIdentifier
:
@"equalizer"
]]
setLabel
:
_NS
(
"Equalizer"
)];
[[
o_tableView
tabViewItemAtIndex
:[
o_tableView
indexOfTabViewItemWithIdentifier
:
@"equalizer"
]]
setLabel
:
_NS
(
"Equalizer"
)];
...
@@ -233,6 +234,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
...
@@ -233,6 +234,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
aout_EnableFilter
(
p_playlist
,
"compressor"
,
false
);
aout_EnableFilter
(
p_playlist
,
"compressor"
,
false
);
aout_EnableFilter
(
p_playlist
,
"headphone"
,
false
);
aout_EnableFilter
(
p_playlist
,
"headphone"
,
false
);
aout_EnableFilter
(
p_playlist
,
"normvol"
,
false
);
aout_EnableFilter
(
p_playlist
,
"normvol"
,
false
);
aout_EnableFilter
(
p_playlist
,
"karaoke"
,
false
);
}
}
/* fetch preset */
/* fetch preset */
...
@@ -977,10 +979,12 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
...
@@ -977,10 +979,12 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
if
(
psz_afilters
)
{
if
(
psz_afilters
)
{
[
o_filter_headPhone_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"headphone"
)
];
[
o_filter_headPhone_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"headphone"
)
];
[
o_filter_normLevel_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"normvol"
)
];
[
o_filter_normLevel_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"normvol"
)
];
[
o_filter_normLevel_ckb
setState
:
(
NSInteger
)
strstr
(
psz_afilters
,
"karaoke"
)
];
free
(
psz_afilters
);
free
(
psz_afilters
);
}
else
{
}
else
{
[
o_filter_headPhone_ckb
setState
:
NSOffState
];
[
o_filter_headPhone_ckb
setState
:
NSOffState
];
[
o_filter_normLevel_ckb
setState
:
NSOffState
];
[
o_filter_normLevel_ckb
setState
:
NSOffState
];
[
o_filter_karaoke_ckb
setState
:
NSOffState
];
}
}
[
o_filter_normLevel_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"norm-max-level"
)];
[
o_filter_normLevel_sld
setFloatValue
:
config_GetFloat
(
p_intf
,
"norm-max-level"
)];
}
}
...
@@ -1007,4 +1011,9 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
...
@@ -1007,4 +1011,9 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
config_PutFloat
(
p_intf
,
"norm-max-level"
,
[
o_filter_normLevel_sld
floatValue
]);
config_PutFloat
(
p_intf
,
"norm-max-level"
,
[
o_filter_normLevel_sld
floatValue
]);
}
}
-
(
IBAction
)
filter_enableKaraoke
:(
id
)
sender
{
[
self
setAudioFilter
:
"karaoke"
on
:[
sender
state
]];
}
@end
@end
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