Added basic MAC support

ElrohirGT · Oct 28, 2021 · 11e5974 · 11e5974
1 parent 971743f
commit 11e5974
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/VideoCompresser/Program.cs b/VideoCompresser/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using static ConsoleUtilitiesLite.ConsoleUtilitiesLite;
 
@@ -19,11 +20,26 @@ class Program
         public static readonly string FFPLAY_PATH = Path.Combine(AppContext.BaseDirectory, @"ffmpeg 4.4\ffplay.exe");
         public static readonly string FFPROBE_PATH = Path.Combine(AppContext.BaseDirectory, @"ffmpeg 4.4\ffprobe.exe");
 
+        static Program()
+        {
+            string baseDirectory = Path.Combine(AppContext.BaseDirectory, @"ffmpeg 4.4");
+            FFMPEG_PATH = Path.Combine(baseDirectory, "ffmpeg");
+            FFPLAY_PATH = Path.Combine(baseDirectory, "ffplay");
+            FFPROBE_PATH = Path.Combine(baseDirectory, "ffprobe");
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                FFMPEG_PATH += ".exe";
+                FFPLAY_PATH += ".exe";
+                FFPROBE_PATH += ".exe";
+            }
+        }
+
         static void Main(string[] args)
         {
             Console.OutputEncoding = System.Text.Encoding.Unicode;
             Console.Clear();
-            
+
             //Console.WriteLine(FFMPEG_PATH);
             //Console.WriteLine();
             //Console.WriteLine(FFPLAY_PATH);

diff --git a/VideoCompresser/VideoCompresser.csproj b/VideoCompresser/VideoCompresser.csproj
@@ -20,6 +20,15 @@
     <None Update="ffmpeg 4.4\ffprobe.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="ffmpeg 4.4\ffmpeg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="ffmpeg 4.4\ffplay">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="ffmpeg 4.4\ffprobe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/VideoCompresser/ffmpeg 4.4/ffmpeg b/VideoCompresser/ffmpeg 4.4/ffmpeg
diff --git a/VideoCompresser/ffmpeg 4.4/ffplay b/VideoCompresser/ffmpeg 4.4/ffplay
diff --git a/VideoCompresser/ffmpeg 4.4/ffprobe b/VideoCompresser/ffmpeg 4.4/ffprobe