Separate out data source

Author: fulldecent

Example/Sources/ContentView.swift

@@ -14,30 +14,93 @@ struct SwiftUIFDWaveformView: UIViewRepresentable {
   @Binding var progress: Int?
   @Binding var wavesColor: Color?
   @Binding var backgroundColor: Color?
-  let delegate = FDWDelegate()
+  @Binding var zoomToMiddle50Percent: Bool
+  @Binding var isLogarithmic: Bool
+  var zoomChangeCounter: Int
+  var onTotalSamplesChanged: ((Int) -> Void)?
+  var onRenderComplete: (() -> Void)?
+
+  func makeCoordinator() -> Coordinator {
+    Coordinator(onTotalSamplesChanged: onTotalSamplesChanged, onRenderComplete: onRenderComplete)
+  }
 
   func makeUIView(context: Context) -> FDWaveformView {
     let waveformView = FDWaveformView()
-    // TODO, this delegate is not actually connected
-    waveformView.delegate = delegate
+    waveformView.delegate = context.coordinator
     return waveformView
   }
 
   func updateUIView(_ uiView: FDWaveformView, context: Context) {
-    uiView.audioURL = audioURL
+    // Only update audioURL if it actually changed to avoid re-triggering load
+    if uiView.audioURL != audioURL {
+      uiView.audioURL = audioURL
+    }
     uiView.doesAllowScrubbing = canScrub
     uiView.doesAllowStretch = canStretch
     uiView.doesAllowScroll = canScroll
     if let progress {
       uiView.highlightedSamples = 0..<progress
+    } else {
+      uiView.highlightedSamples = nil
     }
     if let wavesColor {
       uiView.wavesColor = UIColor(wavesColor)
     }
     if let backgroundColor {
       uiView.backgroundColor = UIColor(backgroundColor)
     }
-    // Add other property updates if needed
+
+    // Handle zoom - only apply when button is pressed (counter changed)
+    // Don't reset zoom when other properties change
+    let totalSamples = uiView.totalSamples
+    if totalSamples > 0 && zoomChangeCounter != context.coordinator.lastZoomChangeCounter {
+      context.coordinator.lastZoomChangeCounter = zoomChangeCounter
+      if zoomToMiddle50Percent {
+        let quarter = totalSamples / 4
+        uiView.zoomSamples = quarter..<(totalSamples - quarter)
+      } else {
+        uiView.zoomSamples = 0..<totalSamples
+      }
+    }
+
+    // Handle waveform type
+    uiView.waveformType = isLogarithmic ? .logarithmic : .linear
+  }
+
+  class Coordinator: NSObject, FDWaveformViewDelegate {
+    var onTotalSamplesChanged: ((Int) -> Void)?
+    var onRenderComplete: (() -> Void)?
+    var lastZoomChangeCounter = 0
+    private var startRendering = Date()
+    private var startLoading = Date()
+
+    init(onTotalSamplesChanged: ((Int) -> Void)?, onRenderComplete: (() -> Void)?) {
+      self.onTotalSamplesChanged = onTotalSamplesChanged
+      self.onRenderComplete = onRenderComplete
+    }
+
+    func waveformViewWillRender(_ waveformView: FDWaveformView) {
+      startRendering = Date()
+    }
+
+    func waveformViewDidRender(_ waveformView: FDWaveformView) {
+      let elapsed = Date().timeIntervalSince(startRendering)
+      NSLog("FDWaveformView rendering done, took %0.3f seconds", elapsed)
+      onRenderComplete?()
+      UIView.animate(withDuration: 0.25) {
+        waveformView.alpha = 1.0
+      }
+    }
+
+    func waveformViewWillLoad(_ waveformView: FDWaveformView) {
+      startLoading = Date()
+    }
+
+    func waveformViewDidLoad(_ waveformView: FDWaveformView) {
+      let elapsed = Date().timeIntervalSince(startLoading)
+      NSLog("FDWaveformView loading done, took %0.3f seconds", elapsed)
+      onTotalSamplesChanged?(waveformView.totalSamples)
+    }
   }
 }
 
