CMPlugin to receive a reference to PLUGININFOEX

5 files changed, 21 insertions, 19 deletions

diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index cbfa9574c3..ad615e7de4 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -174,7 +174,7 @@ int AccListChanged(WPARAM wParam, LPARAM lParam)
 int ModulesLoaded(WPARAM, LPARAM)

 {

 	// Extra icon support

-	hExtraIcon = ExtraIcon_RegisterIcolib(MODULE_NAME "_icon", LPGEN("Listening to music"), "listening_to_icon");

+	hExtraIcon = ExtraIcon_RegisterIcolib(MODULENAME "_icon", LPGEN("Listening to music"), "listening_to_icon");

 

 	EnableDisablePlayers();

 

@@ -385,7 +385,7 @@ bool ListeningToEnabled(char *proto, bool ignoreGlobal)
 

 	char setting[256];

 	mir_snprintf(setting, "%sEnabled", proto);

-	return db_get_b(NULL, MODULE_NAME, setting, false) != 0;

+	return db_get_b(NULL, MODULENAME, setting, false) != 0;

 }

 

 INT_PTR ListeningToEnabled(WPARAM wParam, LPARAM)

@@ -608,7 +608,7 @@ void SetListeningInfo(char *proto, LISTENINGTOINFO *lti = nullptr)
 			mir_free(fr[1]);

 		}

 	}

-	else if (db_get_b(0, MODULE_NAME, "UseStatusMessage", 1) && ProtoServiceExists(proto, PS_SETAWAYMSG)) {

+	else if (db_get_b(0, MODULENAME, "UseStatusMessage", 1) && ProtoServiceExists(proto, PS_SETAWAYMSG)) {

 		int status = Proto_GetStatus(proto);

 		if (lti == nullptr)

 			CallProtoService(proto, PS_SETAWAYMSG, status, 0);

@@ -635,7 +635,7 @@ INT_PTR EnableListeningTo(char *proto, bool enabled)
 

 		char setting[256];

 		mir_snprintf(setting, "%sEnabled", proto);

-		db_set_b(NULL, MODULE_NAME, setting, enabled);

+		db_set_b(NULL, MODULENAME, setting, enabled);

 

 		// Modify menu info

 		ProtocolInfo *info = GetProtoInfo(proto);

diff --git a/plugins/ListeningTo/src/main.cpp b/plugins/ListeningTo/src/main.cpp
index ab7a132a44..fa3513df5c 100644
--- a/plugins/ListeningTo/src/main.cpp
+++ b/plugins/ListeningTo/src/main.cpp
@@ -24,7 +24,7 @@ CMPlugin g_plugin;
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-PLUGININFOEX pluginInfo =

+PLUGININFOEX pluginInfoEx =

 {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

@@ -38,16 +38,20 @@ PLUGININFOEX pluginInfo =
 	{ 0xf981f3f5, 0x35a, 0x444f,{ 0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda } }

 };

 

+CMPlugin::CMPlugin() :

+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)

+{}

+

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

 {

-	return &pluginInfo;

+	return &pluginInfoEx;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

 extern "C" int __declspec(dllexport) Load(void)

 {

-	mir_getLP(&pluginInfo);

+	mir_getLP(&pluginInfoEx);

 

 	CoInitialize(nullptr);

 

diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp
index 3dc64d76ed..acc6bc175b 100644
--- a/plugins/ListeningTo/src/options.cpp
+++ b/plugins/ListeningTo/src/options.cpp
@@ -111,9 +111,9 @@ void InitOptions()
 

 void LoadOptions()

 {

-	LoadOpts(optionsControls, _countof(optionsControls), MODULE_NAME);

-	LoadOpts(formatControls, _countof(formatControls), MODULE_NAME);

-	LoadOpts(playersControls, _countof(playersControls), MODULE_NAME);

+	LoadOpts(optionsControls, _countof(optionsControls), MODULENAME);

+	LoadOpts(formatControls, _countof(formatControls), MODULENAME);

+	LoadOpts(playersControls, _countof(playersControls), MODULENAME);

 }

 

 BOOL IsTypeEnabled(LISTENINGTOINFO *lti)

@@ -167,7 +167,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 {

 	BOOL ret = FALSE;

 	if (msg != WM_INITDIALOG)

-		ret = SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam);

+		ret = SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULENAME, hwndDlg, msg, wParam, lParam);

 

 	switch (msg) {

 	case WM_INITDIALOG:

@@ -187,7 +187,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				SendDlgItemMessage(hwndDlg, IDC_ADV_ICON, CB_ADDSTRING, 0, (LPARAM)_itow(i - first + 3, tmp, 10));

 		}

 

-		ret = SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam);

+		ret = SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULENAME, hwndDlg, msg, wParam, lParam);

 		OptionsEnableDisableCtrls(hwndDlg);

 		return TRUE;

 

@@ -249,7 +249,7 @@ static void PlayersEnableDisableCtrls(HWND hwndDlg)
 

 static INT_PTR CALLBACK PlayersDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	BOOL ret = SaveOptsDlgProc(playersControls, _countof(playersControls), MODULE_NAME, hwndDlg, msg, wParam, lParam);

+	BOOL ret = SaveOptsDlgProc(playersControls, _countof(playersControls), MODULENAME, hwndDlg, msg, wParam, lParam);

 

 	switch (msg) {

 	case WM_INITDIALOG:

@@ -277,5 +277,5 @@ static INT_PTR CALLBACK PlayersDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 static INT_PTR CALLBACK FormatDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	return SaveOptsDlgProc(formatControls, _countof(formatControls), MODULE_NAME, hwndDlg, msg, wParam, lParam);

+	return SaveOptsDlgProc(formatControls, _countof(formatControls), MODULENAME, hwndDlg, msg, wParam, lParam);

 }

diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp
index 309d424b6d..4e1224cf34 100644
--- a/plugins/ListeningTo/src/players/generic.cpp
+++ b/plugins/ListeningTo/src/players/generic.cpp
@@ -27,7 +27,7 @@ GenericPlayer *singleton = nullptr;
 void m_log(const wchar_t *function, const wchar_t *fmt, ...)

 {

 	if (hLog == nullptr) {

-		hLog = mir_createLog(MODULE_NAME, L"ListeningTo log", L"c:\\temp\\listeningto.txt", 0);

+		hLog = mir_createLog(MODULENAME, L"ListeningTo log", L"c:\\temp\\listeningto.txt", 0);

 		if (hLog == nullptr)

 			return;

 	}

diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h
index cd40ca4da2..8727d8dda8 100644
--- a/plugins/ListeningTo/src/stdafx.h
+++ b/plugins/ListeningTo/src/stdafx.h
@@ -69,13 +69,11 @@ Boston, MA 02111-1307, USA.
 #define MS_LISTENINGTO_HOTKEYS_DISABLE		"ListeningTo/HotkeysDisable"

 #define MS_LISTENINGTO_HOTKEYS_TOGGLE		"ListeningTo/HotkeysToggle"

 

-#define MODULE_NAME "ListeningTo"

+#define MODULENAME "ListeningTo"

 

 struct CMPlugin : public PLUGIN<CMPlugin>

 {

-	CMPlugin() :

-		PLUGIN<CMPlugin>(MODULE_NAME)

-	{}

+	CMPlugin();

 };

 

 // Global Variables