Make possible to save and load processor signal chains

Author: aacuevas

Source/Processors/GenericProcessor/GenericProcessor.h

@@ -36,7 +36,7 @@ enum ChannelType {HEADSTAGE_CHANNEL = 0, AUX_CHANNEL = 1, ADC_CHANNEL = 2, EVENT
 #include "../Parameter/Parameter.h"
 #include "../Channel/Channel.h"
 #include "../../CoreServices.h"
-#include "../PluginManager/OpenEphysPlugin.h"
+#include "../PluginManager/PluginClass.h"
 
 #include <time.h>
 #include <stdio.h>
@@ -66,7 +66,7 @@ class Channel;
 
 */
 
-class PLUGIN_API GenericProcessor : public AudioProcessor
+class PLUGIN_API GenericProcessor : public AudioProcessor, public PluginClass
 {
 public:
 
@@ -101,7 +101,7 @@ class PLUGIN_API GenericProcessor : public AudioProcessor
     virtual AudioProcessorEditor* createEditor();
 
     /** The default is to have no editor.*/
-    bool hasEditor() const;
+    virtual bool hasEditor() const;
 
     /** JUCE method. Not used.*/
     void reset();

Source/Processors/PlaceholderProcessor/PlaceholderProcessor.cpp

@@ -43,7 +43,8 @@ bool PlaceholderProcessor::hasEditor() const
 
 AudioProcessorEditor* PlaceholderProcessor::createEditor()
 {
-	return new PlaceholderProcessorEditor(this, processorName, libName, libVersion);
+	editor = new PlaceholderProcessorEditor(this, processorName, libName, libVersion);
+	return editor;
 }
 
 void PlaceholderProcessor::process(AudioSampleBuffer& continuousBuffer,	MidiBuffer& eventBuffer)
@@ -60,7 +61,8 @@ bool PlaceholderProcessor::isSink()
 	return processorSink;
 }
 
-bool PlaceholderProcessor::enable()
+bool PlaceholderProcessor::isReady()
 {
+	CoreServices::sendStatusMessage("Cannot acquire with placeholder nodes");
 	return false; //This processor never allows processing
 }

Source/Processors/PlaceholderProcessor/PlaceholderProcessor.h

@@ -39,7 +39,7 @@ class PlaceholderProcessor : public GenericProcessor
 		MidiBuffer& eventBuffer) override;
 	bool isSource() override;
 	bool isSink() override;
-	bool enable() override;
+	bool isReady() override;
 private:
 	const String processorName;
 	const String libName;

Source/Processors/PlaceholderProcessor/PlaceholderProcessorEditor.cpp

