Fixed the processing/UI thread sync issue brought up by Aaron in the PR

- Also, changed Clock divider level: label to Clock divide ratio:
- Also, clock divide settings are now serialized to the configuration
  XML during a settings save.

Author: jonnew

Builds/Linux/build/libokFrontPanel.so

@@ -933,6 +933,7 @@ void RHD2000Editor::saveCustomParameters(XmlElement* xml)
     xml->setAttribute("save_impedance_measurements",saveImpedances);
     xml->setAttribute("auto_measure_impedances",measureWhenRecording);
 	xml->setAttribute("LEDs", ledButton->getToggleState());
+	xml->setAttribute("ClockDivideRatio", clockInterface->getClockDivideRatio());
 }
 
 void RHD2000Editor::loadCustomParameters(XmlElement* xml)
@@ -955,6 +956,7 @@ void RHD2000Editor::loadCustomParameters(XmlElement* xml)
     saveImpedances = xml->getBoolAttribute("save_impedance_measurements");
     measureWhenRecording = xml->getBoolAttribute("auto_measure_impedances");
 	ledButton->setToggleState(xml->getBoolAttribute("LEDs", true),sendNotification);
+    clockInterface->setClockDivideRatio(xml->getIntAttribute("ClockDivideRatio")); 
 }
 
 
@@ -1440,7 +1442,7 @@ ClockDivideInterface::ClockDivideInterface(RHD2000Thread* board_,
  , editor(editor_)
 
 {
-    divideRatioSelection = new Label("Clock Divider", lastDivideRatioString); 
+    divideRatioSelection = new Label("Clock Divide", lastDivideRatioString); 
     divideRatioSelection->setEditable(true,false,false);
     divideRatioSelection->addListener(this);
     divideRatioSelection->setBounds(30,10,30,20);
@@ -1485,7 +1487,7 @@ void ClockDivideInterface::paint(Graphics& g)
     g.setColour(Colours::darkgrey);
     g.setFont(Font("Small Text",9,Font::plain));
     g.drawText(name, 0, 0, 200, 15, Justification::left, false);
-    g.drawText("Level: ", 0, 10, 200, 20, Justification::left, false);
+    g.drawText("Ratio: ", 0, 10, 200, 20, Justification::left, false);
 }
 
 // DSP Options --------------------------------------------------------------------

Source/Processors/DataThreads/RHD2000Editor.cpp

@@ -1710,6 +1710,7 @@ bool RHD2000Thread::updateBuffer()
         evalBoard->setDacHighpassFilter(desiredDAChpf);
         evalBoard->enableDacHighpassFilter(desiredDAChpfState);
 		evalBoard->enableBoardLeds(ledsEnabled);
+        evalBoard->setClockDivider(clockDivideFactor);
 
         dacOutputShouldChange = false;
     }
@@ -1823,10 +1824,6 @@ void RHD2000Thread::enableBoardLeds(bool enable)
 
 int RHD2000Thread::setClockDivider(int divide_ratio)
 {
-    // TODO: only allow if not running?
-	//if (isAcquisitionActive())
-    //
-    uint16_t N;
 
     // Divide ratio should be 1 or an even number
     if (divide_ratio != 1 && divide_ratio % 2) 
@@ -1838,11 +1835,14 @@ int RHD2000Thread::setClockDivider(int divide_ratio)
     // 1        0
     // >=2      Ratio/2
     if (divide_ratio == 1)
-        N = 0;
+        clockDivideFactor = 0;
     else
-        N = static_cast<uint16_t>(divide_ratio/2);
+        clockDivideFactor = static_cast<uint16_t>(divide_ratio/2);
 
-    evalBoard->setClockDivider(N);
+	if (isAcquisitionActive())
+        dacOutputShouldChange = true;
+    else 
+        evalBoard->setClockDivider(clockDivideFactor);
 
     return divide_ratio;
 }

Source/Processors/DataThreads/RHD2000Thread.cpp

@@ -25,7 +25,6 @@
 #ifndef __RHD2000THREAD_H_2C4CBD67__
 #define __RHD2000THREAD_H_2C4CBD67__
 
-
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 #include <stdio.h>
@@ -209,6 +208,9 @@ class RHD2000Thread : public DataThread, public Timer
 	ScopedPointer<RHDImpedanceMeasure> impedanceThread;
 	bool ledsEnabled;
 
+    // Sync ouput divide factor
+    int16_t clockDivideFactor;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(RHD2000Thread);
 };