From 794a508e7b59b911fbaa7c71ff1bafe7f4dd9d94 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Fri, 19 Aug 2016 23:32:05 +0200
Subject: [PATCH] Add files via upload

---
 SceneSwitcher.cpp | 45 ++++++++++++++++++++-------------------------
 settings.cpp      |  7 +++----
 switcher.cpp      |  2 +-
 switcher.h        |  2 +-
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/SceneSwitcher.cpp b/SceneSwitcher.cpp
index 9ec0d2ec..d2fd41bf 100644
--- a/SceneSwitcher.cpp
+++ b/SceneSwitcher.cpp
@@ -8,19 +8,17 @@
 
 using namespace std;
 
-//temporary 
-bool oldSettingsLoaded = false;
 //Swicthing done in here
 Switcher *switcher = new Switcher();
 //settings source
 struct obs_source_info sceneSwitcherOptionsSource;
 //Hotkeys
 const char *PAUSE_HOTKEY_NAME = "pauseHotkey";
-const char *OPTIONS_HOTKEY_NAME = "optionsHotkey";
+//const char *OPTIONS_HOTKEY_NAME = "optionsHotkey";
 obs_hotkey_id pauseHotkeyId;
-obs_hotkey_id optionsHotkeyId;
+//obs_hotkey_id optionsHotkeyId;
 obs_data_array_t *pauseHotkeyData;
-obs_data_array_t *optionsHotkeyData;
+//obs_data_array_t *optionsHotkeyData;
 //path to config folder where to save the hotkeybinding (probably later the settings file)
 string configPath;
 
@@ -69,15 +67,13 @@ void loadKeybinding(string name, obs_data_array_t *hotkeyData, obs_hotkey_id hot
 }
 
 OBS_DECLARE_MODULE()
-OBS_MODULE_USE_DEFAULT_LOCALE("SceneSwitcher", "en-US")
 
 void SceneSwitcherPauseHotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey, bool pressed) {
+	UNUSED_PARAMETER(data);
 	UNUSED_PARAMETER(id);
 	UNUSED_PARAMETER(hotkey);
-
 	if (pressed)
 	{
-		Switcher *switcher = static_cast<Switcher *>(data);
 		if (switcher->getIsRunning())
 		{
 			switcher->stop();
@@ -98,7 +94,7 @@ const char *sceneSwitcherOptionsGetName(void *type_data) {
 void *sceneSwitcherOptionsCreate(obs_data_t *settings, obs_source_t *source) {
 	UNUSED_PARAMETER(settings);
 	UNUSED_PARAMETER(source);
-	return (void*)switcher;
+	return switcher;
 }
 void sceneSwitcherOptionsDestroy(void *data) {
 	UNUSED_PARAMETER(data);
@@ -128,23 +124,18 @@ obs_properties_t *sceneSwitcherOptionsSourceGetProperties(void *data) {
 	return props;
 }
 void sceneSwitcherOptionsSourceSave(void *data, obs_data_t *settings) {
-	//check if user chose to load old settings
-	if (oldSettingsLoaded) {
-		//oldSettingsLoaded = false;
-	}
-	else {
-		//hang here if multiple instances of Scene Switcher Options are active (why?)
-		ofstream settingsFile;
-		settingsFile.open(string(configPath).append("settings.txt"), ofstream::trunc);
-		if (settingsFile.is_open()) {
-			settingsFile << obs_data_get_json(settings);
-			settingsFile.close();
-		}
-		if (switcher->getIsRunning())
-			switcher->stop();
-		switcher->load();
-		switcher->start();
+	UNUSED_PARAMETER(data);
+	//hang here if multiple instances of Scene Switcher Options are active (why?)
+	ofstream settingsFile;
+	settingsFile.open(string(configPath).append("settings.txt"), ofstream::trunc);
+	if (settingsFile.is_open()) {
+		settingsFile << obs_data_get_json(settings);
+		settingsFile.close();
 	}
+	if (switcher->getIsRunning())
+		switcher->stop();
+	switcher->load();
+	switcher->start();
 }
 void sceneSwitcherOptionsSourceLoad(void *data, obs_data_t *settings) {
 	UNUSED_PARAMETER(data);
@@ -194,6 +185,10 @@ void obs_module_unload(void) {
 	//save settings (only hotkey for now)
 	saveKeybinding(PAUSE_HOTKEY_NAME, pauseHotkeyData);
 	//saveKeybinding(OPTIONS_HOTKEY_NAME, optionsHotkeyData);
+	//obs_hotkey_unregister(pauseHotkeyId);
+	obs_data_array_release(pauseHotkeyData);
+	delete switcher;
+	switcher = NULL;
 }
 
 const char *obs_module_author(void) {
diff --git a/settings.cpp b/settings.cpp
index 7559126b..58ab9511 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -20,11 +20,11 @@ void Settings::setSettingsFilePath(string path)
 
 void Settings::load() {
 	//reset the settings
-	settings = map<string, Data>();
+	settings.clear();
 	sceneRoundTrip = pair<vector<string>, vector<string>>();
 	vector<string> sceneRoundTripTemp;
-	pauseScenes = vector<string>();
-	ignoreNames = vector<string>();
+	pauseScenes.clear();
+	ignoreNames.clear();
 	//read the settings file
 	vector<string> settingsElements;
 	ifstream infile(settingsFilePath);
@@ -164,4 +164,3 @@ vector<string> Settings::getIgnoreNames()
 {
 	return ignoreNames;
 }
-
diff --git a/switcher.cpp b/switcher.cpp
index 20612bfa..d62e1451 100644
--- a/switcher.cpp
+++ b/switcher.cpp
@@ -403,4 +403,4 @@ Switcher::~Switcher()
 bool Switcher::getIsRunning()
 {
 	return isRunning;
-}
\ No newline at end of file
+}
diff --git a/switcher.h b/switcher.h
index 1a1741b8..1010d1e6 100644
--- a/switcher.h
+++ b/switcher.h
@@ -29,4 +29,4 @@ private:
 	bool isWindowFullscreen();
 	string GetActiveWindowTitle();
 	pair<int, int> getCursorXY();
-};
\ No newline at end of file
+};