CLI, MacGui: cosmetics.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5277 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5fd371a9e637ea80f1fdde6dac55f4ecf6a55ba7..9506bde0f6e76dd868860df4b52585beb7e43512 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -949,14 +949,14 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             if( p.preview_cur )
             {
                 scan_status = [NSString stringWithFormat:
-                    NSLocalizedString( @"Queue Scanning title %d of %d, preview %d…", @"" ),
-                    p.title_cur, p.title_count, p.preview_cur];
+                               NSLocalizedString( @"Queue Scanning title %d of %d, preview %d…", @"" ),
+                               p.title_cur, p.title_count, p.preview_cur];
             }
             else
             {
                 scan_status = [NSString stringWithFormat:
-                    NSLocalizedString( @"Queue Scanning title %d of %d…", @"" ),
-                    p.title_cur, p.title_count];
+                               NSLocalizedString( @"Queue Scanning title %d of %d…", @"" ),
+                               p.title_cur, p.title_count];
             }
             [fStatusField setStringValue: scan_status];
             
@@ -987,14 +987,19 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             
             /* Update text field */
             pass_desc = @"";
-            //string = [NSMutableString stringWithFormat: NSLocalizedString( @"Searching for start point: pass %d %@ of %d, %.2f %%", @"" ), p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
+            //string = [NSMutableString stringWithFormat:
+            //          NSLocalizedString( @"Searching for start point: pass %d %@ of %d, %.2f %%", @"" ),
+            //          p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
             /* For now, do not announce "pass x of x for the search phase */
-            string = [NSMutableString stringWithFormat: NSLocalizedString( @"Searching for start point… :  %.2f %%", @"" ), 100.0 * p.progress];
+            string = [NSMutableString stringWithFormat:
+                      NSLocalizedString( @"Searching for start point… :  %.2f %%", @"" ),
+                      100.0 * p.progress];
             
-                       if( p.seconds > -1 )
+            if( p.seconds > -1 )
             {
                 [string appendFormat:
-                 NSLocalizedString( @" (ETA %02dh%02dm%02ds)", @"" ), p.hours, p.minutes, p.seconds];
+                 NSLocalizedString( @" (ETA %02dh%02dm%02ds)", @"" ),
+                 p.hours, p.minutes, p.seconds];
             }
             
             [fStatusField setStringValue: string];
@@ -1051,14 +1056,20 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             
             if ([pass_desc length])
             {
-                string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
+                string = [NSMutableString stringWithFormat:
+                          NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ),
+                          currentQueueEncodeNameString,
+                          p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
             }
             else
             {
-                string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, p.job_count, 100.0 * p.progress];
+                string = [NSMutableString stringWithFormat:
+                          NSLocalizedString( @"Encoding: %@ \nPass %d of %d, %.2f %%", @"" ),
+                          currentQueueEncodeNameString,
+                          p.job_cur, p.job_count, 100.0 * p.progress];
             }
             
-                       if( p.seconds > -1 )
+            if( p.seconds > -1 )
             {
                 if ( p.rate_cur > 0.0 )
                 {

diff --git a/test/test.c b/test/test.c
index 5033baccbc6e6c91dc7867d09052df2d8632a346..b20d504262646ae1ef0e9c7f2a28e801b68bc015 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -588,12 +588,12 @@ static int HandleEvents( hb_handle_t * h )
             if (p.preview_cur)
             {
                 fprintf(stdout, "\rScanning title %d of %d, preview %d, %.2f %%",
-                    p.title_cur, p.title_count, p.preview_cur, 100 * p.progress);
+                        p.title_cur, p.title_count, p.preview_cur, 100 * p.progress);
             }
             else
             {
                 fprintf(stdout, "\rScanning title %d of %d, %.2f %%",
-                    p.title_cur, p.title_count, 100 * p.progress);
+                        p.title_cur, p.title_count, 100 * p.progress);
             }
             fflush(stdout);
             break;