added HB_STATE_MUXING to hb_state_s and corresponding structure.

this state indicates the transition from the end of HB_STATE_WORKING to the beginning of HB_STATE_WORKDONE.
This state can take as long a 10 minutes on a long conversion.
The associated working structure contains a progress float.
Once we determine how to get a proper progress from the call to av_write_trailer in libavformat, we can update this progress.
HB, IHB, and HBTest are now using using HB_STATE_MUXING to provided feedback to the user.

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

2 files changed, 38 insertions, 0 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index a38d0d062..a2e872a64 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -350,6 +350,31 @@ static int FormatSettings[3][4] =
         }
 #undef p
 
+#define p s.param.muxing
+        case HB_STATE_MUXING:
+        {
+            float progress_total;
+            NSMutableString * string;
+			
+            /* Update text field */
+            string = [NSMutableString stringWithFormat:
+                _( @"Muxing: %.2f %%" ), 100.0 * p.progress];
+            [fStatusField setStringValue: string];
+			
+            /* Update slider */
+            [fRipIndicator setDoubleValue: 100.0 * p.progress];
+			
+            /* Update dock icon */
+            [self UpdateDockIcon: 100.0 * p.progress];
+			
+            [fPauseButton setEnabled: YES];
+            [fPauseButton setTitle: _( @"Pause" )];
+            [fRipButton setEnabled: YES];
+            [fRipButton setTitle: _( @"Cancel" )];
+            break;
+        }
+#undef p
+			
         case HB_STATE_PAUSED:
             [fStatusField setStringValue: _( @"Paused" )];
             [fPauseButton setEnabled: YES];
diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m
index ec2ce5d7d..d5d17449c 100644
--- a/macosx/ExpressController.m
+++ b/macosx/ExpressController.m
@@ -558,6 +558,19 @@
             }
             [fConvertInfoString setStringValue: string];
             [fConvertIndicator setIndeterminate: NO];
+            [fConvertIndicator setDoubleValue: 100.0 * progress_total];
+            break;
+        }
+#undef p
+
+#define p s.param.muxing
+        case HB_STATE_MUXING:
+        {
+            NSMutableString * string = [NSMutableString
+                stringWithFormat: @"Muxing: %.1f %%",
+                100.0 * p.progress];
+            [fConvertInfoString setStringValue: string];
+            [fConvertIndicator setIndeterminate: NO];
             [fConvertIndicator setDoubleValue: 100.0 * p.progress];
             break;
         }