Reduce public API

Author: fulldecent

Example/Source/ViewController.swift

@@ -108,13 +108,17 @@ class ViewController: UIViewController {
     }
 
     @IBAction func doLinear() {
+        /* TODO: Make this public and then use it here
         waveform.waveformType = .linear
         updateWaveformTypeButtons()
+         */
     }
 
     @IBAction func doLogarithmic() {
+        /* TODO: Make this public and then use it here
         waveform.waveformType = .logarithmic
         updateWaveformTypeButtons()
+        */
     }
 
     @IBAction func doChangeColors() {
@@ -142,6 +146,7 @@ class ViewController: UIViewController {
     }
 
     func updateWaveformTypeButtons() {
+        /* TODO: Make this public and then use it here
         let (selectedButton, nonSelectedButton): (UIButton, UIButton) = {
             switch waveform.waveformType {
             case .linear: return (linearButton, logarithmicButton)
@@ -151,6 +156,7 @@ class ViewController: UIViewController {
         selectedButton.layer.borderColor = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 0.25).cgColor
         selectedButton.layer.borderWidth = 2
         nonSelectedButton.layer.borderWidth = 0
+        */
     }
 }
 

Source/FDWaveformRenderOperation.swift

@@ -2,12 +2,16 @@
 // Copyright 2013 - 2017, William Entriken and the FDWaveformView contributors.
 //
 import UIKit
+import AVFoundation
+import Accelerate
 
 /// Format options for FDWaveformRenderOperation
-public struct FDWaveformRenderFormat {
+//MAYBE: Make this public
+struct FDWaveformRenderFormat {
 
     /// The type of waveform to render
-    public var type: FDWaveformType
+    //TODO: make this public after reconciling FDWaveformView.WaveformType and FDWaveformType
+    var type: FDWaveformType
 
     /// The color of the waveform
     public var wavesColor: UIColor
@@ -30,7 +34,7 @@ public struct FDWaveformRenderFormat {
                   scale: UIScreen.main.scale)
     }
 
-    public init(type: FDWaveformType, wavesColor: UIColor, scale: CGFloat) {
+    init(type: FDWaveformType, wavesColor: UIColor, scale: CGFloat) {
         self.type = type
         self.wavesColor = wavesColor
         self.scale = scale
@@ -50,7 +54,7 @@ final public class FDWaveformRenderOperation: Operation {
     public let sampleRange: CountableRange<Int>
 
     /// Format of waveform image
-    public let format: FDWaveformRenderFormat
+    let format: FDWaveformRenderFormat
 
     // MARK: - NSOperation Overrides
 

Source/FDWaveformView.swift

@@ -92,12 +92,13 @@ open class FDWaveformView: UIView {
     /*@IBInspectable*/ open var doesAllowScroll = true
 
     /// Supported waveform types
-    public enum WaveformType {
+    //TODO: make this public after reconciling FDWaveformView.WaveformType and FDWaveformType
+    enum WaveformType {
         case linear, logarithmic
     }
 
     // Type of waveform to display
-    open var waveformType: WaveformType = .logarithmic {
+    var waveformType: WaveformType = .logarithmic {
         didSet {
             setNeedsDisplay()
             setNeedsLayout()
@@ -198,7 +199,8 @@ open class FDWaveformView: UIView {
     }
 
     /// Waveform type for rending waveforms
-    public var waveformRenderType: FDWaveformType {
+    //TODO: make this public after reconciling FDWaveformView.WaveformType and FDWaveformType
+    var waveformRenderType: FDWaveformType {
         get {
             switch waveformType {
             case .linear: return .linear
@@ -434,7 +436,8 @@ open class FDWaveformView: UIView {
     }
 }
 
-public enum FDWaveformType: Equatable {
+//TODO: make this public after reconciling FDWaveformView.WaveformType and FDWaveformType
+enum FDWaveformType: Equatable {
     /// Waveform is rendered using a linear scale
     case linear
 
@@ -457,14 +460,14 @@ public enum FDWaveformType: Equatable {
         return false
     }
 
-    fileprivate var floorValue: CGFloat {
+    public var floorValue: CGFloat {
         switch self {
         case .linear: return 0
         case .logarithmic(let noiseFloor): return noiseFloor
         }
     }
 
-    fileprivate func process(normalizedSamples: inout [Float]) {
+    func process(normalizedSamples: inout [Float]) {
         switch self {
         case .linear:
             return