Cubase.TrackArchive: extractDAWMarkers() method now returns [DAWMarkerTrack]

Author: orchetect

Sources/DAWFileKit/Cubase/TrackArchive/Conversion/TrackArchive Extract DAWMarkers.swift

@@ -11,13 +11,16 @@ import TimecodeKit
 
 extension Cubase.TrackArchive {
     /// Parses the contents and extracts marker events from marker tracks.
-    public func extractDAWMarkers() throws -> [[DAWMarker]] {
+    public func extractDAWMarkers() throws -> [DAWMarkerTrack] {
         guard let frameRate = main.frameRate else {
             throw ParseError.general(
                 "Could not determine frame rate."
             )
         }
 
+        // init array so we can append to it
+        var dawMarkerTracks: [DAWMarkerTrack] = []
+        
         // filter just marker tracks (in case there are other non-marker tracks in the data set)
 
         var markerTracks = tracks?.compactMap { $0 as? Cubase.TrackArchive.MarkerTrack } ?? []
@@ -42,15 +45,22 @@ extension Cubase.TrackArchive {
             }
         }
 
-        // translate to native Marker objects
-        
-        let markers = markerTracks.map {
-            $0.events.convertToDAWMarkers(
+        for markerTrack in markerTracks {
+            // translate to native Marker objects
+            let markers = markerTrack.events.convertToDAWMarkers(
                 originalFrameRate: frameRate
             )
+            
+            let dawMarkerTrack = DAWMarkerTrack(
+                trackType: .track,
+                name: markerTrack.name ?? "",
+                markers: markers
+            )
+            
+            dawMarkerTracks.append(dawMarkerTrack)
         }
 
-        return markers
+        return dawMarkerTracks
     }
 }
 

Sources/DAWFileKit/ProTools/SessionInfo/Conversion/SessionInfo Extract DAWMarkers.swift

@@ -32,7 +32,7 @@ extension Array where Element == ProTools.SessionInfo.Marker {
         let subFramesBase: Timecode.SubFramesBase = .max100SubFrames
 
         // init array so we can append to it
-        var markerTracks: [DAWMarkerTrack] = []
+        var dawMarkerTracks: [DAWMarkerTrack] = []
 
         for marker in self {
             // TODO: handle PT Session info text files that don't use Timecode as the primary time format
@@ -56,7 +56,7 @@ extension Array where Element == ProTools.SessionInfo.Marker {
             // create new track if necessary.
 
             let trackIndex: Int
-            if let ti = markerTracks.firstIndex(where: { dawMarkerTrack in
+            if let ti = dawMarkerTracks.firstIndex(where: { dawMarkerTrack in
                 dawMarkerTrack.name == marker.trackName &&
                 dawMarkerTrack.trackType == marker.trackType
             }) {
@@ -67,14 +67,14 @@ extension Array where Element == ProTools.SessionInfo.Marker {
                     name: marker.trackName,
                     markers: []
                 )
-                markerTracks.append(newMarkerTrack)
-                trackIndex = markerTracks.indices.last!
+                dawMarkerTracks.append(newMarkerTrack)
+                trackIndex = dawMarkerTracks.indices.last!
             }
 
-            markerTracks[trackIndex].markers.append(newMarker)
+            dawMarkerTracks[trackIndex].markers.append(newMarker)
         }
 
-        return markerTracks
+        return dawMarkerTracks
     }
 }