@@ -27,18 +27,18 @@ PlaceholderProcessorEditor::PlaceholderProcessorEditor(GenericProcessor* parentN
 	: GenericEditor(parentNode, true), processorName(pName), libName(lName), libVersion(lVer)
 {
 	notfoundLabel = new Label("Not found", "Plugin not found");
-	notfoundLabel->setBounds(30, 30, 100, 20);
+	notfoundLabel->setBounds(10, 25, 100, 20);
 	addAndMakeVisible(notfoundLabel);
 
 	libLabel = new Label("Plugin", libName + " ver. " + String(libVersion));
-	libLabel->setBounds(30, 70, 100, 20);
+	libLabel->setBounds(10, 40, 160, 40);
 	addAndMakeVisible(libLabel);
 
 	nameLabel = new Label("Processor", "Missing processor: " + processorName);
-	libLabel->setBounds(30, 110, 100, 20);
+	nameLabel->setBounds(10, 75, 160, 40);
 	addAndMakeVisible(nameLabel);
 
-	desiredWidth = 150;
+	desiredWidth = 180;
 	setEnabledState(false);
 }
 

Source/Processors/PluginManager/PluginClass.cpp

@@ -22,3 +22,91 @@
  */
 
 #include "PluginClass.h"
+#include "PluginManager.h"
+#include "../../AccessClass.h"
+#include "../ProcessorManager/ProcessorManager.h"
+
+PluginClass::PluginClass()
+{
+	libName = String::empty;
+	pluginName = String::empty;
+	libVersion = -1;
+	pluginType = Plugin::NotAPlugin;
+}
+
+PluginClass::~PluginClass()
+{
+
+}
+
+void PluginClass::setPluginData(Plugin::PluginType type, int index)
+{
+	PluginManager* pm = AccessClass::getPluginManager();
+	String name;
+	pluginType = type;
+	pluginIndex = index;
+	switch (type)
+	{
+	case Plugin::ProcessorPlugin:
+	{
+		Plugin::ProcessorInfo i = pm->getProcessorInfo(index);
+		name = i.name;
+	}
+	break;
+	case Plugin::RecordEnginePlugin:
+	{
+		Plugin::RecordEngineInfo i = pm->getRecordEngineInfo(index);
+		name = i.name;
+	}
+	break;
+	case Plugin::DatathreadPlugin:
+	{
+		Plugin::DataThreadInfo i = pm->getDataThreadInfo(index);
+		name = i.name;
+	}
+	break;
+	case Plugin::FileSourcePlugin:
+	{
+		Plugin::FileSourceInfo i = pm->getFileSourceInfo(index);
+		name = i.name;
+	}
+	break;
+	case Plugin::NotAPlugin:
+	{
+		String pName;
+		int pType;
+		ProcessorManager::getProcessorNameAndType(BuiltInProcessor, index, pName, pType);
+		name = pName;
+	}
+	default:
+		return;
+	}
+	pluginName = name;
+	libName = pm->getLibraryName(pm->getLibraryIndexFromPlugin(type, index));
+	libVersion = pm->getLibraryVersion(pm->getLibraryIndexFromPlugin(type, index));
+}
+
+String PluginClass::getLibName() const
+{
+	return libName;
+}
+
+String PluginClass::getPluginName() const
+{
+	return pluginName;
+}
+
+int PluginClass::getLibVersion() const
+{
+	return libVersion;
+}
+
+Plugin::PluginType PluginClass::getPluginType() const
+{
+	return pluginType;
+}
+
+int PluginClass::getIndex() const
+{
+	return pluginIndex;
+}

Source/Processors/PluginManager/PluginClass.h

@@ -28,11 +28,20 @@
 class PluginClass
 {
 public:
+	PluginClass();
+	~PluginClass();
 	void setPluginData(Plugin::PluginType type, int index);
+	String getLibName() const;
+	String getPluginName() const;
+	int getLibVersion() const;
+	Plugin::PluginType getPluginType() const;
+	int getIndex() const;
 private:
 	String libName;
 	String pluginName;
+	Plugin::PluginType pluginType;
 	int libVersion;
+	int pluginIndex;
 };
 
 

Source/Processors/PluginManager/PluginManager.cpp

@@ -179,6 +179,7 @@ int PluginManager::loadPlugin(const String& pluginLoc) {
 	LoadedLibInfo lib;
 	lib.apiVersion = libInfo.apiVersion;
 	lib.name = libInfo.name;
+	lib.libVersion = libInfo.libVersion;
 	lib.numPlugins = libInfo.numPlugins;
 	lib.handle = handle;
 
@@ -197,7 +198,7 @@ int PluginManager::loadPlugin(const String& pluginLoc) {
 			info.creator = pInfo.processor.creator;
 			info.name = pInfo.processor.name;
 			info.type = pInfo.processor.type;
-			info.libIndex = libArray.size();
+			info.libIndex = libArray.size()-1;
 			processorPlugins.add(info);
 			break;
 		}
@@ -314,14 +315,37 @@ Plugin::FileSourceInfo PluginManager::getFileSourceInfo(String name, String libN
 	return i;
 }
 
-String PluginManager::getPluginName(int index) const
+String PluginManager::getLibraryName(int index) const
+{
+	if (index < 0 || index >= libArray.size())
+		return String::empty;
+	else
+		return libArray[index].name;
+}
+
+int PluginManager::getLibraryVersion(int index) const
 {
-	return libArray[index].name;
+	if (index < 0 || index >= libArray.size())
+		return -1;
+	else
+		return libArray[index].libVersion;
 }
 
-int PluginManager::getPluginVersion(int index) const
+int PluginManager::getLibraryIndexFromPlugin(Plugin::PluginType type, int index)
 {
-	return libArray[index].libVersion;
+	switch (type)
+	{
+	case Plugin::ProcessorPlugin:
+		return processorPlugins[index].libIndex;
+	case Plugin::RecordEnginePlugin:
+		return recordEnginePlugins[index].libIndex;
+	case Plugin::DatathreadPlugin:
+		return dataThreadPlugins[index].libIndex;
+	case Plugin::FileSourcePlugin:
+		return fileSourcePlugins[index].libIndex;
+	default:
+		return -1;
+	}
 }
 
 Plugin::ProcessorInfo PluginManager::getEmptyProcessorInfo()

Source/Processors/PluginManager/PluginManager.h

@@ -74,8 +74,9 @@ class PluginManager {
 	Plugin::RecordEngineInfo getRecordEngineInfo(String name, String libName = String::empty) const;
 	Plugin::FileSourceInfo getFileSourceInfo(int index) const;
 	Plugin::FileSourceInfo getFileSourceInfo(String name, String libName = String::empty) const;
-	String getPluginName(int index) const;
-	int getPluginVersion(int index) const;
+	String getLibraryName(int index) const;
+	int getLibraryVersion(int index) const;
+	int getLibraryIndexFromPlugin(Plugin::PluginType type, int index);
 
 private:
 	Array<LoadedLibInfo> libArray;

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

@@ -470,16 +470,34 @@ void ProcessorGraph::connectProcessorToAudioAndRecordNodes(GenericProcessor* sou
 
 GenericProcessor* ProcessorGraph::createProcessorFromDescription(Array<var>& description)
 {
-	String processorName = description[0];
-	int processorType = description[1];
-	int processorIndex = description[2];
-	String processorCategory = description[3];
+	GenericProcessor* processor = nullptr;
 
-	std::cout << "Creating from description..." << std::endl;
-	std::cout << processorCategory << "::" << processorName << " (" << processorType << "-" << processorIndex << ")" << std::endl;
+	bool fromProcessorList = description[0];
+	String processorName = description[1];
+	int processorType = description[2];
+	int processorIndex = description[3];
 
-    GenericProcessor* processor = nullptr;
-	processor = ProcessorManager::createProcessor((ProcessorClasses)processorType, processorIndex);
+	if (fromProcessorList)
+	{
+		String processorCategory = description[4];
+
+		std::cout << "Creating from description..." << std::endl;
+		std::cout << processorCategory << "::" << processorName << " (" << processorType << "-" << processorIndex << ")" << std::endl;
+
+		processor = ProcessorManager::createProcessor((ProcessorClasses)processorType, processorIndex);
+	}
+	else
+	{
+		String libName = description[4];
+		int libVersion = description[5];
+		bool isSource = description[6];
+		bool isSink = description[7];
+
+		std::cout << "Creating from plugin info..." << std::endl;
+		std::cout << libName << "(" << libVersion << ")::" << processorName << std::endl;
+
+		processor = ProcessorManager::createProcessorFromPluginInfo((Plugin::PluginType)processorType, processorIndex, processorName, libName, libVersion, isSource, isSink);
+	}
 
 	String msg = "New " + processorName + " created";
 	CoreServices::sendStatusMessage(msg);