Merge pull request #50 from orchetect/dev

Dev merge
orchetect · Nov 5, 2021 · d84d0ea · d84d0ea
2 parents 5f9917f + 96e13e9
commit d84d0ea
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 298 deletions.
diff --git a/Sources/MIDIKit/Common/Utilities/DataReader.swift b/Sources/MIDIKit/Common/Utilities/DataReader.swift
diff --git a/Sources/MIDIKit/Events/Event/System Exclusive/SysEx/SysEx.swift b/Sources/MIDIKit/Events/Event/System Exclusive/SysEx/SysEx.swift
@@ -57,9 +57,14 @@ extension MIDI.Event {
 extension MIDI.Event.SysEx {
 
     @inline(__always)
-    public func midi1RawBytes() -> [MIDI.Byte] {
+    public func midi1RawBytes(
+        leadingF0: Bool = true,
+        trailingF7: Bool = true
+    ) -> [MIDI.Byte] {
 
-        [0xF0] + manufacturer.bytes + data + [0xF7]
+        (leadingF0 ? [0xF0] : [])
+        + manufacturer.bytes + data
+        + (trailingF7 ? [0xF7] : [])
 
     }
 

diff --git a/Sources/MIDIKit/Events/Event/System Exclusive/UniversalSysEx/UniversalSysEx.swift b/Sources/MIDIKit/Events/Event/System Exclusive/UniversalSysEx/UniversalSysEx.swift
@@ -71,15 +71,18 @@ extension MIDI.Event {
 extension MIDI.Event.UniversalSysEx {
 
     @inline(__always)
-    public func midi1RawBytes() -> [MIDI.Byte] {
+    public func midi1RawBytes(
+        leadingF0: Bool = true,
+        trailingF7: Bool = true
+    ) -> [MIDI.Byte] {
 
-        [0xF0,
-         MIDI.Byte(universalType.rawValue),
-         deviceID.uInt8Value,
-         subID1.uInt8Value,
-         subID2.uInt8Value]
-            + data
-            + [0xF7]
+        (leadingF0 ? [0xF0] : [])
+        + [MIDI.Byte(universalType.rawValue),
+           deviceID.uInt8Value,
+           subID1.uInt8Value,
+           subID2.uInt8Value]
+        + data
+        + (trailingF7 ? [0xF7] : [])
 
     }
 

diff --git a/Tests/MIDIKitTests/Common/Utilities/DataReader Tests.swift b/Tests/MIDIKitTests/Common/Utilities/DataReader Tests.swift