Skip to content

V
vlc-1.1
Commit 4dccfee4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed behaviour of the volnorm settings for trunk too

parent d805d20d
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 345 deletions
extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
View file @ 4dccfee4
<?xml version="1.0" encoding="UTF-8"?> {
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> IBClasses = (
<plist version="1.0"> {
<dict> CLASS = FirstResponder;
<key>IBClasses</key> LANGUAGE = ObjC;
<array> SUPERCLASS = NSObject;
<dict> },
<key>CLASS</key> {
<string>NSApplication</string> CLASS = NSApplication;
<key>LANGUAGE</key> LANGUAGE = ObjC;
<string>ObjC</string> SUPERCLASS = NSResponder;
<key>SUPERCLASS</key> },
<string>NSResponder</string> {
</dict> CLASS = NSObject;
<dict> LANGUAGE = ObjC;
<key>CLASS</key> },
<string>VLCHotkeyChangeWindow</string> {
<key>LANGUAGE</key> CLASS = VLCHotkeyChangeWindow;
<string>ObjC</string> LANGUAGE = ObjC;
<key>SUPERCLASS</key> SUPERCLASS = NSWindow;
<string>NSWindow</string> },
</dict> {
<dict> ACTIONS = {
<key>ACTIONS</key> buttonAction = id;
<dict> closePrefs = id;
<key>audioSettingChanged</key> resetAll = id;
<string>id</string> savePrefs = id;
<key>buttonAction</key> };
<string>id</string> CLASS = VLCPrefs;
<key>hotkeySettingChanged</key> LANGUAGE = ObjC;
<string>id</string> OUTLETS = {
<key>inputSettingChanged</key> "o_basicFull_matrix" = id;
<string>id</string> "o_cancel_btn" = id;
<key>interfaceSettingChanged</key> "o_prefs_view" = id;
<string>id</string> "o_prefs_window" = id;
<key>osdSettingChanged</key> "o_reset_btn" = id;
<string>id</string> "o_save_btn" = id;
<key>showFontPicker</key> "o_title" = id;
<string>id</string> "o_tree" = id;
<key>videoSettingChanged</key> };
<string>id</string> SUPERCLASS = NSObject;
</dict> },
<key>CLASS</key> {
<string>VLCSimplePrefs</string> ACTIONS = {
<key>LANGUAGE</key> audioSettingChanged = id;
<string>ObjC</string> buttonAction = id;
<key>OUTLETS</key> hotkeySettingChanged = id;
<dict> inputSettingChanged = id;
<key>o_audio_dolby_pop</key> interfaceSettingChanged = id;
<string>id</string> osdSettingChanged = id;
<key>o_audio_dolby_txt</key> showFontPicker = id;
<string>id</string> videoSettingChanged = id;
<key>o_audio_effects_box</key> };
<string>id</string> CLASS = VLCSimplePrefs;
<key>o_audio_enable_ckb</key> LANGUAGE = ObjC;
<string>id</string> OUTLETS = {
<key>o_audio_general_box</key> "o_audio_dolby_pop" = id;
<string>id</string> "o_audio_dolby_txt" = id;
<key>o_audio_headphone_ckb</key> "o_audio_effects_box" = id;
<string>id</string> "o_audio_enable_ckb" = id;
<key>o_audio_lang_fld</key> "o_audio_general_box" = id;
<string>id</string> "o_audio_headphone_ckb" = id;
<key>o_audio_lang_txt</key> "o_audio_lang_fld" = id;
<string>id</string> "o_audio_lang_txt" = id;
<key>o_audio_last_box</key> "o_audio_last_box" = id;
<string>id</string> "o_audio_last_ckb" = id;
<key>o_audio_last_ckb</key> "o_audio_lastpwd_sfld" = id;
<string>id</string> "o_audio_lastpwd_txt" = id;
<key>o_audio_lastpwd_sfld</key> "o_audio_lastuser_fld" = id;
<string>id</string> "o_audio_lastuser_txt" = id;
<key>o_audio_lastpwd_txt</key> "o_audio_norm_ckb" = id;
<string>id</string> "o_audio_norm_fld" = id;
<key>o_audio_lastuser_fld</key> "o_audio_norm_stepper" = id;
<string>id</string> "o_audio_spdif_ckb" = id;
<key>o_audio_lastuser_txt</key> "o_audio_view" = id;
<string>id</string> "o_audio_visual_pop" = id;
<key>o_audio_norm_ckb</key> "o_audio_visual_txt" = id;
<string>id</string> "o_audio_vol_fld" = id;
<key>o_audio_norm_fld</key> "o_audio_vol_sld" = id;
<string>id</string> "o_audio_vol_txt" = id;
<key>o_audio_spdif_ckb</key> "o_currentlyShownCategoryView" = id;
<string>id</string> "o_hotkeys_change_btn" = id;
<key>o_audio_view</key> "o_hotkeys_change_cancel_btn" = id;
<string>id</string> "o_hotkeys_change_keys_lbl" = id;
<key>o_audio_visual_pop</key> "o_hotkeys_change_lbl" = id;
<string>id</string> "o_hotkeys_change_ok_btn" = id;
<key>o_audio_visual_txt</key> "o_hotkeys_change_taken_lbl" = id;
<string>id</string> "o_hotkeys_change_win" = id;
<key>o_audio_vol_fld</key> "o_hotkeys_clear_btn" = id;
<string>id</string> "o_hotkeys_lbl" = id;
<key>o_audio_vol_sld</key> "o_hotkeys_listbox" = id;
<string>id</string> "o_hotkeys_view" = id;
<key>o_audio_vol_txt</key> "o_input_access_box" = id;
<string>id</string> "o_input_avi_pop" = id;
<key>o_currentlyShownCategoryView</key> "o_input_avi_txt" = id;
<string>id</string> "o_input_bandwidth_ckb" = id;
<key>o_hotkeys_change_btn</key> "o_input_cachelevel_custom_txt" = id;
<string>id</string> "o_input_cachelevel_pop" = id;
<key>o_hotkeys_change_cancel_btn</key> "o_input_cachelevel_txt" = id;
<string>id</string> "o_input_caching_box" = id;
<key>o_hotkeys_change_keys_lbl</key> "o_input_dump_ckb" = id;
<string>id</string> "o_input_httpproxy_fld" = id;
<key>o_hotkeys_change_lbl</key> "o_input_httpproxy_txt" = id;
<string>id</string> "o_input_httpproxypwd_sfld" = id;
<key>o_hotkeys_change_ok_btn</key> "o_input_httpproxypwd_txt" = id;
<string>id</string> "o_input_mux_box" = id;
<key>o_hotkeys_change_taken_lbl</key> "o_input_net_box" = id;
<string>id</string> "o_input_postproc_fld" = id;
<key>o_hotkeys_change_win</key> "o_input_postproc_txt" = id;
<string>id</string> "o_input_record_ckb" = id;
<key>o_hotkeys_clear_btn</key> "o_input_rtsp_ckb" = id;
<string>id</string> "o_input_serverport_fld" = id;
<key>o_hotkeys_lbl</key> "o_input_serverport_txt" = id;
<string>id</string> "o_input_timeshift_ckb" = id;
<key>o_hotkeys_listbox</key> "o_input_view" = id;
<string>id</string> "o_intf_art_pop" = id;
<key>o_hotkeys_view</key> "o_intf_art_txt" = id;
<string>id</string> "o_intf_embedded_ckb" = id;
<key>o_input_access_box</key> "o_intf_fspanel_ckb" = id;
<string>id</string> "o_intf_lang_pop" = id;
<key>o_input_avi_pop</key> "o_intf_lang_txt" = id;
<string>id</string> "o_intf_network_box" = id;
<key>o_input_avi_txt</key> "o_intf_view" = id;
<string>id</string> "o_osd_encoding_pop" = id;
<key>o_input_bandwidth_ckb</key> "o_osd_encoding_txt" = id;
<string>id</string> "o_osd_font_box" = id;
<key>o_input_cachelevel_custom_txt</key> "o_osd_font_btn" = id;
<string>id</string> "o_osd_font_color_pop" = id;
<key>o_input_cachelevel_pop</key> "o_osd_font_color_txt" = id;
<string>id</string> "o_osd_font_fld" = id;
<key>o_input_cachelevel_txt</key> "o_osd_font_size_pop" = id;
<string>id</string> "o_osd_font_size_txt" = id;
<key>o_input_caching_box</key> "o_osd_font_txt" = id;
<string>id</string> "o_osd_lang_box" = id;
<key>o_input_dump_ckb</key> "o_osd_lang_fld" = id;
<string>id</string> "o_osd_lang_txt" = id;
<key>o_input_httpproxy_fld</key> "o_osd_osd_box" = id;
<string>id</string> "o_osd_osd_ckb" = id;
<key>o_input_httpproxy_txt</key> "o_osd_view" = id;
<string>id</string> "o_sprefs_basicFull_matrix" = id;
<key>o_input_httpproxypwd_sfld</key> "o_sprefs_basic_box" = id;
<string>id</string> "o_sprefs_cancel_btn" = id;
<key>o_input_httpproxypwd_txt</key> "o_sprefs_controls_box" = id;
<string>id</string> "o_sprefs_reset_btn" = id;
<key>o_input_mux_box</key> "o_sprefs_save_btn" = id;
<string>id</string> "o_sprefs_win" = id;
<key>o_input_net_box</key> "o_video_black_ckb" = id;
<string>id</string> "o_video_device_pop" = id;
<key>o_input_postproc_fld</key> "o_video_device_txt" = id;
<string>id</string> "o_video_display_box" = id;
<key>o_input_postproc_txt</key> "o_video_enable_ckb" = id;
<string>id</string> "o_video_fullscreen_ckb" = id;
<key>o_input_record_ckb</key> "o_video_onTop_ckb" = id;
<string>id</string> "o_video_output_pop" = id;
<key>o_input_rtsp_ckb</key> "o_video_output_txt" = id;
<string>id</string> "o_video_skipFrames_ckb" = id;
<key>o_input_serverport_fld</key> "o_video_snap_box" = id;
<string>id</string> "o_video_snap_folder_btn" = id;
<key>o_input_serverport_txt</key> "o_video_snap_folder_fld" = id;
<string>id</string> "o_video_snap_folder_txt" = id;
<key>o_input_timeshift_ckb</key> "o_video_snap_format_pop" = id;
<string>id</string> "o_video_snap_format_txt" = id;
<key>o_input_view</key> "o_video_snap_prefix_fld" = id;
<string>id</string> "o_video_snap_prefix_txt" = id;
<key>o_intf_art_pop</key> "o_video_snap_seqnum_ckb" = id;
<string>id</string> "o_video_view" = id;
<key>o_intf_art_txt</key> };
<string>id</string> SUPERCLASS = NSObject;
<key>o_intf_embedded_ckb</key> }
<string>id</string> );
<key>o_intf_fspanel_ckb</key> IBVersion = 1;
<string>id</string> }
<key>o_intf_lang_pop</key> \ No newline at end of file
<string>id</string>
<key>o_intf_lang_txt</key>
<string>id</string>
<key>o_intf_network_box</key>
<string>id</string>
<key>o_intf_view</key>
<string>id</string>
<key>o_osd_encoding_pop</key>
<string>id</string>
<key>o_osd_encoding_txt</key>
<string>id</string>
<key>o_osd_font_box</key>
<string>id</string>
<key>o_osd_font_btn</key>
<string>id</string>
<key>o_osd_font_color_pop</key>
<string>id</string>
<key>o_osd_font_color_txt</key>
<string>id</string>
<key>o_osd_font_fld</key>
<string>id</string>
<key>o_osd_font_size_pop</key>
<string>id</string>
<key>o_osd_font_size_txt</key>
<string>id</string>
<key>o_osd_font_txt</key>
<string>id</string>
<key>o_osd_lang_box</key>
<string>id</string>
<key>o_osd_lang_fld</key>
<string>id</string>
<key>o_osd_lang_txt</key>
<string>id</string>
<key>o_osd_osd_box</key>
<string>id</string>
<key>o_osd_osd_ckb</key>
<string>id</string>
<key>o_osd_view</key>
<string>id</string>
<key>o_sprefs_basicFull_matrix</key>
<string>id</string>
<key>o_sprefs_basic_box</key>
<string>id</string>
<key>o_sprefs_cancel_btn</key>
<string>id</string>
<key>o_sprefs_controls_box</key>
<string>id</string>
<key>o_sprefs_reset_btn</key>
<string>id</string>
<key>o_sprefs_save_btn</key>
<string>id</string>
<key>o_sprefs_win</key>
<string>id</string>
<key>o_video_black_ckb</key>
<string>id</string>
<key>o_video_device_pop</key>
<string>id</string>
<key>o_video_device_txt</key>
<string>id</string>
<key>o_video_display_box</key>
<string>id</string>
<key>o_video_enable_ckb</key>
<string>id</string>
<key>o_video_fullscreen_ckb</key>
<string>id</string>
<key>o_video_onTop_ckb</key>
<string>id</string>
<key>o_video_output_pop</key>
<string>id</string>
<key>o_video_output_txt</key>
<string>id</string>
<key>o_video_skipFrames_ckb</key>
<string>id</string>
<key>o_video_snap_box</key>
<string>id</string>
<key>o_video_snap_folder_btn</key>
<string>id</string>
<key>o_video_snap_folder_fld</key>
<string>id</string>
<key>o_video_snap_folder_txt</key>
<string>id</string>
<key>o_video_snap_format_pop</key>
<string>id</string>
<key>o_video_snap_format_txt</key>
<string>id</string>
<key>o_video_snap_prefix_fld</key>
<string>id</string>
<key>o_video_snap_prefix_txt</key>
<string>id</string>
<key>o_video_snap_seqnum_ckb</key>
<string>id</string>
<key>o_video_view</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>buttonAction</key>
<string>id</string>
<key>closePrefs</key>
<string>id</string>
<key>resetAll</key>
<string>id</string>
<key>savePrefs</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCPrefs</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_basicFull_matrix</key>
<string>id</string>
<key>o_cancel_btn</key>
<string>id</string>
<key>o_prefs_view</key>
<string>id</string>
<key>o_prefs_window</key>
<string>id</string>
<key>o_reset_btn</key>
<string>id</string>
<key>o_save_btn</key>
<string>id</string>
<key>o_title</key>
<string>id</string>
<key>o_tree</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
View file @ 4dccfee4
...@@ -2,22 +2,34 @@ ...@@ -2,22 +2,34 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>69 71 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2311</key>
<string>345 426 590 230 0 0 1280 778 </string>
<key>2330</key>
<string>345 222 590 502 0 0 1280 778 </string>
<key>2562</key>
<string>345 220 590 505 0 0 1280 778 </string>
<key>2668</key>
<string>345 256 590 457 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>644</string> <string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key> <key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string> <string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>2311</integer>
<integer>2330</integer>
<integer>1530</integer> <integer>1530</integer>
<integer>2668</integer>
<integer>2265</integer>
<integer>2677</integer> <integer>2677</integer>
<integer>2330</integer>
<integer>2311</integer>
<integer>2562</integer> <integer>2562</integer>
<integer>2537</integer>
<integer>2265</integer>
<integer>2668</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9E17</string> <string>9E17</string>
......
modules/gui/macosx/simple_prefs.h
View file @ 4dccfee4
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
IBOutlet id o_audio_lastuser_txt; IBOutlet id o_audio_lastuser_txt;
IBOutlet id o_audio_norm_ckb; IBOutlet id o_audio_norm_ckb;
IBOutlet id o_audio_norm_fld; IBOutlet id o_audio_norm_fld;
IBOutlet id o_audio_norm_stepper;
IBOutlet id o_audio_spdif_ckb; IBOutlet id o_audio_spdif_ckb;
IBOutlet id o_audio_view; IBOutlet id o_audio_view;
IBOutlet id o_audio_visual_pop; IBOutlet id o_audio_visual_pop;
......
modules/gui/macosx/simple_prefs.m
View file @ 4dccfee4
...@@ -427,7 +427,11 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -427,7 +427,11 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
psz_tmp = config_GetPsz( p_intf, "audio-filter" ); psz_tmp = config_GetPsz( p_intf, "audio-filter" );
if( psz_tmp ) if( psz_tmp )
[o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )]; {
[o_audio_norm_ckb setState: (int)strstr( psz_tmp, "volnorm" )];
[o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]];
[o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]];
}
[o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )]; [o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )];
[self setupButton: o_audio_visual_pop forModuleList: "audio-visual"]; [self setupButton: o_audio_visual_pop forModuleList: "audio-visual"];
...@@ -749,21 +753,28 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -749,21 +753,28 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] ); config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] );
config_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] ); config_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] );
psz_tmp = config_GetPsz( p_intf, "audio-filter" ); if( [o_audio_norm_ckb state] == NSOnState )
if(! psz_tmp)
config_PutPsz( p_intf, "audio-filter", "volnorm" );
else if( (int)strstr( psz_tmp, "normvol" ) == NO )
{ {
/* work-around a GCC 4.0.1 bug */ psz_tmp = config_GetPsz( p_intf, "audio-filter" );
psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String]; if(! psz_tmp)
config_PutPsz( p_intf, "audio-filter", psz_tmp ); config_PutPsz( p_intf, "audio-filter", "volnorm" );
else if( (int)strstr( psz_tmp, "normvol" ) == NO )
{
/* work-around a GCC 4.0.1 bug */
psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String];
config_PutPsz( p_intf, "audio-filter", psz_tmp );
}
} }
else else
{ {
psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String]; psz_tmp = config_GetPsz( p_intf, "audio-filter" );
psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String]; if( psz_tmp )
psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String]; {
config_PutPsz( p_intf, "audio-filter", psz_tmp ); psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String];
psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String];
psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String];
config_PutPsz( p_intf, "audio-filter", psz_tmp );
}
} }
config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] ); config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] );
...@@ -1025,6 +1036,12 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -1025,6 +1036,12 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( sender == o_audio_vol_fld ) if( sender == o_audio_vol_fld )
[o_audio_vol_sld setIntValue: [o_audio_vol_fld intValue]]; [o_audio_vol_sld setIntValue: [o_audio_vol_fld intValue]];
if( sender == o_audio_norm_ckb )
{
[o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]];
[o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]];
}
if( sender == o_audio_last_ckb ) if( sender == o_audio_last_ckb )
{ {
if( [o_audio_last_ckb state] == NSOnState ) if( [o_audio_last_ckb state] == NSOnState )
......
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