macosx: video effects panel: synchronize text field and stepper values properly by...

[vlc] / modules / gui / macosx / wizard.m

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index ffcedef8ad3cc720fdae0b44849162a0b990d409..1688e20400bdbb71f1f303e4b0fe318446a04269 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -596,7 +596,7 @@ static VLCWizard *_o_sharedInstance = nil;
         } else {
             /* show a sheet that the user didn't select a file */
             NSBeginInformationalAlertSheet(_NS("No input selected"),
-                _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+                _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
                 _NS("No new stream or valid playlist item has been selected.\n\n"
                 "Choose one before going to the next page."));
         }
@@ -658,7 +658,7 @@ static VLCWizard *_o_sharedInstance = nil;
             {
                 /* complain to the user that "" is no valid dest. */
                 NSBeginInformationalAlertSheet(_NS("No valid destination"),
-                    _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+                    _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
                     _NS("A valid destination has to be selected "
                     "Enter either a Unicast-IP or a Multicast-IP."
                     "\n\nIf you don't know what this means, have a look at "
@@ -998,7 +998,7 @@ static VLCWizard *_o_sharedInstance = nil;
         } else {
             /* show a sheet that the selected codecs are not compatible */
             NSBeginInformationalAlertSheet(_NS("Invalid selection"), _NS("OK"),
-                @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("The "
+                @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@", _NS("The "
                 "chosen codecs are not compatible with each other. For example: "
                 "It is not possible to mix uncompressed audio with any video codec.\n\n"
                 "Correct your selection and try again."));
@@ -1097,7 +1097,7 @@ static VLCWizard *_o_sharedInstance = nil;
             NSString * theEncapFormat = [[o_encapFormats objectAtIndex:
                 [[o_userSelections objectForKey:@"encapFormat"] intValue]]
                 objectAtIndex:0];
-            if (theEncapFormat == @"ps")
+            if ([theEncapFormat isEqualToString:@"ps"])
                 theEncapFormat = @"mpg";
 
             /* look whether we need to process multiple items or not.
@@ -1483,7 +1483,7 @@ static VLCWizard *_o_sharedInstance = nil;
                     [o_sap_option appendFormat: @"sap,name=\"%@\"",
                         [o_userSelections objectForKey:@"sapText"]];
                 }
-                if ([[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] == @"rtp")
+                if ([[[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
                 {
                     /* RTP is no access out, but a stream out module */
                     [o_opts_string appendFormat:
@@ -1507,7 +1507,7 @@ static VLCWizard *_o_sharedInstance = nil;
             else
             {
                 /* no SAP, just streaming */
-                if ([[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] == @"rtp")
+                if ([[[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
                 {
                     /* RTP is different from the other protocols, as it isn't provided through an access out module anymore */
                     [o_opts_string appendFormat:
@@ -1618,7 +1618,7 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     /* show a sheet for the help */
     NSBeginInformationalAlertSheet(_NS("Stream to network"),
-        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
         _NS("This allows streaming on a network."));
 }
 
@@ -1626,7 +1626,7 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     /* show a sheet for the help */
     NSBeginInformationalAlertSheet(_NS("Transcode/Save to file"),
-        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
         _NS("This allows saving a stream to a file. The "
         "can be reencoded on the fly. Whatever "
         "VLC can read can be saved.\nPlease note that VLC is not very suited "
@@ -1798,7 +1798,7 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     /* show a sheet for the help */
     NSBeginInformationalAlertSheet(_NS("Time-To-Live (TTL)"),
-        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
         _NS("This allows defining the TTL (Time-To-Live) of the stream. "
             "This parameter is the maximum number of routers your stream can "
             "go through. If you don't know what it means, or if you want to "
@@ -1809,7 +1809,7 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     /* show a sheet for the help */
     NSBeginInformationalAlertSheet(_NS("SAP Announce"),
-        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+        _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
         _NS("When streaming using UDP, the streams can be "
         "announced using the SAP/SDP announcing protocol. This "
         "way, the clients won't have to type in the multicast address, it "
@@ -1822,7 +1822,7 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     /* show a sheet for the help */
     NSBeginInformationalAlertSheet(_NS("Local playback"),
-            _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil,
+            _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
             _NS("When this option is enabled, the stream will be both played "
             "and transcoded/streamed.\n\nNote that this requires much more "
             "CPU power than simple transcoding or streaming."));
@@ -1858,7 +1858,7 @@ static VLCWizard *_o_sharedInstance = nil;
         NSString * theEncapFormat = [[o_encapFormats objectAtIndex:
         [[o_userSelections objectForKey:@"encapFormat"] intValue]]
         objectAtIndex:0];
-        if (theEncapFormat != @"ps")
+        if (![theEncapFormat isEqualToString:@"ps"])
             [saveFilePanel setAllowedFileTypes: [NSArray arrayWithObject:theEncapFormat]];
         else
             [saveFilePanel setAllowedFileTypes: [NSArray arrayWithObject:@"mpg"]];