Merge pull request #46 from Alzy/fixes

Fix OBS crashing when changing user profile + fix plugin not copying to rundir on debug

CMakeLists.txt

@@ -269,3 +269,8 @@ if(APPLE)
 	target_link_libraries(obs-midi "${OBS_FRONTEND_LIB}")
 endif()
 # -- End of section --
+
+
+
+# -- Fixes issue where plugin isn't copied to rundir plugins directory on local build --
+install_obs_plugin_with_data(obs-midi data)

src/config.cpp

@@ -116,6 +116,9 @@ void Config::OnFrontendEvent(enum obs_frontend_event event, void *param)
 	auto config = reinterpret_cast<Config *>(param);
 
 	if (event == OBS_FRONTEND_EVENT_PROFILE_CHANGED) {
+		auto deviceManager = GetDeviceManager();
+		deviceManager->Unload();
+
 		config->SetDefaults();
 		config->Load();
 	}

src/device-manager.cpp

@@ -25,8 +25,9 @@ DeviceManager::DeviceManager()
 
 DeviceManager::~DeviceManager()
 {
-	rtMidi->~midi_in();
-	MO->~midi_out();
+	Unload();
+	delete rtMidi;
+	delete MO;
 }
 
 /* Load the Device Manager from saved Config Store data.
@@ -61,6 +62,18 @@ void DeviceManager::Load(obs_data_t *data)
 	}
 }
 
+
+void DeviceManager::Unload()
+{
+	blog(LOG_INFO, "UNLOADING DEVICE MANAGER");
+	for (auto agent : midiAgents)
+	{
+		delete agent;
+	}
+	midiAgents.clear();
+}
+
+
 /* Returns vector list of Port Names 
  */
 vector<string> DeviceManager::GetPortsList()
@@ -72,6 +85,8 @@ vector<string> DeviceManager::GetPortsList()
 	}
 	return ports;
 }
+
+
 /* Returns vector list of Port Names 
  */
 vector<string> DeviceManager::GetOutPortsList()
@@ -89,6 +104,8 @@ QStringList DeviceManager::GetOPL()
 {
 	return opl;
 }
+
+
 /* Returns the port number of the specified device.
  * If the device isn't found (possibly due to being disconnected), returns -1
  */
@@ -103,6 +120,7 @@ int DeviceManager::GetPortNumberByDeviceName(const char *deviceName)
 	}
 }
 
+
 /* Returns the port number of the specified device.
  * If the device isn't found (possibly due to being disconnected), returns -1
  */
@@ -119,11 +137,13 @@ int DeviceManager::GetOutPortNumberByDeviceName(const char *deviceName)
 	}
 }
 
+
 vector<MidiAgent *> DeviceManager::GetActiveMidiDevices()
 {
 	return midiAgents;
 }
 
+
 MidiAgent *DeviceManager::GetMidiDeviceByName(const char *deviceName)
 {
 	for (int i = 0; i < midiAgents.size(); i++) {
@@ -134,6 +154,7 @@ MidiAgent *DeviceManager::GetMidiDeviceByName(const char *deviceName)
 	return NULL;
 }
 
+
 vector<MidiHook *>
 DeviceManager::GetMidiHooksByDeviceName(const char *deviceName)
 {
@@ -144,19 +165,20 @@ DeviceManager::GetMidiHooksByDeviceName(const char *deviceName)
 	throw("no midi hooks for this device");
 }
 
+
 /* Registers a midi device.
  * Will create, store and enable a midi device.
 */
 void DeviceManager::RegisterMidiDevice(int port, int outport)
 {
-
 	MidiAgent *midiA = new MidiAgent();
 	midiA->OpenPort(port);
 	midiA->OpenOutPort(outport);
 
 	midiAgents.push_back(midiA);
 }
 
+
 /* Get this Device Manager state as OBS Data. (includes devices and their midi hooks)
 * This is needed to Serialize the state in the config.
 * https://obsproject.com/docs/reference-settings.html
@@ -175,12 +197,15 @@ obs_data_t *DeviceManager::GetData()
 	return data;
 }
 
+
 void DeviceManager::SendMidi(QString mtype, int channel, int norc, int value)
 
 {
 
 	//***Need to add message Deletion here***//
 }
+
+
 void DeviceManager::broadcast(const RpcEvent &event)
 {
 	OBSDataAutoRelease eventData = obs_data_create();

src/device-manager.h

@@ -43,6 +43,7 @@ class DeviceManager : public QObject {
 	DeviceManager();
 	~DeviceManager();
 	void Load(obs_data_t *data);
+	void Unload();
 
 	vector<string> GetPortsList();
 	int GetPortNumberByDeviceName(const char *deviceName);

src/midi-agent.cpp

@@ -211,6 +211,7 @@ MidiAgent::MidiAgent()
 
 MidiAgent::~MidiAgent()
 {
+	ClearMidiHooks();
 	ClosePort();
 	delete midiin;
 	delete midiout;

src/midi-agent.h

@@ -56,6 +56,7 @@ class MidiHook {
 		: type(midiMessageType),
 		  index(midiChannelIndex),
 		  mchan(midiChannel),
+		  bidirectional(bidirectionals),
 		  command(OBSCommand),
 		  param1(p1),
 		  param2(p2),

src/obs-midi.cpp

@@ -41,12 +41,11 @@ OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("obs-midi", "en-US")
 ConfigPtr _config;
 DeviceManagerPtr _deviceManager;
-
 eventsPtr _eventsSystem;
 
 bool obs_module_load(void)
 {
-	blog(LOG_INFO, "MIDI LOADED ");
+	blog(LOG_INFO, "MIDI LOADED :)");
 
 	// Device Manager Setup
 	_deviceManager = DeviceManagerPtr(new DeviceManager());

src/version.h

@@ -1,7 +1,7 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define GIT_BRANCH "master"
-#define GIT_COMMIT_HASH "d565d6d"
+#define GIT_BRANCH "fixes"
+#define GIT_COMMIT_HASH "3e9ad09"
 
 #endif