macosx: fixed behaviour of the volnorm settings

NEWS

 Changes between 0.9.2 and 0.9.3-git:
 ------------------------------------
 
- * Fix sensitivity of Fullscreen Controller on Windows
- * Fix ffmpeg slowness on Mac OS X (PowerPC)
- * Fix crash on startup on Mac OS X when installed on old preferences
- * Fix error messages on startup on Windows when VLC wasn't correctly
+ * Fixed sensitivity of Fullscreen Controller on Windows
+ * Fixed ffmpeg slowness on Mac OS X (PowerPC)
+ * Fixed crash on startup on Mac OS X when installed on old preferences
+ * Fixed error messages on startup on Windows when VLC wasn't correctly
    uninstalled before installation
  * Various crashes fixed in PS, SSA, mkv, xspf, freetype
- * Fix DTS channel order on 5.1 systems
- * Fix pausing behaviour for subtitles
+ * Fixed DTS channel order on 5.1 systems
+ * Fixed pausing behaviour for subtitles
  * Multiple subtitles and podcast fixes
- * Fix bug in directory opening on Mac OS X
- * Fix lost playlist columns when switching the playlist view
- * Add necessary options to Simple preferences (to avoid NVIDIA drivers issues)
- * Fix font selection on Mac OS X
+ * Fixed bug in directory opening on Mac OS X
+ * Fixed lost playlist columns when switching the playlist view
+ * Added needed options to Simple preferences (to avoid NVIDIA drivers issues)
+ * Fixed font selection on Mac OS X
  * Thicker border to the Mac OS X subtitle renderer
- * Fix update system bugs
+ * Fixed update system bugs
  * Fixed the appereance of playlist items in the Streaming/Transcoding Wizard
    (Mac OS X only)
+ * Fixed AC3 passthrough on Mac OS X
+ * Fixed behaviour of the Volume Normalizer settings on Mac OS X
  * Removed the deprecated QuickDraw video output module to avoid crashes on 
    modern Mac OS X versions
  * Other bug fixes (dvd language selection, ...)

extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

@@ -2,8 +2,21 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IBDocumentLocation</key>
+	<string>69 69 356 240 0 0 1280 778 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>2311</key>
+		<string>345 425 590 230 0 0 1280 778 </string>
+		<key>2330</key>
+		<string>345 221 590 502 0 0 1280 778 </string>
+		<key>2562</key>
+		<string>345 219 590 505 0 0 1280 778 </string>
+		<key>2668</key>
+		<string>345 255 590 457 0 0 1280 778 </string>
+	</dict>
 	<key>IBFramework Version</key>
-	<string>644</string>
+	<string>489.0</string>
 	<key>IBLastKnownRelativeProjectPath</key>
 	<string>../../vlc.xcodeproj</string>
 	<key>IBOldestOS</key>
@@ -11,13 +24,10 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>1530</integer>
+		<integer>2668</integer>
 		<integer>2677</integer>
 		<integer>2330</integer>
-		<integer>2311</integer>
-		<integer>2562</integer>
-		<integer>2537</integer>
 		<integer>2265</integer>
-		<integer>2668</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9E17</string>

modules/gui/macosx/simple_prefs.h

@@ -43,6 +43,7 @@
     IBOutlet id o_audio_lastuser_txt;
     IBOutlet id o_audio_norm_ckb;
     IBOutlet id o_audio_norm_fld;
+    IBOutlet id o_audio_norm_stepper;
     IBOutlet id o_audio_spdif_ckb;
     IBOutlet id o_audio_view;
     IBOutlet id o_audio_visual_pop;

modules/gui/macosx/simple_prefs.m

@@ -428,7 +428,11 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
     
     psz_tmp = config_GetPsz( p_intf, "audio-filter" );
     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" )];
 
     [self setupButton: o_audio_visual_pop forModuleList: "audio-visual"];
@@ -751,6 +755,8 @@ 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_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] );
 
+        if( [o_audio_norm_ckb state] == NSOnState )
+        {
             psz_tmp = config_GetPsz( p_intf, "audio-filter" );
             if(! psz_tmp)
                 config_PutPsz( p_intf, "audio-filter", "volnorm" );
@@ -760,13 +766,18 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
                 psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String];
                 config_PutPsz( p_intf, "audio-filter", psz_tmp );
             }
+        }
         else
+        {
+            psz_tmp = config_GetPsz( p_intf, "audio-filter" );
+            if( 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] );
 
         SaveModuleList( o_audio_visual_pop, "audio-visual" );
@@ -1027,6 +1038,12 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
     if( sender == o_audio_vol_fld )
         [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( [o_audio_last_ckb state] == NSOnState )