Skip to content

V
vlc-2-2
Commit 79a5d687 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

parent 85aa3320
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 6 deletions
extras/package/macosx/Resources/English.lproj/AudioEffects.xib
View file @ 79a5d687
......@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">11G45</string>
<string key="IBDocument.SystemVersion">11G56</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
......@@ -21,7 +21,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2"/>
<integer value="340"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1792,6 +1792,30 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<int key="BGButtonType">3</int>
</object>
</object>
<object class="NSButton" id="824357464">
<reference key="NSNextResponder" ref="195046814"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{14, 84}, {335, 18}}</string>
<reference key="NSSuperview" ref="195046814"/>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDButtonCell" key="NSCell" id="636972240">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Karaoke</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="824357464"/>
<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>
<string key="NSFrame">{{10, 33}, {404, 177}}</string>
<reference key="NSSuperview" ref="876119583"/>
......@@ -2669,6 +2693,22 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object>
<int key="connectionID">708</int>
</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="824357464"/>
</object>
<int key="connectionID">712</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="824357464"/>
</object>
<int key="connectionID">713</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -3912,6 +3952,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<reference ref="955449777"/>
<reference ref="743541601"/>
<reference ref="150505351"/>
<reference ref="824357464"/>
</object>
<reference key="parent" ref="305143588"/>
</object>
......@@ -4053,6 +4094,20 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<reference key="object" ref="121725632"/>
<reference key="parent" ref="580552820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">709</int>
<reference key="object" ref="824357464"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="636972240"/>
</object>
<reference key="parent" ref="195046814"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">710</int>
<reference key="object" ref="636972240"/>
<reference key="parent" ref="824357464"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -4384,6 +4439,9 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>704.IBPluginDependency</string>
<string>705.IBPluginDependency</string>
<string>706.IBPluginDependency</string>
<string>709.IBPluginDependency</string>
<string>709.IBViewBoundsToFrameTransform</string>
<string>710.IBPluginDependency</string>
<string>80.IBAttributePlaceholdersKey</string>
<string>80.IBPluginDependency</string>
<string>80.IBViewBoundsToFrameTransform</string>
......@@ -4422,9 +4480,9 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{531, 363}, {409, 255}}</string>
<string>{{528, 235}, {409, 255}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{531, 363}, {409, 255}}</string>
<string>{{528, 235}, {409, 255}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
......@@ -4854,7 +4912,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCDAAAwy8AAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwywAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
......@@ -4880,6 +4938,11 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBmAAAwycAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">InitialTabViewItem</string>
<object class="IBInitialTabViewItemAttribute" key="NS.object.0">
......@@ -4953,7 +5016,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">708</int>
<int key="maxID">713</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -4965,6 +5028,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addAudioEffectsProfile:</string>
<string>comp_enable:</string>
<string>comp_sliderUpdated:</string>
<string>eq_bandSliderUpdated:</string>
......@@ -4973,9 +5037,11 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>eq_preampSliderUpdated:</string>
<string>eq_twopass:</string>
<string>filter_enableHeadPhoneVirt:</string>
<string>filter_enableKaraoke:</string>
<string>filter_enableVolumeNorm:</string>
<string>filter_volNormSliderUpdated:</string>
<string>profileSelectorAction:</string>
<string>removeAudioEffectsProfile:</string>
<string>resetCompressorValues:</string>
<string>resetSpatializerValues:</string>
<string>spat_enable:</string>
......@@ -5000,12 +5066,16 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addAudioEffectsProfile:</string>
<string>comp_enable:</string>
<string>comp_sliderUpdated:</string>
<string>eq_bandSliderUpdated:</string>
......@@ -5014,9 +5084,11 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>eq_preampSliderUpdated:</string>
<string>eq_twopass:</string>
<string>filter_enableHeadPhoneVirt:</string>
<string>filter_enableKaraoke:</string>
<string>filter_enableVolumeNorm:</string>
<string>filter_volNormSliderUpdated:</string>
<string>profileSelectorAction:</string>
<string>removeAudioEffectsProfile:</string>
<string>resetCompressorValues:</string>
<string>resetSpatializerValues:</string>
<string>spat_enable:</string>
......@@ -5025,6 +5097,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">addAudioEffectsProfile:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">comp_enable:</string>
<string key="candidateClassName">id</string>
......@@ -5057,6 +5133,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string key="name">filter_enableHeadPhoneVirt:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">filter_enableKaraoke:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">filter_enableVolumeNorm:</string>
<string key="candidateClassName">id</string>
......@@ -5069,6 +5149,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string key="name">profileSelectorAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">removeAudioEffectsProfile:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">resetCompressorValues:</string>
<string key="candidateClassName">id</string>
......@@ -5134,6 +5218,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>o_eq_presets_popup</string>
<string>o_eq_twopass_ckb</string>
<string>o_filter_headPhone_ckb</string>
<string>o_filter_karaoke_ckb</string>
<string>o_filter_normLevel_ckb</string>
<string>o_filter_normLevel_lbl</string>
<string>o_filter_normLevel_sld</string>
......@@ -5222,6 +5307,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -5267,6 +5353,7 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string>o_eq_presets_popup</string>
<string>o_eq_twopass_ckb</string>
<string>o_filter_headPhone_ckb</string>
<string>o_filter_karaoke_ckb</string>
<string>o_filter_normLevel_ckb</string>
<string>o_filter_normLevel_lbl</string>
<string>o_filter_normLevel_sld</string>
......@@ -5449,6 +5536,10 @@ AADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AAA</bytes>
<string key="name">o_filter_headPhone_ckb</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_filter_karaoke_ckb</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_filter_normLevel_ckb</string>
<string key="candidateClassName">id</string>
......
modules/gui/macosx/AudioEffects.h
View file @ 79a5d687
......@@ -98,6 +98,7 @@
IBOutlet id o_filter_normLevel_ckb;
IBOutlet id o_filter_normLevel_sld;
IBOutlet id o_filter_normLevel_lbl;
IBOutlet id o_filter_karaoke_ckb;
}
/* generic */
......@@ -137,5 +138,6 @@
- (IBAction)filter_enableHeadPhoneVirt:(id)sender;
- (IBAction)filter_enableVolumeNorm:(id)sender;
- (IBAction)filter_volNormSliderUpdated:(id)sender;
- (IBAction)filter_enableKaraoke:(id)sender;
@end
modules/gui/macosx/AudioEffects.m
View file @ 79a5d687
......@@ -132,6 +132,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
[o_filter_headPhone_ckb setTitle:_NS("Headphone virtualization")];
[o_filter_normLevel_ckb setTitle:_NS("Volume normalization")];
[o_filter_normLevel_lbl setStringValue:_NS("Maximum level")];
[o_filter_karaoke_ckb setTitle:_NS("Karaoke")];
/* generic */
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"equalizer"]] setLabel:_NS("Equalizer")];
......@@ -233,6 +234,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
aout_EnableFilter(p_playlist, "compressor", false);
aout_EnableFilter(p_playlist, "headphone", false);
aout_EnableFilter(p_playlist, "normvol", false);
aout_EnableFilter(p_playlist, "karaoke", false);
}
/* fetch preset */
......@@ -977,10 +979,12 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
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_normLevel_ckb setState: (NSInteger)strstr(psz_afilters, "karaoke") ];
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 setFloatValue: config_GetFloat(p_intf, "norm-max-level")];
}
......@@ -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]);
}
- (IBAction)filter_enableKaraoke:(id)sender
{
[self setAudioFilter: "karaoke" on:[sender state]];
}
@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