minor NmkdStopwatch changes

n00mkrad · Sep 14, 2022 · 6e40c6a · 6e40c6a
1 parent 433a565
commit 6e40c6a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Code/Media/AvProcess.cs b/Code/Media/AvProcess.cs
@@ -80,8 +80,8 @@ public static async Task<string> RunFfmpeg(string args, string workingDir, LogMo
 
             if (!show)
             {
-                ffmpeg.OutputDataReceived += (sender, outLine) => { AvOutputHandler.LogOutput(outLine.Data, ref processOutput, "ffmpeg", logMode, progressBar); timeSinceLastOutput.sw.Restart(); };
-                ffmpeg.ErrorDataReceived += (sender, outLine) => { AvOutputHandler.LogOutput(outLine.Data, ref processOutput, "ffmpeg", logMode, progressBar); timeSinceLastOutput.sw.Restart(); };
+                ffmpeg.OutputDataReceived += (sender, outLine) => { AvOutputHandler.LogOutput(outLine.Data, ref processOutput, "ffmpeg", logMode, progressBar); timeSinceLastOutput.Sw.Restart(); };
+                ffmpeg.ErrorDataReceived += (sender, outLine) => { AvOutputHandler.LogOutput(outLine.Data, ref processOutput, "ffmpeg", logMode, progressBar); timeSinceLastOutput.Sw.Restart(); };
             }
 
             ffmpeg.Start();

diff --git a/Code/MiscUtils/BackgroundTaskManager.cs b/Code/MiscUtils/BackgroundTaskManager.cs
@@ -37,7 +37,7 @@ public static void ClearExpired ()
         {
             foreach(RunningTask task in runningTasks)
             {
-                if(task.timer.sw.ElapsedMilliseconds > task.timeoutSeconds * 1000)
+                if(task.timer.Sw.ElapsedMilliseconds > task.timeoutSeconds * 1000)
                 {
                     Logger.Log($"[BgTaskMgr] Task with ID {task.id} timed out, has been running for {task.timer}!", true);
                     runningTasks.Remove(task);

diff --git a/Code/MiscUtils/NmkdStopwatch.cs b/Code/MiscUtils/NmkdStopwatch.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Diagnostics;
-using System.Linq;
 
 namespace Flowframes.MiscUtils
 {
     class NmkdStopwatch
     {
-        public Stopwatch sw = new Stopwatch();
-        public long ElapsedMs { get { return sw.ElapsedMilliseconds; } }
+        public Stopwatch Sw = new Stopwatch();
+        public TimeSpan Elapsed { get { return Sw.Elapsed; } }
+        public long ElapsedMs { get { return Sw.ElapsedMilliseconds; } }
 
         public NmkdStopwatch(bool startOnCreation = true)
         {
             if (startOnCreation)
-                sw.Restart();
+                Sw.Restart();
         }
 
         public override string ToString()
         {
-            return FormatUtils.TimeSw(sw);
+            return FormatUtils.TimeSw(Sw);
         }
     }
 }