Remove useless constructors from instance_item

Author: siska

foo_np_adv/events.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 
+
 CEvents *IEvents::m_Events = nullptr;
 static std::map<pfc::string8, instance_state> c_instst;
 

foo_np_adv/events.h

@@ -1,12 +1,9 @@
 #pragma once
 
 #include "prefs_instance.h"
-#include "event_enums.h"
-#include "datetime.h"
 
 #include <map>
 #include <vector>
-#include <string>
 
 static std::map<int, std::vector<pfc::string8>> _evtostr = {
 	{EVENT_PLAYBACK_STARTING, {"Playback start","Trigger when playback starts"}},

foo_np_adv/jsoncpp.cpp

@@ -71,8 +71,6 @@ license you like.
 
 #include "stdafx.h"
 
-#include "json/json.h"
-
 #ifndef JSON_IS_AMALGAMATION
 #error "Compile with -I PATH_TO_JSON_DIRECTORY"
 #endif

foo_np_adv/preferences.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 
 #include <fstream>
+#include <algorithm>
 
 using namespace std;
 
@@ -227,8 +228,7 @@ void CNPAPreferences::OnBnClickedAdd(UINT, int, CWindow)
 		return;
 	}
 
-	instance_item item(pfc::string8(CT2CA(str)), "", "", false,
-		false, false, 0, {}, false, "", ENCODING_UTF8, false, false);
+	instance_item item((const char *) CT2CA(str));
 	g_cfg_instance_list.add_item(item);
 	m_ComboBoxInstance.InsertString(m_ComboBoxInstance.GetCount(), str);
 	ComboInstanceSelect(m_ComboBoxInstance.GetCount() - 1);
@@ -270,13 +270,11 @@ void CNPAPreferences::OnBnClickedRename(UINT, int, CWindow)
 	instance_item &item = g_cfg_instance_list.get_item(m_curIndex);
 	item.name = pfc::string8(CT2CA(str));
 	g_cfg_instance_list.replace_item(m_curIndex, item);
-
 	IEvents::UpdateInstance(item);
 
 	m_ComboBoxInstance.DeleteString(m_curIndex);
 	m_ComboBoxInstance.InsertString(m_curIndex, str);
 	OnComboTextChange(0, IDC_COMBO1, m_ComboBoxInstance);
-
 }
 
 bool CNPAPreferences::HasComboString(CString &ls) {

foo_np_adv/preferences.h

@@ -8,7 +8,7 @@
 
 typedef struct fn_filter_s {
 	pfc::string8 ext, desc;
-	fn_filter_s(pfc::string8 p_ext, pfc::string8 p_desc) : ext(p_ext), desc(p_desc) {}
+	fn_filter_s(const char *p_ext,const char *p_desc) : ext(p_ext), desc(p_desc) {}
 }fn_filter;
 
 class CNPAPreferences : public CDialogImpl<CNPAPreferences>,

foo_np_adv/prefs_instance.h

@@ -1,22 +1,24 @@
 #pragma once
 
 #include "event_enums.h"
+#include "writer_flags.h"
+
 #include "json/json.h"
 
 typedef struct instance_item_s {
 	pfc::string8 name;
 	pfc::string8 filename;
 	pfc::string8 format_string;
-	bool write_to_file;
-	bool log_mode;
-	bool enable_delay;
+	bool write_to_file = false;
+	bool log_mode = false;
+	bool enable_delay = false;
 	uint32_t delay = 0;
 	bool events[EVENT_COUNT];
-	bool on_exit;
+	bool on_exit = false;
 	pfc::string8 on_exit_str;
-	uint8_t encoding;
-	bool changes_only;
-	bool clipboard;
+	uint8_t encoding = ENCODING_UTF8;
+	bool changes_only = false;
+	bool clipboard = false;
 	bool _breserved2 = false;
 	bool _breserved3 = false;
 	bool _breserved4 = false;
@@ -29,43 +31,10 @@ typedef struct instance_item_s {
 	pfc::string8 _sreserved3;
 	pfc::string8 _sreserved4;
 
-	instance_item_s(const char * p_name, const char * p_filename, const char * p_format_string,
-		const bool p_write_to_file, const bool p_log_mode, const bool p_enable_delay, const uint32_t p_delay,
-		const bool(&p_events)[EVENT_COUNT], const bool p_on_exit, const char *p_on_exit_str, const uint8_t p_encoding,
-		const bool p_changes_only, const bool p_clipboard)
-		: name(p_name), filename(p_filename), format_string(p_format_string), log_mode(p_log_mode),
-		enable_delay(p_enable_delay), delay(p_delay), on_exit(p_on_exit), on_exit_str(p_on_exit_str),
-		encoding(p_encoding), changes_only(p_changes_only), clipboard(p_clipboard)
-	{
-		for (uint32_t i = 0; i < EVENT_COUNT; i++) {
-			events[i] = p_events[i];
-			pfc::string_formatter str;
-			console::print(str << p_events[i]);
-		}
-	}
-	instance_item_s(const char * p_name, const char * p_filename, const char * p_format_string, const bool p_write_to_file,
-		const bool p_log_mode, const bool p_enable_delay, const uint32_t p_delay, const std::initializer_list <uint32_t> p_events,
-		const bool p_on_exit, const char *p_on_exit_str, const uint8_t p_encoding, const bool p_changes_only,
-		const bool p_clipboard)
-		: name(p_name), filename(p_filename), format_string(p_format_string), log_mode(p_log_mode),
-		enable_delay(p_enable_delay), delay(p_delay), write_to_file(p_write_to_file), on_exit(p_on_exit),
-		on_exit_str(p_on_exit_str), encoding(p_encoding), changes_only(p_changes_only), clipboard(p_clipboard)
-	{
+	instance_item_s(const char *p_name) : name(p_name) {
 		reset_events();
-
-		for (auto f : p_events) {
-			if (f >= EVENT_COUNT) {
-				pfc::string_formatter str;
-				console::info(str << "WARNING: got invalid event during 'instance_item_s' initialization: " << f);
-			}
-			else {
-				events[f] = true;
-			}
-		}
 	}
 	instance_item_s(Json::Value &p_data) {
-		
-		
 		if (!p_data["name"].isString()) {
 			throw std::invalid_argument("'name' expected type string");
 		}

foo_np_adv/stdafx.h

@@ -1,5 +1,3 @@
-
-
 #include "../foobar2000_sdk/foobar2000/ATLHelpers/ATLHelpersLean.h"
 #include "../foobar2000_sdk/foobar2000/helpers/helpers.h"
 #include "../foobar2000_sdk/foobar2000/ATLHelpers/WTL-PP.h"
@@ -9,11 +7,13 @@
 
 #define COMMON_NAME "Now Playing Advanced"
 
-#include "datetime.h"
 #include "event_enums.h"
-#include "events.h"
-#include "prefs_instance.h"
-#include "preferences.h"
-#include "queue.h"
 #include "writer_flags.h"
+#include "queue.h"
+#include "datetime.h"
+#include "prefs_instance.h"
+#include "events.h"
 #include "writer.h"
+#include "preferences.h"
+
+