@@ -7,7 +7,7 @@ namespace EmergenceGuardian.FFmpegExampleApplication {
77 /// <summary>
88 /// Interaction logic for FFmpegWindow.xaml
99 /// </summary>
10- public partial class FFmpegWindow : Window , IUserInterface {
10+ public partial class FFmpegWindow : Window , IUserInterfaceWindow {
1111 public static FFmpegWindow Instance ( Window parent , string title , bool autoClose ) {
1212 FFmpegWindow F = new FFmpegWindow ( ) ;
1313 F . Owner = parent ;
@@ -17,15 +17,14 @@ public static FFmpegWindow Instance(Window parent, string title, bool autoClose)
1717 return F ;
1818 }
1919
20- private FFmpegProcess host ;
21- private FFmpegProcess task ;
22- private bool autoClose ;
23- private string title { get ; set ; }
24- private TimeLeftCalculator timeCalc ;
20+ protected IProcessManager host ;
21+ protected IProcessManagerFFmpeg hostFFmpeg ;
22+ protected IProcessManager task ;
23+ protected bool autoClose ;
24+ protected string title { get ; set ; }
25+ protected ITimeLeftCalculator timeCalc ;
2526
26- public void Stop ( ) {
27- Dispatcher . Invoke ( ( ) => this . Close ( ) ) ;
28- }
27+ public void Stop ( ) => Dispatcher . Invoke ( ( ) => this . Close ( ) ) ;
2928
3029 public FFmpegWindow ( ) {
3130 InitializeComponent ( ) ;
@@ -35,22 +34,25 @@ private void Window_Loaded(object sender, RoutedEventArgs e) {
3534 SetPageTitle ( null ) ;
3635 }
3736
38- public void DisplayTask ( FFmpegProcess taskArg ) {
37+ public void DisplayTask ( IProcessManager taskArg ) {
3938 Dispatcher . Invoke ( ( ) => {
4039 if ( taskArg . Options . IsMainTask ) {
4140 host = taskArg ;
42- host . InfoUpdated += FFmpeg_InfoUpdated ;
43- host . StatusUpdated += FFmpeg_StatusUpdated ;
44- host . Completed += FFmpeg_Completed ;
41+ hostFFmpeg = host as IProcessManagerFFmpeg ;
42+ if ( hostFFmpeg != null ) {
43+ hostFFmpeg . InfoUpdated += FFmpeg_InfoUpdated ;
44+ hostFFmpeg . StatusUpdated += FFmpeg_StatusUpdated ;
45+ }
46+ host . ProcessCompleted += FFmpeg_Completed ;
4547 PercentText . Text = 0 . ToString ( "p1" ) ;
4648 SetPageTitle ( PercentText . Text ) ;
4749 } else {
4850 task = taskArg ;
4951 TaskStatusText . Text = task . Options . Title ;
50- task . Completed += ( sender , e ) => {
51- FFmpegProcess Proc = ( FFmpegProcess ) sender ;
52+ task . ProcessCompleted += ( sender , e ) => {
53+ ProcessManager Proc = ( ProcessManager ) sender ;
5254 Dispatcher . Invoke ( ( ) => {
53- if ( e . Status == CompletionStatus . Error && ! Proc . WorkProcess . StartInfo . FileName . EndsWith ( "avs2yuv.exe" ) )
55+ if ( e . Status == CompletionStatus . Failed && ! Proc . WorkProcess . StartInfo . FileName . EndsWith ( "avs2yuv.exe" ) )
5456 FFmpegErrorWindow . Instance ( Owner , Proc ) ;
5557 TaskStatusText . Text = "" ;
5658 task = null ;
@@ -62,40 +64,42 @@ public void DisplayTask(FFmpegProcess taskArg) {
6264 } ) ;
6365 }
6466
67+ protected long ResumePos => hostFFmpeg . Options ? . ResumePos ?? 0 ;
68+
6569 private void SetPageTitle ( string status ) {
6670 this . Title = string . IsNullOrEmpty ( status ) ? title : string . Format ( "{0} ({1})" , title , status ) ;
6771 }
6872
6973 private void FFmpeg_InfoUpdated ( object sender , EventArgs e ) {
7074 Dispatcher . Invoke ( ( ) => {
71- WorkProgressBar . Maximum = host . FrameCount + host . Options . ResumePos ;
72- timeCalc = new TimeLeftCalculator ( host . FrameCount + host . Options . ResumePos ) ;
75+ WorkProgressBar . Maximum = hostFFmpeg . FrameCount + ResumePos ;
76+ timeCalc = new TimeLeftCalculator ( hostFFmpeg . FrameCount + hostFFmpeg ? . Options . ResumePos ?? 0 ) ;
7377 } ) ;
7478 }
7579
7680 private bool EstimatedTimeLeftToggle = false ;
7781 private void FFmpeg_StatusUpdated ( object sender , FFmpeg . StatusUpdatedEventArgs e ) {
7882 Dispatcher . Invoke ( ( ) => {
79- WorkProgressBar . Value = e . Status . Frame + host . Options . ResumePos ;
83+ WorkProgressBar . Value = e . Status . Frame + ResumePos ;
8084 PercentText . Text = ( WorkProgressBar . Value / WorkProgressBar . Maximum ) . ToString ( "p1" ) ;
8185 SetPageTitle ( PercentText . Text ) ;
8286 FpsText . Text = e . Status . Fps . ToString ( ) ;
8387
8488 // Time left will be updated only 1 out of 2 to prevent changing too quick.
8589 EstimatedTimeLeftToggle = ! EstimatedTimeLeftToggle ;
8690 if ( EstimatedTimeLeftToggle ) {
87- timeCalc ? . Calculate ( e . Status . Frame + host . Options . ResumePos ) ;
91+ timeCalc ? . Calculate ( e . Status . Frame + ResumePos ) ;
8892 TimeSpan TimeLeft = timeCalc . ResultTimeLeft ;
8993 if ( TimeLeft > TimeSpan . Zero )
9094 TimeLeftText . Text = TimeLeft . ToString ( TimeLeft . TotalHours < 1 ? "m\\ :ss" : "h\\ :mm\\ :ss" ) ;
9195 }
9296 } ) ;
9397 }
9498
95- private void FFmpeg_Completed ( object sender , FFmpeg . CompletedEventArgs e ) {
99+ private void FFmpeg_Completed ( object sender , FFmpeg . ProcessCompletedEventArgs e ) {
96100 Dispatcher . Invoke ( ( ) => {
97- FFmpegProcess Proc = sender as FFmpegProcess ;
98- if ( e . Status == CompletionStatus . Error && ! Proc . WorkProcess . StartInfo . FileName . EndsWith ( "avs2yuv.exe" ) )
101+ ProcessManager Proc = sender as ProcessManager ;
102+ if ( e . Status == CompletionStatus . Failed && ! Proc . WorkProcess . StartInfo . FileName . EndsWith ( "avs2yuv.exe" ) )
99103 FFmpegErrorWindow . Instance ( Owner , Proc ) ;
100104 if ( autoClose )
101105 this . Close ( ) ;
0 commit comments