Handle multiple destinations and FSEQ improvements

HakanL · Aug 19, 2022 · a0a7f54 · a0a7f54
1 parent 1dcb51b
commit a0a7f54
Show file tree

Hide file tree

Showing 16 changed files with 387 additions and 123 deletions.
diff --git a/Utils/DMXrecorder/Common/BaseDmxFrame.cs b/Utils/DMXrecorder/Common/BaseDmxFrame.cs
@@ -10,6 +10,8 @@ public class BaseDmxFrame
     {
         public int SyncAddress { get; set; }
 
+        public System.Net.IPAddress Destination { get; set; }
+
         public BaseDmxFrame()
         {
         }

diff --git a/Utils/DMXrecorder/Common/DmxDataFrame.cs b/Utils/DMXrecorder/Common/DmxDataFrame.cs
@@ -21,15 +21,17 @@ public DmxDataFrame(DmxDataFrame source)
             Data = source.Data;
             UniverseId = source.UniverseId;
             SyncAddress = source.SyncAddress;
+            Destination = source.Destination;
         }
 
-        public static DmxDataFrame CreateFrame(int universe, int syncAddress, byte[] data)
+        public static DmxDataFrame CreateFrame(int universe, int syncAddress, byte[] data, System.Net.IPAddress destination)
         {
             return new DmxDataFrame
             {
                 UniverseId = universe,
                 SyncAddress = syncAddress,
-                Data = data
+                Data = data,
+                Destination = destination
             };
         }
 

diff --git a/Utils/DMXrecorder/Common/DmxDataOutputPacket.cs b/Utils/DMXrecorder/Common/DmxDataOutputPacket.cs
@@ -14,21 +14,21 @@ public DmxDataOutputPacket()
         {
         }
 
-        public static DmxDataOutputPacket CreateFullFrame(double millisecond, long sequence, int universe, byte[] data, int syncAddress)
+        public static DmxDataOutputPacket CreateFullFrame(double millisecond, long sequence, int universe, System.Net.IPAddress destination, byte[] data, int syncAddress)
         {
             return new DmxDataOutputPacket
             {
-                Content = DmxDataFrame.CreateFrame(universe, syncAddress, data),
+                Content = DmxDataFrame.CreateFrame(universe, syncAddress, data, destination),
                 Sequence = sequence,
                 TimestampMS = millisecond
             };
         }
 
-        public static DmxDataOutputPacket CreateSync(double millisecond, long sequence, int syncAddress)
+        public static DmxDataOutputPacket CreateSync(double millisecond, long sequence, int syncAddress, System.Net.IPAddress destination)
         {
             return new DmxDataOutputPacket
             {
-                Content = SyncFrame.CreateFrame(syncAddress),
+                Content = SyncFrame.CreateFrame(syncAddress, destination),
                 Sequence = sequence,
                 TimestampMS = millisecond
             };

diff --git a/Utils/DMXrecorder/Common/FileFormatProber.cs b/Utils/DMXrecorder/Common/FileFormatProber.cs
@@ -33,6 +33,17 @@ public static class FileFormatProber
             {
             }
 
+            try
+            {
+                using var testReader = new Common.IO.FseqFileReader(filename);
+                testReader.ReadFrame();
+
+                return Common.FileFormats.FSeq;
+            }
+            catch (InvalidDataException)
+            {
+            }
+
             return null;
         }
     }