Bugfix in processor

gardner-lab · Oct 10, 2016 · 6fd171d · 6fd171d
1 parent 98c64bf
commit 6fd171d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/SyllableDetector/Info.plist b/SyllableDetector/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>13</string>
+	<string>14</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/SyllableDetector/Processor.swift b/SyllableDetector/Processor.swift
@@ -289,5 +289,7 @@ final class ProcessorArduino: ProcessorBase {
                 }
             }
         }
+
+        super.prepareOutputFor(index: index, seenSyllable: seen)
     }
 }
diff --git a/SyllableDetector/ViewControllerProcessor.swift b/SyllableDetector/ViewControllerProcessor.swift
@@ -127,12 +127,16 @@ class ViewControllerProcessor: NSViewController, NSTableViewDelegate, NSTableVie
         else {
             // create process
             do {
+                // initialize processor
                 switch deviceOutput! {
                 case .arduino(let port):
                     processor = try ProcessorArduino(deviceInput: deviceInput, deviceOutput: port, entries: processorEntries)
                 case .audio(let interface):
                     processor = try ProcessorAudio(deviceInput: deviceInput, deviceOutput: interface, entries: processorEntries)
                 }
+
+                // setup
+                try processor!.setUp()
             }
             catch {
                 // show an error message
@@ -241,7 +245,7 @@ class ViewControllerProcessor: NSViewController, NSTableViewDelegate, NSTableVie
 
                         // check sampling rate
                         if (1 < abs(config.samplingRate - self.deviceInput.sampleRateInput)) {
-                            DLog("Mismatched sampling rates. Expecting: \(config.samplingRate). Device: \(self.deviceInput.sampleRateInput).")
+                            print("Mismatched sampling rates. Expecting: \(config.samplingRate). Device: \(self.deviceInput.sampleRateInput).")
                             self.processorEntries[row].resampler = ResamplerLinear(fromRate: self.deviceInput.sampleRateInput, toRate: config.samplingRate)
                         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,5 +289,7 @@ final class ProcessorArduino: ProcessorBase { @@
                     }
                 }
             }
+            super.prepareOutputFor(index: index, seenSyllable: seen)
         }
     }