Ensure that AuxiliaryIO is correctly enabled/disabled

Author: bparks13

Source/Devices/AuxiliaryIO.cpp

@@ -29,6 +29,8 @@ using namespace OnixSourcePlugin;
 AuxiliaryIO::AuxiliaryIO(std::string name, std::string hubName, const oni_dev_idx_t analogIndex, const oni_dev_idx_t digitalIndex, std::shared_ptr<Onix1> oni_ctx)
 	: CompositeDevice(name, hubName, AuxiliaryIO::getCompositeDeviceType(), createAuxiliaryIODevices(hubName, analogIndex, digitalIndex, oni_ctx), oni_ctx)
 {
+	analogIO = getDevice<AnalogIO>(OnixDeviceType::ANALOGIO);
+	digitalIO = getDevice<DigitalIO>(OnixDeviceType::DIGITALIO);
 }
 
 // NB: This constructor assumes that the digitalIO device is located at one index above the analogIndex
@@ -47,11 +49,13 @@ OnixDeviceVector AuxiliaryIO::createAuxiliaryIODevices(std::string hubName, cons
 	return devices;
 }
 
-void AuxiliaryIO::processFrames()
+bool AuxiliaryIO::isEnabled() const
 {
-	auto analogIO = getAnalogIO();
-	auto digitalIO = getDigitalIO();
+	return analogIO->isEnabled();
+}
 
+void AuxiliaryIO::processFrames()
+{
 	if (!digitalIO->isEnabled() && !analogIO->isEnabled())
 	{
 		return;
@@ -99,10 +103,10 @@ CompositeDeviceType AuxiliaryIO::getCompositeDeviceType()
 
 std::shared_ptr<AnalogIO> AuxiliaryIO::getAnalogIO()
 {
-	return getDevice<AnalogIO>(OnixDeviceType::ANALOGIO);
+	return analogIO;
 }
 
 std::shared_ptr<DigitalIO> AuxiliaryIO::getDigitalIO()
 {
-	return getDevice<DigitalIO>(OnixDeviceType::DIGITALIO);
+	return digitalIO;
 }

Source/Devices/AuxiliaryIO.h

@@ -40,6 +40,8 @@ namespace OnixSourcePlugin
 
 		AuxiliaryIO(std::string name, std::string hubName, const oni_dev_idx_t analogIndex, const oni_dev_idx_t digitalIndex, std::shared_ptr<Onix1> oni_ctx);
 
+		bool isEnabled() const override;
+
 		static OnixDeviceType getDeviceType();
 		static CompositeDeviceType getCompositeDeviceType();
 
@@ -52,6 +54,9 @@ namespace OnixSourcePlugin
 
 		static OnixDeviceVector createAuxiliaryIODevices(std::string hubName, const oni_dev_idx_t analogIndex, const oni_dev_idx_t digitalIndex, std::shared_ptr<Onix1> oni_ctx);
 
+		std::shared_ptr<AnalogIO> analogIO;
+		std::shared_ptr<DigitalIO> digitalIO;
+
 		JUCE_LEAK_DETECTOR(AuxiliaryIO);
 	};
 }

Source/OnixDevice.cpp

@@ -251,6 +251,18 @@ bool CompositeDevice::compareIndex(uint32_t index)
 	return false;
 }
 
+bool CompositeDevice::isEnabled() const
+{
+	bool enabled = true;
+
+	for (const auto& device : devices)
+	{
+		enabled &= device->isEnabled();
+	}
+
+	return enabled;
+}
+
 bool CompositeDevice::isEnabled(uint32_t index)
 {
 	for (const auto& device : devices)
@@ -267,6 +279,14 @@ bool CompositeDevice::isEnabled(uint32_t index)
 	return false;
 }
 
