Skip to content

V
vlc-gpu
Commit a85d2c12 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: expose the 'Karaoke' filter in the UI because we can 

Manual backport of 79a5d68775e135b0f7337d5300a03875588f459d since it doesn't introduce new strings.
parent fb7e2b90
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 7 deletions
NEWS
View file @ a85d2c12
...@@ -43,6 +43,7 @@ Mac OS X: ...@@ -43,6 +43,7 @@ Mac OS X:
* Improve system sleep behavior when playing audio-only media. The screen is * Improve system sleep behavior when playing audio-only media. The screen is
allowed to sleep while the system is kept awake during playback. allowed to sleep while the system is kept awake during playback.
* Fix code signing of Delete Preferences application * Fix code signing of Delete Preferences application
* Add option to Audio Effects panel to activate the Karaoke filter
Miscellaneous: Miscellaneous:
* Fix Notify (D-Bus) plugin deadlock. * Fix Notify (D-Bus) plugin deadlock.
......
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
View file @ a85d2c12
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">11C74</string> <string key="IBDocument.SystemVersion">11G56</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1138.23</string> <string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">567.00</string> <string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/> <integer value="340"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -1792,6 +1792,30 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -1792,6 +1792,30 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<int key="BGButtonType">3</int> <int key="BGButtonType">3</int>
</object> </object>
</object> </object>
<object class="NSButton" id="660611513">
<reference key="NSNextResponder" ref="195046814"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{14, 70}, {335, 18}}</string>
<reference key="NSSuperview" ref="195046814"/>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDButtonCell" key="NSCell" id="343695949">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Karaoke</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="660611513"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="805441668"/>
<reference key="NSAlternateImage" ref="9271868"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
<string key="themeKey">gradientTheme</string>
<int key="BGButtonType">3</int>
</object>
</object>
</object> </object>
<string key="NSFrame">{{10, 33}, {404, 177}}</string> <string key="NSFrame">{{10, 33}, {404, 177}}</string>
<reference key="NSSuperview" ref="876119583"/> <reference key="NSSuperview" ref="876119583"/>
...@@ -2587,6 +2611,22 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -2587,6 +2611,22 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object> </object>
<int key="connectionID">663</int> <int key="connectionID">663</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_filter_karaoke_ckb</string>
<reference key="source" ref="687991793"/>
<reference key="destination" ref="660611513"/>
</object>
<int key="connectionID">703</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">filter_enableKaraoke:</string>
<reference key="source" ref="687991793"/>
<reference key="destination" ref="660611513"/>
</object>
<int key="connectionID">704</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
...@@ -3829,6 +3869,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -3829,6 +3869,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<reference ref="955449777"/> <reference ref="955449777"/>
<reference ref="743541601"/> <reference ref="743541601"/>
<reference ref="150505351"/> <reference ref="150505351"/>
<reference ref="660611513"/>
</object> </object>
<reference key="parent" ref="305143588"/> <reference key="parent" ref="305143588"/>
</object> </object>
...@@ -3926,6 +3967,20 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -3926,6 +3967,20 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<reference key="object" ref="846216840"/> <reference key="object" ref="846216840"/>
<reference key="parent" ref="235290804"/> <reference key="parent" ref="235290804"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">701</int>
<reference key="object" ref="660611513"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="343695949"/>
</object>
<reference key="parent" ref="195046814"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">702</int>
<reference key="object" ref="343695949"/>
<reference key="parent" ref="660611513"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -4250,6 +4305,9 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4250,6 +4305,9 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>621.IBPluginDependency</string> <string>621.IBPluginDependency</string>
<string>621.IBViewBoundsToFrameTransform</string> <string>621.IBViewBoundsToFrameTransform</string>
<string>622.IBPluginDependency</string> <string>622.IBPluginDependency</string>
<string>701.IBPluginDependency</string>
<string>701.IBViewBoundsToFrameTransform</string>
<string>702.IBPluginDependency</string>
<string>80.IBAttributePlaceholdersKey</string> <string>80.IBAttributePlaceholdersKey</string>
<string>80.IBPluginDependency</string> <string>80.IBPluginDependency</string>
<string>80.IBViewBoundsToFrameTransform</string> <string>80.IBViewBoundsToFrameTransform</string>
...@@ -4737,6 +4795,11 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4737,6 +4795,11 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDsAAAwxcAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABDsAAAwxcAAA</bytes>
</object> </object>
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAADCzgAAwqQAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSMutableDictionary"> <object class="NSMutableDictionary">
<string key="NS.key.0">InitialTabViewItem</string> <string key="NS.key.0">InitialTabViewItem</string>
<object class="IBInitialTabViewItemAttribute" key="NS.object.0"> <object class="IBInitialTabViewItemAttribute" key="NS.object.0">
...@@ -4810,7 +4873,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4810,7 +4873,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">700</int> <int key="maxID">704</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
...@@ -4830,6 +4893,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4830,6 +4893,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>eq_preampSliderUpdated:</string> <string>eq_preampSliderUpdated:</string>
<string>eq_twopass:</string> <string>eq_twopass:</string>
<string>filter_enableHeadPhoneVirt:</string> <string>filter_enableHeadPhoneVirt:</string>
<string>filter_enableKaraoke:</string>
<string>filter_enableVolumeNorm:</string> <string>filter_enableVolumeNorm:</string>
<string>filter_volNormSliderUpdated:</string> <string>filter_volNormSliderUpdated:</string>
<string>resetCompressorValues:</string> <string>resetCompressorValues:</string>
...@@ -4855,6 +4919,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4855,6 +4919,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="actionInfosByName"> <object class="NSMutableDictionary" key="actionInfosByName">
...@@ -4869,6 +4934,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4869,6 +4934,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>eq_preampSliderUpdated:</string> <string>eq_preampSliderUpdated:</string>
<string>eq_twopass:</string> <string>eq_twopass:</string>
<string>filter_enableHeadPhoneVirt:</string> <string>filter_enableHeadPhoneVirt:</string>
<string>filter_enableKaraoke:</string>
<string>filter_enableVolumeNorm:</string> <string>filter_enableVolumeNorm:</string>
<string>filter_volNormSliderUpdated:</string> <string>filter_volNormSliderUpdated:</string>
<string>resetCompressorValues:</string> <string>resetCompressorValues:</string>
...@@ -4911,6 +4977,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4911,6 +4977,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string key="name">filter_enableHeadPhoneVirt:</string> <string key="name">filter_enableHeadPhoneVirt:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo">
<string key="name">filter_enableKaraoke:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">filter_enableVolumeNorm:</string> <string key="name">filter_enableVolumeNorm:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
...@@ -4984,6 +5054,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -4984,6 +5054,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>o_eq_presets_popup</string> <string>o_eq_presets_popup</string>
<string>o_eq_twopass_ckb</string> <string>o_eq_twopass_ckb</string>
<string>o_filter_headPhone_ckb</string> <string>o_filter_headPhone_ckb</string>
<string>o_filter_karaoke_ckb</string>
<string>o_filter_normLevel_ckb</string> <string>o_filter_normLevel_ckb</string>
<string>o_filter_normLevel_lbl</string> <string>o_filter_normLevel_lbl</string>
<string>o_filter_normLevel_sld</string> <string>o_filter_normLevel_sld</string>
...@@ -5070,6 +5141,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -5070,6 +5141,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
...@@ -5115,6 +5187,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -5115,6 +5187,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>o_eq_presets_popup</string> <string>o_eq_presets_popup</string>
<string>o_eq_twopass_ckb</string> <string>o_eq_twopass_ckb</string>
<string>o_filter_headPhone_ckb</string> <string>o_filter_headPhone_ckb</string>
<string>o_filter_karaoke_ckb</string>
<string>o_filter_normLevel_ckb</string> <string>o_filter_normLevel_ckb</string>
<string>o_filter_normLevel_lbl</string> <string>o_filter_normLevel_lbl</string>
<string>o_filter_normLevel_sld</string> <string>o_filter_normLevel_sld</string>
...@@ -5296,6 +5369,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -5296,6 +5369,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string key="name">o_filter_headPhone_ckb</string> <string key="name">o_filter_headPhone_ckb</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">o_filter_karaoke_ckb</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">o_filter_normLevel_ckb</string> <string key="name">o_filter_normLevel_ckb</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
...@@ -5416,8 +5493,8 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes> ...@@ -5416,8 +5493,8 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>{9, 8}</string> <string>{11, 11}</string>
<string>{7, 2}</string> <string>{10, 3}</string>
<string>{15, 15}</string> <string>{15, 15}</string>
</object> </object>
</object> </object>
......
modules/gui/macosx/AudioEffects.h
View file @ a85d2c12
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,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 */
...@@ -132,5 +133,6 @@ ...@@ -132,5 +133,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 @ a85d2c12
...@@ -97,6 +97,7 @@ static VLCAudioEffects *_o_sharedInstance = nil; ...@@ -97,6 +97,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")];
...@@ -609,10 +610,12 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf, ...@@ -609,10 +610,12 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
{ {
[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_karaoke_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" )];
} }
...@@ -640,4 +643,9 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf, ...@@ -640,4 +643,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
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