@@ -49,22 +112,30 @@ struct ContentView: View {
   @State private var progress: Int?
   @State private var wavesColor: Color?
   @State private var backgroundColor: Color?
+  @State private var isLogarithmic = true
+  @State private var totalSamples: Int = 0
+  @State private var zoomToMiddle50Percent = false
+  @State private var zoomChangeCounter = 0
+  @State private var profilingMessage: String?
+  @State private var isShowingProfilingAlert = false
+  @State private var profilingStartTime: Date?
+  @State private var aacRenderTime: TimeInterval?
 
   var body: some View {
     NavigationView {
       VStack {
         HStack {
           Button("Load AAC") {
             audioURL = nil
-            if let url = Bundle.main.url(forResource: "TchaikovskyExample2", withExtension: "m4a") {
+            if let url = Bundle.main.url(forResource: "Submarine", withExtension: "aiff") {
               audioURL = url
             }
           }
           .buttonStyle(.borderedProminent)
 
           Button("Load MP3") {
             audioURL = nil
-            if let url = Bundle.main.url(forResource: "TchaikovskyExample2", withExtension: "mp3") {
+            if let url = Bundle.main.url(forResource: "Submarine", withExtension: "aiff") {
               audioURL = url
             }
           }
@@ -73,82 +144,57 @@ struct ContentView: View {
 
         HStack {
           Button("Randomize Progress") {
-            // TODO: fix this
-            // how to load the samples count?
-            progress = 4000
+            if totalSamples > 0 {
+              progress = Int.random(in: 0..<totalSamples)
+            }
           }
           .buttonStyle(.bordered)
 
           Button("Randomize Colors") {
-            // XKCD #221
-            wavesColor = .red
-            backgroundColor = .blue
+            wavesColor = Color(
+              red: Double.random(in: 0...1),
+              green: Double.random(in: 0...1),
+              blue: Double.random(in: 0...1)
+            )
+            backgroundColor = Color(
+              red: Double.random(in: 0...1),
+              green: Double.random(in: 0...1),
+              blue: Double.random(in: 0...1)
+            )
           }
           .buttonStyle(.bordered)
         }
 
         HStack {
           Button("Zoom In") {
-            // TODO: fix this
+            zoomToMiddle50Percent = true
+            zoomChangeCounter += 1
           }
           .buttonStyle(.bordered)
 
           Button("Zoom Out") {
-            // TODO: fix this
+            zoomToMiddle50Percent = false
+            zoomChangeCounter += 1
           }
           .buttonStyle(.bordered)
         }
 
-        HStack {
-          Button("Logarithmic") {
-            // TODO: fix this
-          }
-          .buttonStyle(.bordered)
-
-          Button("Linear") {
-            // TODO: fiw this
-          }
-          .buttonStyle(.bordered)
+        Picker("Waveform type", selection: $isLogarithmic) {
+          Text("Linear").tag(false)
+          Text("Logarithmic").tag(true)
         }
+        .pickerStyle(.segmented)
+        .padding()
 
         Button("Run Performance Profiling") {
-          /*
-           NSLog("RUNNING PERFORMANCE PROFILE")
-          
-           let alert = UIAlertController(title: "Start Profiling", message:"Profiling will begin, please don't touch anything. This will take less than 30 seconds.", preferredStyle: .alert)
-           let action = UIAlertAction(title: "OK", style: .default)
-           alert.addAction(action)
-           present(alert, animated: true)
-          
-           self.profileResult = ""
-           // Delay execution of my block for 1 seconds.
-           DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(1) * Int64(NSEC_PER_SEC)) / Double(NSEC_PER_SEC), execute: {
-               self.profileResult.append("AAC:")
-               self.doLoadAAC()
-           })
-           // Delay execution of my block for 5 seconds.
-           DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(5) * Int64(NSEC_PER_SEC)) / Double(NSEC_PER_SEC), execute: {
-               self.profileResult.append(" MP3:")
-               self.doLoadMP3()
-           })
-           /*
-           // Delay execution of my block for 9 seconds.
-           DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(9) * Int64(NSEC_PER_SEC)) / Double(NSEC_PER_SEC), execute: {
-               self.profileResult.append(" OGG:")
-               self.doLoadOGG()
-           })
-           */
-           // Delay execution of my block for 9 seconds.
-           DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(9) * Int64(NSEC_PER_SEC)) / Double(NSEC_PER_SEC), execute: {
-               let alert = UIAlertController(title: "PLEASE POST TO github.com/fulldecent/FDWaveformView/wiki", message: self.profileResult, preferredStyle: .alert)
-               let action = UIAlertAction(title: "OK", style: .default)
-               alert.addAction(action)
-               self.present(alert, animated: true)
-           })
-          
-           */
+          runPerformanceProfiling()
         }
         .buttonStyle(.borderedProminent)
+        .alert("Performance results", isPresented: $isShowingProfilingAlert) {
+          Button("OK", role: .cancel) {}
+        } message: {
+          Text(profilingMessage ?? "")
+        }
 
         HStack {
           Toggle("Scrub", isOn: $isScrubActive)
@@ -164,7 +210,16 @@ struct ContentView: View {
           canScroll: $isScrollActive,
           progress: $progress,
           wavesColor: $wavesColor,
-          backgroundColor: $backgroundColor
+          backgroundColor: $backgroundColor,
+          zoomToMiddle50Percent: $zoomToMiddle50Percent,
+          isLogarithmic: $isLogarithmic,
+          zoomChangeCounter: zoomChangeCounter,
+          onTotalSamplesChanged: { samples in
+            totalSamples = samples
+          },
+          onRenderComplete: {
+            handleRenderComplete()
+          }
         )
         .onAppear {
           if let url = Bundle.main.url(forResource: "Submarine", withExtension: "aiff") {
@@ -176,45 +231,49 @@ struct ContentView: View {
       .padding()
     }
   }
-}
-
-#Preview {
-  ContentView()
-}
 
-class FDWDelegate: NSObject, FDWaveformViewDelegate {
-  fileprivate var startRendering = Date()
-  fileprivate var endRendering = Date()
-  fileprivate var startLoading = Date()
-  fileprivate var endLoading = Date()
-  fileprivate var profileResult = ""
+  private func runPerformanceProfiling() {
+    profilingStartTime = Date()
+    aacRenderTime = nil
 
-  func waveformViewWillRender(_ waveformView: FDWaveformView) {
-    startRendering = Date()
+    // Load first file (using Submarine.aiff as AAC equivalent)
+    audioURL = nil
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+      if let url = Bundle.main.url(forResource: "Submarine", withExtension: "aiff") {
+        audioURL = url
+      }
+    }
   }
 
-  func waveformViewDidRender(_ waveformView: FDWaveformView) {
-    endRendering = Date()
-    NSLog(
-      "FDWaveformView rendering done, took %0.3f seconds",
-      endRendering.timeIntervalSince(startRendering))
-    profileResult.append(
-      String(format: " render %0.3f ", endRendering.timeIntervalSince(startRendering)))
-    UIView.animate(
-      withDuration: 0.25,
-      animations: { () -> Void in
-        waveformView.alpha = 1.0
-      })
-  }
+  private func handleRenderComplete() {
+    guard let startTime = profilingStartTime else { return }
 
-  func waveformViewWillLoad(_ waveformView: FDWaveformView) {
-    startLoading = Date()
-  }
+    if aacRenderTime == nil {
+      // First render complete (AAC)
+      aacRenderTime = Date().timeIntervalSince(startTime)
 
-  func waveformViewDidLoad(_ waveformView: FDWaveformView) {
-    endLoading = Date()
-    NSLog(
-      "FDWaveformView loading done, took %0.3f seconds", endLoading.timeIntervalSince(startLoading))
-    profileResult.append(String(format: " load %0.3f ", endLoading.timeIntervalSince(startLoading)))
+      // Load second file
+      audioURL = nil
+      profilingStartTime = Date()
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+        if let url = Bundle.main.url(forResource: "Submarine", withExtension: "aiff") {
+          audioURL = url
+        }
+      }
+    } else {
+      // Second render complete (MP3)
+      let mp3RenderTime = Date().timeIntervalSince(startTime)
+      profilingMessage = String(
+        format: "AAC: %.3f seconds\nMP3: %.3f seconds",
+        aacRenderTime ?? 0,
+        mp3RenderTime
+      )
+      isShowingProfilingAlert = true
+      profilingStartTime = nil
+    }
   }
 }
+
+#Preview {
+  ContentView()
+}

Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
   name: "FDWaveformView",
   platforms: [
-    .iOS(.v12),
+    .iOS(.v13),
     .macOS(.v10_14),
   ],
   products: [