Refactor device map methods to use OnixDeviceMap for consistency

Author: bparks13

Source/OnixDevice.h

@@ -144,6 +144,8 @@ namespace OnixSourcePlugin
 		std::vector<std::string> m_channelIdentifierSubTypes = { "subtypes" };
 	};
 
+	using OnixDeviceMap = std::map<uint32_t, OnixDeviceType>;
+
 	/**
 
 		Streams data from an ONIX device
@@ -156,28 +158,18 @@ namespace OnixSourcePlugin
 		/** Constructor */
 		OnixDevice(std::string name_, std::string hubName, OnixDeviceType type_, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx, bool passthrough = false);
 
-		/** Destructor */
-		~OnixDevice() { }
-
 		virtual void addFrame(oni_frame_t*) {};
-
 		virtual void processFrames() {};
 
 		const std::string getName() { return name; }
-
 		bool isEnabled() const { return enabled; }
-
 		void setEnabled(bool newState) { enabled = newState; }
 		oni_dev_idx_t getDeviceIdx(bool getPassthroughIndex = false);
 
 		virtual int configureDevice() { return -1; };
-
 		virtual bool updateSettings() { return false; };
-
 		virtual void startAcquisition() {};
-
 		virtual void stopAcquisition() {};
-
 		/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
 		virtual void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) {};
 

Source/OnixSource.cpp

@@ -589,9 +589,9 @@ OnixDeviceVector OnixSource::getDevices(OnixDeviceType type)
 	return foundDevices;
 }
 
-std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devices, bool filterDevices)
+OnixDeviceMap OnixSource::getConnectedDevices(OnixDeviceVector devices, bool filterDevices)
 {
-	std::map<int, OnixDeviceType> deviceMap;
+	OnixDeviceMap deviceMap;
 
 	for (const auto& device : devices)
 	{
@@ -603,9 +603,9 @@ std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devic
 	return deviceMap;
 }
 
-std::map<int, OnixDeviceType> OnixSource::createDeviceMap(bool filterDevices)
+OnixDeviceMap OnixSource::getConnectedDevices(bool filterDevices)
 {
-	return createDeviceMap(getEnabledDataSources(), filterDevices);
+	return getConnectedDevices(getEnabledDataSources(), filterDevices);
 }
 
 std::map<int, std::string> OnixSource::getHubNames()
@@ -952,7 +952,7 @@ std::string OnixSource::createContinuousChannelIdentifier(StreamInfo streamInfo,
 bool OnixSource::isDevicesReady()
 {
 	auto tabMap = editor->createTabMapFromCanvas();
-	auto sourceMap = createDeviceMap(true);
+	auto sourceMap = getConnectedDevices(true);
 
 	return tabMap == sourceMap;
 }

Source/OnixSource.h

@@ -117,9 +117,9 @@ namespace OnixSourcePlugin
 		std::shared_ptr<OnixDevice> getDevice(OnixDeviceType, int);
 		OnixDeviceVector getDevices(OnixDeviceType);
 
-		static std::map<int, OnixDeviceType> createDeviceMap(OnixDeviceVector, bool filterDevices = false);
+		static OnixDeviceMap getConnectedDevices(OnixDeviceVector, bool filterDevices = false);
 
-		std::map<int, OnixDeviceType> createDeviceMap(bool filterDevices = false);
+		OnixDeviceMap getConnectedDevices(bool filterDevices = false);
 
 		std::map<int, std::string> getHubNames();
 

Source/OnixSourceCanvas.cpp

@@ -245,9 +245,9 @@ void OnixSourceCanvas::removeAllTabs()
 	topLevelTabComponent->clearTabs();
 }
 
-std::map<int, OnixDeviceType> OnixSourceCanvas::createSelectedMap(std::vector<std::shared_ptr<SettingsInterface>> interfaces)
+OnixDeviceMap OnixSourceCanvas::getSelectedDevices(std::vector<std::shared_ptr<SettingsInterface>> interfaces)
 {
-	std::map<int, OnixDeviceType> tabMap;
+	OnixDeviceMap tabMap;
 
 	for (const auto& settings : interfaces)
 	{

Source/OnixSourceCanvas.h

@@ -89,7 +89,7 @@ namespace OnixSourcePlugin
 
 		Array<CustomTabComponent*> getHubTabs();
 
-		std::map<int, OnixDeviceType> createSelectedMap(std::vector<std::shared_ptr<SettingsInterface>>);
+		OnixDeviceMap getSelectedDevices(std::vector<std::shared_ptr<SettingsInterface>>);
 
 		std::vector<std::shared_ptr<SettingsInterface>> settingsInterfaces;
 
@@ -102,7 +102,6 @@ namespace OnixSourcePlugin
 	private:
 
 		OnixSourceEditor* editor;
-
 		OnixSource* source;
 
 		std::unique_ptr<CustomTabComponent> topLevelTabComponent;

Source/OnixSourceEditor.cpp

@@ -365,7 +365,7 @@ bool OnixSourceEditor::configureAllDevices()
 		connectButton->setToggleState(false, sendNotification);
 		return false;
 	}
-
+	
 	if (!source->configureBlockReadSize(source->getContext(), blockReadSizeValue->getText().getIntValue()))
 	{
 		connectButton->setToggleState(false, sendNotification);
@@ -633,9 +633,9 @@ void OnixSourceEditor::refreshComboBoxSelection()
 	if (resetPortB) headstageComboBoxB->setSelectedItemIndex(0, dontSendNotification);
 }
 
-std::map<int, OnixDeviceType> OnixSourceEditor::createTabMapFromCanvas()
+OnixDeviceMap OnixSourceEditor::createTabMapFromCanvas()
 {
-	return canvas->createSelectedMap(canvas->settingsInterfaces);
+	return canvas->getSelectedDevices(canvas->settingsInterfaces);
 }
 
 void OnixSourceEditor::saveVisualizerEditorParameters(XmlElement* xml)

Source/OnixSourceEditor.h

@@ -83,7 +83,7 @@ namespace OnixSourcePlugin
 
 		void refreshComboBoxSelection();
 
-		std::map<int, OnixDeviceType> createTabMapFromCanvas();
+		OnixDeviceMap createTabMapFromCanvas();
 
 		void setConnectedStatus(bool);