Merge pull request #2 from vignetteapp/fix-code-before-docs

Fix code before making the docs
Speykious · Dec 5, 2021 · a410345 · a410345
2 parents 04a29eb + 1f362a2
commit a410345
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 10 deletions.
diff --git a/SeeShark.Example.Ascii/Program.cs b/SeeShark.Example.Ascii/Program.cs
@@ -2,6 +2,7 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
 using System.Diagnostics;
 using System.Text;
 using static SeeShark.FFmpeg.FFmpegManager;
@@ -72,7 +73,7 @@ static void Main(string[] args)
 
             /// Attach our <see cref="OnNewFrame"/> method to the camera's frame event handler,
             /// so that we can process every coming frame the way we want.
-            karen.NewFrameHandler += OnNewFrame;
+            karen.OnFrame += OnFrameEventHandler;
 
             Console.WriteLine($"Camera chosen: {karen.Info}");
             Console.WriteLine("Press Space or P to play/pause the camera.");
@@ -115,7 +116,7 @@ static void Main(string[] args)
         /// Each time it is triggered, it will draw a new ASCII frame on the screen
         /// and update the terminal window title.
         /// </summary>
-        public static void OnNewFrame(object? _sender, FrameEventArgs e)
+        public static void OnFrameEventHandler(object? _sender, FrameEventArgs e)
         {
             var frame = e.Frame;
             if (converter == null || Console.WindowWidth != converter.SrcWidth ||

diff --git a/SeeShark.Example.Ascii/SeeShark.Example.Ascii.csproj b/SeeShark.Example.Ascii/SeeShark.Example.Ascii.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
+        <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

diff --git a/SeeShark/Camera.cs b/SeeShark/Camera.cs
@@ -2,6 +2,8 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
+using System.Threading;
 using SeeShark.FFmpeg;
 
 namespace SeeShark
@@ -11,26 +13,24 @@ public class Camera : IDisposable
         private Thread? decodingThread;
         private readonly CameraStreamDecoder decoder;
 
-        public CameraInfo Info { get; private set; }
+        public CameraInfo Info { get; }
         public bool IsPlaying { get; private set; }
         public bool IsDisposed { get; private set; }
 
-        public event EventHandler<FrameEventArgs>? NewFrameHandler;
+        public event EventHandler<FrameEventArgs>? OnFrame;
 
         public Camera(CameraInfo info, DeviceInputFormat inputFormat)
         {
             Info = info;
             decoder = new CameraStreamDecoder(info.Path, inputFormat);
         }
 
-        protected void OnNewFrame(FrameEventArgs e) => NewFrameHandler?.Invoke(this, e);
-
         protected void DecodeLoop()
         {
             DecodeStatus status;
             while ((status = decoder.TryDecodeNextFrame(out var frame)) != DecodeStatus.EndOfStream)
             {
-                OnNewFrame(new FrameEventArgs(frame, status));
+                OnFrame?.Invoke(this, new FrameEventArgs(frame, status));
 
                 if (!IsPlaying)
                     break;
@@ -52,7 +52,7 @@ public void StartCapture()
                 return;
 
             IsPlaying = true;
-            decodingThread = new Thread(new ThreadStart(DecodeLoop));
+            decodingThread = new Thread(DecodeLoop);
             decodingThread.Start();
         }
 

diff --git a/SeeShark/CameraInfo.cs b/SeeShark/CameraInfo.cs
@@ -2,6 +2,8 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
+
 namespace SeeShark
 {
     /// <summary>

diff --git a/SeeShark/CameraManager.cs b/SeeShark/CameraManager.cs
@@ -2,8 +2,11 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
 using System.Collections.Immutable;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading;
 using DirectShowLib;
 using FFmpeg.AutoGen;
 using SeeShark.FFmpeg;

diff --git a/SeeShark/FFmpeg/DeviceInputFormat.cs b/SeeShark/FFmpeg/DeviceInputFormat.cs
@@ -2,6 +2,8 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
+
 namespace SeeShark.FFmpeg
 {
     /// <summary>

diff --git a/SeeShark/FFmpeg/FFmpegHelper.cs b/SeeShark/FFmpeg/FFmpegHelper.cs
@@ -2,6 +2,7 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
 using System.Runtime.InteropServices;
 using FFmpeg.AutoGen;
 

diff --git a/SeeShark/FFmpeg/FFmpegManager.cs b/SeeShark/FFmpeg/FFmpegManager.cs
@@ -2,6 +2,10 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using FFmpeg.AutoGen;
 using LF = SeeShark.FFmpeg.LibraryFlags;

diff --git a/SeeShark/FFmpeg/LibraryFlags.cs b/SeeShark/FFmpeg/LibraryFlags.cs
@@ -2,6 +2,9 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
+using System.Collections.Generic;
+
 namespace SeeShark.FFmpeg
 {
     [Flags]

diff --git a/SeeShark/FFmpeg/VideoStreamDecoder.cs b/SeeShark/FFmpeg/VideoStreamDecoder.cs
@@ -2,7 +2,10 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Threading;
 using FFmpeg.AutoGen;
 using static SeeShark.FFmpeg.FFmpegManager;
 

diff --git a/SeeShark/Frame.cs b/SeeShark/Frame.cs
@@ -2,6 +2,7 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
 using FFmpeg.AutoGen;
 
 namespace SeeShark

diff --git a/SeeShark/FrameConverter.cs b/SeeShark/FrameConverter.cs
@@ -2,6 +2,7 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
 using System.Runtime.InteropServices;
 using FFmpeg.AutoGen;
 

diff --git a/SeeShark/FrameEventArgs.cs b/SeeShark/FrameEventArgs.cs
@@ -2,6 +2,7 @@
 // This file is part of SeeShark.
 // SeeShark is licensed under the BSD 3-Clause License. See LICENSE for details.
 
+using System;
 using SeeShark.FFmpeg;
 
 namespace SeeShark

diff --git a/SeeShark/SeeShark.csproj b/SeeShark/SeeShark.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>SeeShark</AssemblyName>
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>disable</ImplicitUsings>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
   </PropertyGroup>