+void CompositeDevice::setEnabled(bool newState)
+{
+	for (const auto& device : devices)
+	{
+		device->setEnabled(newState);
+	}
+}
+
 void CompositeDevice::setEnabled(uint32_t index, bool newState)
 {
 	for (const auto& device : devices)

Source/OnixDevice.h

@@ -166,8 +166,8 @@ namespace OnixSourcePlugin
 		virtual bool compareIndex(uint32_t index);
 
 		const std::string getName() { return name; }
-		bool isEnabled() const { return enabled; }
-		void setEnabled(bool newState) { enabled = newState; }
+		virtual bool isEnabled() const { return enabled; }
+		virtual void setEnabled(bool newState) { enabled = newState; }
 		oni_dev_idx_t getDeviceIdx(bool getPassthroughIndex = false);
 
 		/** Creates a stream name using the provided inputs, returning a string following the pattern: name[0]-name[1]-name[2]-etc., with all spaces removed */
@@ -245,7 +245,9 @@ namespace OnixSourcePlugin
 		CompositeDeviceType getCompositeDeviceType() const;
 
 		bool compareIndex(uint32_t index) override;
+		bool isEnabled() const override;
 		bool isEnabled(uint32_t index);
+		void setEnabled(bool newState) override;
 		void setEnabled(uint32_t index, bool newState);
 		int configureDevice() override;
 		bool updateSettings() override;

Source/UI/AuxiliaryIOInterface.cpp

@@ -38,25 +38,20 @@ AuxiliaryIOInterface::AuxiliaryIOInterface(std::shared_ptr<AuxiliaryIO> d, OnixS
 		static int offset = 55;
 		FontOptions font = FontOptions("Fira Code", "Bold", 22.0f);
 
-		analogLabel = std::make_unique<Label>("analogLabel", "Analog IO");
-		analogLabel->setBounds(20, 20, 150, 35);
-		analogLabel->setFont(font);
-		addAndMakeVisible(analogLabel.get());
+		analogDigitalLabel = std::make_unique<Label>("analogDigitalLabel", "Analog and Digital IO");
+		analogDigitalLabel->setBounds(20, 20, 350, 35);
+		analogDigitalLabel->setFont(font);
+		addAndMakeVisible(analogDigitalLabel.get());
 
 		analogInterface = std::make_unique<AnalogIOInterface>(auxiliaryIO->getAnalogIO(), e, c);
 		analogViewport = std::make_unique<CustomViewport>(analogInterface.get(), SettingsInterface::Width / 2, SettingsInterface::Height);
 		analogViewport->setBounds(0, offset, SettingsInterface::Width / 2, SettingsInterface::Height);
 		addAndMakeVisible(analogViewport.get());
 
-		digitalLabel = std::make_unique<Label>("digitalLabel", "Digital IO");
-		digitalLabel->setBounds(analogLabel->getX() + SettingsInterface::Width / 2, analogLabel->getY(), analogLabel->getWidth(), analogLabel->getHeight());
-		digitalLabel->setFont(font);
-		addAndMakeVisible(digitalLabel.get());
-
 		digitalInterface = std::make_unique<DigitalIOInterface>(auxiliaryIO->getDigitalIO(), e, c);
 		digitalViewport = std::make_unique<CustomViewport>(digitalInterface.get(), SettingsInterface::Width / 2, SettingsInterface::Height);
 		digitalViewport->setBounds(SettingsInterface::Width / 2, offset, SettingsInterface::Width / 2, SettingsInterface::Height);
-		addAndMakeVisible(digitalViewport.get());
+		//addAndMakeVisible(digitalViewport.get()); // NB: Hide digital interface for now, if the digitalIO UI gets updates that need to be displayed they can be shown here
 	}
 }
 
@@ -74,8 +69,8 @@ void AuxiliaryIOInterface::saveParameters(XmlElement* xml)
 
 void AuxiliaryIOInterface::loadParameters(XmlElement* xml)
 {
-	analogInterface->saveParameters(xml);
-	digitalInterface->saveParameters(xml);
+	analogInterface->loadParameters(xml);
+	digitalInterface->loadParameters(xml);
 }
 
 void AuxiliaryIOInterface::updateInfoString()

Source/UI/AuxiliaryIOInterface.h

@@ -57,8 +57,7 @@ namespace OnixSourcePlugin
 		std::unique_ptr<AnalogIOInterface> analogInterface;
 		std::unique_ptr<DigitalIOInterface> digitalInterface;
 
-		std::unique_ptr<Label> analogLabel;
-		std::unique_ptr<Label> digitalLabel;
+		std::unique_ptr<Label> analogDigitalLabel;
 
 		JUCE_LEAK_DETECTOR(AuxiliaryIOInterface);
 	};