Fix trim black

HakanL · Sep 24, 2020 · 0973058 · 0973058
1 parent 2c557d3
commit 0973058
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 22 deletions.
diff --git a/Utils/DMXrecorder/ConverterUI/ConverterUI.csproj b/Utils/DMXrecorder/ConverterUI/ConverterUI.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj" />
-    <ProjectReference Include="..\PostProcessor\PostProcessor.csproj" />
+    <ProjectReference Include="..\Processor\Processor.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Utils/DMXrecorder/ConverterUI/MainWindow.xaml.cs b/Utils/DMXrecorder/ConverterUI/MainWindow.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Animatroller.PostProcessor;
+using Animatroller.Processor;
 
 namespace Animatroller.ConverterUI
 {
@@ -77,7 +77,7 @@ private void buttonConvert_Click(object sender, RoutedEventArgs e)
                 {
                     progress.Value = 0;
 
-                    var converter = new PostProcessor.Command.FileConvert(fileReader, fileWriter, transformer);
+                    var converter = new Processor.Command.FileConvert(fileReader, fileWriter, transformer);
 
                     // TODO: Report progress
                     converter.Execute();

diff --git a/Utils/DMXrecorder/DMXrecorder.sln b/Utils/DMXrecorder/DMXrecorder.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29519.87
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DMXrecorder", "DMXrecorder\DMXrecorder.csproj", "{4D3CF655-C2E0-4B14-A441-80791C0FE092}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DMXrecorder", "DMXrecorder\DMXrecorder.csproj", "{4D3CF655-C2E0-4B14-A441-80791C0FE092}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PostProcessor", "PostProcessor\PostProcessor.csproj", "{D55F0B0F-63F9-4D3F-B27D-A913D2B2D5EA}"
 EndProject
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DMXplayer", "DMXplayer\DMXp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterUI", "ConverterUI\ConverterUI.csproj", "{95B2BF6D-31AC-408E-AADA-3B25422843B8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Processor", "Processor\Processor.csproj", "{AD2A54A9-8B3A-498A-9F30-C2A3F72BF6F6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{95B2BF6D-31AC-408E-AADA-3B25422843B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95B2BF6D-31AC-408E-AADA-3B25422843B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95B2BF6D-31AC-408E-AADA-3B25422843B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD2A54A9-8B3A-498A-9F30-C2A3F72BF6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD2A54A9-8B3A-498A-9F30-C2A3F72BF6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD2A54A9-8B3A-498A-9F30-C2A3F72BF6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD2A54A9-8B3A-498A-9F30-C2A3F72BF6F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Utils/DMXrecorder/PostProcessor/PostProcessor.csproj b/Utils/DMXrecorder/PostProcessor/PostProcessor.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\Processor\Processor.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Utils/DMXrecorder/PostProcessor/Program.cs b/Utils/DMXrecorder/PostProcessor/Program.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Animatroller.Processor;
 using PowerArgs;
 
 namespace Animatroller.PostProcessor
@@ -65,7 +66,7 @@ public static void Main(string[] args)
                 var transforms = new List<ITransform>();
                 if (!string.IsNullOrEmpty(arguments.UniverseMapping))
                 {
-                    UniverseMapper mapper = null;
+                    Processor.Transform.UniverseMapper mapper = null;
 
                     var parts = arguments.UniverseMapping.Split(',').Select(x => x.Trim()).ToList();
                     foreach (string part in parts)
@@ -96,7 +97,7 @@ public static void Main(string[] args)
 
                         if (mapper == null)
                         {
-                            mapper = new UniverseMapper();
+                            mapper = new Processor.Transform.UniverseMapper();
                             transforms.Add(mapper);
                         }
 
@@ -113,25 +114,25 @@ public static void Main(string[] args)
                         if (fileWriter == null)
                             throw new ArgumentNullException("Missing output file");
 
-                        command = new Command.TrimBlack(fileReader, fileWriter);
+                        command = new Processor.Command.TrimBlack(fileReader, fileWriter);
                         break;
 
                     case Arguments.Commands.FindLoop:
-                        command = new Command.FindLoop(fileReader);
+                        command = new Processor.Command.FindLoop(fileReader);
                         break;
 
                     case Arguments.Commands.TrimEnd:
                         if (fileWriter == null)
                             throw new ArgumentNullException("Missing output file");
 
-                        command = new Command.TrimEnd(fileReader, fileWriter, arguments.TrimPos);
+                        command = new Processor.Command.TrimEnd(fileReader, fileWriter, arguments.TrimPos);
                         break;
 
                     case Arguments.Commands.FileConvert:
                         if (fileWriter == null)
                             throw new ArgumentNullException("Missing output file");
 
-                        command = new Command.FileConvert(fileReader, fileWriter, transformer);
+                        command = new Processor.Command.FileConvert(fileReader, fileWriter, transformer);
                         break;
 
                     default:

diff --git a/...rder/PostProcessor/Command/FileConvert.cs → ...recorder/Processor/Command/FileConvert.cs b/...rder/PostProcessor/Command/FileConvert.cs → ...recorder/Processor/Command/FileConvert.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Animatroller.PostProcessor.Command
+namespace Animatroller.Processor.Command
 {
     public class FileConvert : ICommand
     {

diff --git a/...ecorder/PostProcessor/Command/FindLoop.cs → ...DMXrecorder/Processor/Command/FindLoop.cs b/...ecorder/PostProcessor/Command/FindLoop.cs → ...DMXrecorder/Processor/Command/FindLoop.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Animatroller.PostProcessor.Command
+namespace Animatroller.Processor.Command
 {
     public class FindLoop : ICommand
     {

diff --git a/...corder/PostProcessor/Command/TrimBlack.cs → ...MXrecorder/Processor/Command/TrimBlack.cs b/...corder/PostProcessor/Command/TrimBlack.cs → ...MXrecorder/Processor/Command/TrimBlack.cs
@@ -4,10 +4,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Animatroller.PostProcessor.Command
+namespace Animatroller.Processor.Command
 {
-    //FIXME: Make it work with multiple universes
-
     public class TrimBlack : ICommand
     {
         private readonly Common.IFileReader fileReader;
@@ -70,12 +68,13 @@ public void Execute()
             currentPos = 0;
             while (this.fileReader.DataAvailable)
             {
-                long pos = currentPos++;
+                long pos = currentPos;
 
                 if (pos >= firstPos)
                     break;
 
                 this.fileReader.ReadFrame();
+                currentPos++;
             }
 
             while (this.fileReader.DataAvailable)

diff --git a/...recorder/PostProcessor/Command/TrimEnd.cs → .../DMXrecorder/Processor/Command/TrimEnd.cs b/...recorder/PostProcessor/Command/TrimEnd.cs → .../DMXrecorder/Processor/Command/TrimEnd.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Animatroller.PostProcessor.Command
+namespace Animatroller.Processor.Command
 {
     //FIXME: Make it work with multiple universes
 

diff --git a/Utils/DMXrecorder/PostProcessor/ICommand.cs → Utils/DMXrecorder/Processor/ICommand.cs b/Utils/DMXrecorder/PostProcessor/ICommand.cs → Utils/DMXrecorder/Processor/ICommand.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Animatroller.PostProcessor
+namespace Animatroller.Processor
 {
     public interface ICommand
     {

diff --git a/...s/DMXrecorder/PostProcessor/ITransform.cs → Utils/DMXrecorder/Processor/ITransform.cs b/...s/DMXrecorder/PostProcessor/ITransform.cs → Utils/DMXrecorder/Processor/ITransform.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Animatroller.PostProcessor
+namespace Animatroller.Processor
 {
     public interface ITransform
     {

diff --git a/...DMXrecorder/PostProcessor/ITransformer.cs → Utils/DMXrecorder/Processor/ITransformer.cs b/...DMXrecorder/PostProcessor/ITransformer.cs → Utils/DMXrecorder/Processor/ITransformer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Animatroller.PostProcessor
+namespace Animatroller.Processor
 {
     public interface ITransformer
     {

diff --git a/Utils/DMXrecorder/Processor/Processor.csproj b/Utils/DMXrecorder/Processor/Processor.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Animatroller.Processor</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...PostProcessor/Transform/UniverseMapper.cs → ...der/Processor/Transform/UniverseMapper.cs b/...PostProcessor/Transform/UniverseMapper.cs → ...der/Processor/Transform/UniverseMapper.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using Animatroller.Common;
 
-namespace Animatroller.PostProcessor
+namespace Animatroller.Processor.Transform
 {
     public class UniverseMapper : ITransform
     {

diff --git a/.../DMXrecorder/PostProcessor/Transformer.cs → Utils/DMXrecorder/Processor/Transformer.cs b/.../DMXrecorder/PostProcessor/Transformer.cs → Utils/DMXrecorder/Processor/Transformer.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using Animatroller.Common;
 
-namespace Animatroller.PostProcessor
+namespace Animatroller.Processor
 {
     public class Transformer : ITransformer
     {