code reordering (local code moved into ListeningTo)

git-svn-id: http://svn.miranda-ng.org/main/trunk@17350 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 307 insertions, 274 deletions

diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index 280e636e94..ebda2b1ef2 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -19,39 +19,24 @@ Boston, MA 02111-1307, USA.
 

 #include "stdafx.h"

 

-CLIST_INTERFACE *pcli;

-int hLangpack;

-

-PLUGININFOEX pluginInfo = {

-	sizeof(PLUGININFOEX),

-	__PLUGIN_NAME,

-	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

-	__DESCRIPTION,

-	__AUTHOR,

-	__AUTHOREMAIL,

-	__COPYRIGHT,

-	__AUTHORWEB,

-	UNICODE_AWARE,

-	// {F981F3F5-035A-444F-9892-CA722C195ADA}

-	{ 0xf981f3f5, 0x35a, 0x444f, { 0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda } }

-};

-

-HINSTANCE hInst;

-

-static HANDLE hEnableStateChangedEvent;

 HANDLE hExtraIcon;

 static HGENMENU hMainMenuGroup = NULL;

-static HANDLE hListeningInfoChangedEvent = NULL;

+static HANDLE hListeningInfoChangedEvent;

+static HANDLE hEnableStateChangedEvent;

 

 static HANDLE hTTB = NULL;

 BOOL loaded = FALSE;

 static UINT hTimer = 0;

 static DWORD lastInfoSetTime = 0;

 

+static IconItem iconList[] =

+{

+	{ LPGEN("Listening to (enabled)"), "listening_to_icon", IDI_LISTENINGTO },

+	{ LPGEN("Listening to (disabled)"), "listening_off_icon", IDI_LISTENINGOFF },

+};

+

 std::vector<ProtocolInfo> proto_items;

 

-int ModulesLoaded(WPARAM wParam, LPARAM lParam);

-int PreShutdown(WPARAM wParam, LPARAM lParam);

 int PreBuildContactMenu(WPARAM wParam, LPARAM lParam);

 int TopToolBarLoaded(WPARAM wParam, LPARAM lParam);

 int SettingChanged(WPARAM wParam, LPARAM lParam);

@@ -73,87 +58,8 @@ INT_PTR HotkeysEnable(WPARAM wParam, LPARAM lParam);
 INT_PTR HotkeysDisable(WPARAM wParam, LPARAM lParam);

 INT_PTR HotkeysToggle(WPARAM wParam, LPARAM lParam);

 

-wchar_t* VariablesParseInfo(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseType(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseArtist(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseAlbum(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseTitle(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseTrack(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseYear(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseGenre(ARGUMENTSINFO *ai);

-wchar_t* VariablesParseLength(ARGUMENTSINFO *ai);

-wchar_t* VariablesParsePlayer(ARGUMENTSINFO *ai);

-

-

 #define XSTATUS_MUSIC 11

 

-#define UNKNOWN(_X_) ( _X_ == NULL || _X_[0] == '\0' ? opts.unknown : _X_ )

-

-// Functions ////////////////////////////////////////////////////////////////////////////

-

-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

-{

-	hInst = hinstDLL;

-	return TRUE;

-}

-

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

-{

-	return &pluginInfo;

-}

-

-static IconItem iconList[] =

-{

-	{ LPGEN("Listening to (enabled)"), "listening_to_icon", IDI_LISTENINGTO },

-	{ LPGEN("Listening to (disabled)"), "listening_off_icon", IDI_LISTENINGOFF },

-};

-

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

-{

-	mir_getLP(&pluginInfo);

-	pcli = Clist_GetInterface();

-

-	CoInitialize(NULL);

-

-	// Services

-	CreateServiceFunction(MS_LISTENINGTO_ENABLED, ListeningToEnabled);

-	CreateServiceFunction(MS_LISTENINGTO_ENABLE, EnableListeningTo);

-	CreateServiceFunction(MS_LISTENINGTO_GETTEXTFORMAT, GetTextFormat);

-	CreateServiceFunction(MS_LISTENINGTO_GETPARSEDTEXT, GetParsedFormat);

-	CreateServiceFunction(MS_LISTENINGTO_OVERRIDECONTACTOPTION, GetOverrideContactOption);

-	CreateServiceFunction(MS_LISTENINGTO_GETUNKNOWNTEXT, GetUnknownText);

-	CreateServiceFunction(MS_LISTENINGTO_MAINMENU, MainMenuClicked);

-	CreateServiceFunction(MS_LISTENINGTO_SET_NEW_SONG, SetNewSong);

-	CreateServiceFunction(MS_LISTENINGTO_HOTKEYS_ENABLE, HotkeysEnable);

-	CreateServiceFunction(MS_LISTENINGTO_HOTKEYS_DISABLE, HotkeysDisable);

-	CreateServiceFunction(MS_LISTENINGTO_HOTKEYS_TOGGLE, HotkeysToggle);

-

-	// Hooks

-	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

-	HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);

-	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, SettingChanged);

-

-	hEnableStateChangedEvent = CreateHookableEvent(ME_LISTENINGTO_ENABLE_STATE_CHANGED);

-	hListeningInfoChangedEvent = CreateHookableEvent(ME_LISTENINGTO_LISTENING_INFO_CHANGED);

-

-	InitMusic();

-	InitOptions();

-

-	// icons

-	Icon_Register(hInst, LPGEN("ListeningTo"), iconList, _countof(iconList));

-

-	// Extra icon support

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

-	return 0;

-}

-

-extern "C" int __declspec(dllexport) Unload(void)

-{

-	CoUninitialize();

-

-	return 0;

-}

-

 void UpdateGlobalStatusMenus()

 {

 	bool enabled = ListeningToEnabled(NULL, true);

@@ -267,6 +173,9 @@ 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");

+

 	EnableDisablePlayers();

 

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

@@ -503,6 +412,73 @@ ProtocolInfo* GetProtoInfo(char *proto)
 	return NULL;

 }

 

+static void ReplaceVars(Buffer<wchar_t> *buffer, MCONTACT hContact, wchar_t **variables, int numVariables)
+{
+	if (buffer->len < 3)
+		return;
+
+	if (numVariables < 0)
+		return;
+
+	for (size_t i = buffer->len - 1; i > 0; i--) {
+		if (buffer->str[i] == '%') {
+			// Find previous
+			size_t j;
+			for (j = i - 1; j > 0 && ((buffer->str[j] >= 'a' && buffer->str[j] <= 'z')
+				|| (buffer->str[j] >= 'A' && buffer->str[j] <= 'Z')
+				|| buffer->str[j] == '-'
+				|| buffer->str[j] == '_'); j--);
+
+			if (buffer->str[j] == '%') {
+				size_t foundLen = i - j + 1;
+				if (foundLen == 9 && wcsncmp(&buffer->str[j], L"%contact%", 9) == 0) {
+					buffer->replace(j, i + 1, pcli->pfnGetContactDisplayName(hContact, 0));
+				}
+				else if (foundLen == 6 && wcsncmp(&buffer->str[j], L"%date%", 6) == 0) {
+					wchar_t tmp[128];
+					TimeZone_ToStringT(time(NULL), L"d s", tmp, _countof(tmp));
+					buffer->replace(j, i + 1, tmp);
+				}
+				else {
+					for (int k = 0; k < numVariables; k += 2) {
+						size_t len = mir_wstrlen(variables[k]);
+						if (foundLen == len + 2 && wcsncmp(&buffer->str[j] + 1, variables[k], len) == 0) {
+							buffer->replace(j, i + 1, variables[k + 1]);
+							break;
+						}
+					}
+				}
+			}
+
+			i = j;
+			if (i == 0)
+				break;
+		}
+		else if (buffer->str[i] == '\\' && i + 1 <= buffer->len - 1 && buffer->str[i + 1] == 'n') {
+			buffer->str[i] = '\r';
+			buffer->str[i + 1] = '\n';
+		}
+	}
+}
+

+void ReplaceTemplate(Buffer<wchar_t> *out, MCONTACT hContact, wchar_t *templ, wchar_t **vars, int numVars)
+{
+
+	if (ServiceExists(MS_VARS_FORMATSTRING)) {
+		wchar_t *tmp = variables_parse_ex(templ, NULL, hContact, vars, numVars);
+		if (tmp != NULL) {
+			out->append(tmp);
+			mir_free(tmp);
+			out->pack();
+			return;
+		}
+	}
+
+	out->append(templ);
+	ReplaceVars(out, hContact, vars, numVars);
+	out->pack();
+}
+

 void SetListeningInfo(char *proto, LISTENINGTOINFO *lti = NULL)

 {

 	if (proto == NULL || !ListeningToEnabled(proto))

@@ -902,98 +878,28 @@ INT_PTR SetNewSong(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-wchar_t* VariablesParseInfo(ARGUMENTSINFO *ai)

-{

-	if (ai->cbSize < sizeof(ARGUMENTSINFO))

-		return NULL;

-

-	LISTENINGTOINFO *lti = GetListeningInfo();

-	if (lti == NULL) {

-		ai->flags = AIF_FALSE;

-		return mir_wstrdup(L"");

-	}

-

-	wchar_t *fr[] = {

-		L"artist", UNKNOWN(lti->ptszArtist),

-		L"album", UNKNOWN(lti->ptszAlbum),

-		L"title", UNKNOWN(lti->ptszTitle),

-		L"track", UNKNOWN(lti->ptszTrack),

-		L"year", UNKNOWN(lti->ptszYear),

-		L"genre", UNKNOWN(lti->ptszGenre),

-		L"length", UNKNOWN(lti->ptszLength),

-		L"player", UNKNOWN(lti->ptszPlayer),

-		L"type", UNKNOWN(lti->ptszType)

-	};

+/////////////////////////////////////////////////////////////////////////////////////////

 

-	Buffer<wchar_t> ret;

-	ReplaceTemplate(&ret, NULL, opts.templ, fr, _countof(fr));

-	return ret.detach();

-}

-

-#define VARIABLES_PARSE_BODY(__field__) \

-	if (ai == NULL || ai->cbSize < sizeof(ARGUMENTSINFO)) \

-		return NULL; \

-	\

-	LISTENINGTOINFO *lti = GetListeningInfo(); \

-	if (lti == NULL) \

-			{ \

-		ai->flags = AIF_FALSE; \

-		return mir_wstrdup(L""); \

-			} \

-				else if (IsEmpty(lti->__field__))  \

-	{ \

-		ai->flags = AIF_FALSE; \

-		return mir_wstrdup(opts.unknown); \

-	} \

-				else \

-	{ \

-		ai->flags = AIF_DONTPARSE; \

-		wchar_t *ret = mir_wstrdup(lti->__field__); \

-		return ret; \

-	}

-

-

-wchar_t* VariablesParseType(ARGUMENTSINFO *ai)

+void InitServices()

 {

-	VARIABLES_PARSE_BODY(ptszType);

-}

-

-wchar_t* VariablesParseArtist(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszArtist);

-}

-

-wchar_t* VariablesParseAlbum(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszAlbum);

-}

-

-wchar_t* VariablesParseTitle(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszTitle);

-}

-

-wchar_t* VariablesParseTrack(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszTrack);

-}

-

-wchar_t* VariablesParseYear(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszYear);

-}

-

-wchar_t* VariablesParseGenre(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszGenre);

-}

+	// Services

+	CreateServiceFunction(MS_LISTENINGTO_ENABLED, ListeningToEnabled);

+	CreateServiceFunction(MS_LISTENINGTO_ENABLE, EnableListeningTo);

+	CreateServiceFunction(MS_LISTENINGTO_GETTEXTFORMAT, GetTextFormat);

+	CreateServiceFunction(MS_LISTENINGTO_GETPARSEDTEXT, GetParsedFormat);

+	CreateServiceFunction(MS_LISTENINGTO_OVERRIDECONTACTOPTION, GetOverrideContactOption);

+	CreateServiceFunction(MS_LISTENINGTO_GETUNKNOWNTEXT, GetUnknownText);

+	CreateServiceFunction(MS_LISTENINGTO_MAINMENU, MainMenuClicked);

+	CreateServiceFunction(MS_LISTENINGTO_SET_NEW_SONG, SetNewSong);

+	CreateServiceFunction(MS_LISTENINGTO_HOTKEYS_ENABLE, HotkeysEnable);

+	CreateServiceFunction(MS_LISTENINGTO_HOTKEYS_DISABLE, HotkeysDisable);

+	CreateServiceFunction(MS_LISTENINGTO_HOTKEYS_TOGGLE, HotkeysToggle);

 

-wchar_t* VariablesParseLength(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszLength);

-}

+	// Hooks

+	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

+	HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);

+	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, SettingChanged);

 

-wchar_t* VariablesParsePlayer(ARGUMENTSINFO *ai)

-{

-	VARIABLES_PARSE_BODY(ptszPlayer);

+	// icons

+	Icon_Register(hInst, LPGEN("ListeningTo"), iconList, _countof(iconList));

 }

diff --git a/plugins/ListeningTo/src/main.cpp b/plugins/ListeningTo/src/main.cpp
new file mode 100644
index 0000000000..132e2b7385
--- /dev/null
+++ b/plugins/ListeningTo/src/main.cpp
@@ -0,0 +1,77 @@
+/*

+Copyright (C) 2006-2009 Ricardo Pescuma Domenecci

+

+This is free software; you can redistribute it and/or

+modify it under the terms of the GNU Library General Public

+License as published by the Free Software Foundation; either

+version 2 of the License, or (at your option) any later version.

+

+This is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+Library General Public License for more details.

+

+You should have received a copy of the GNU Library General Public

+License along with this file; see the file license.txt.  If

+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+Boston, MA 02111-1307, USA.

+*/

+

+#include "stdafx.h"

+

+HINSTANCE hInst;

+CLIST_INTERFACE *pcli;

+int hLangpack;

+

+PLUGININFOEX pluginInfo = {

+	sizeof(PLUGININFOEX),

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

+	// {F981F3F5-035A-444F-9892-CA722C195ADA}

+	{ 0xf981f3f5, 0x35a, 0x444f,{ 0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda } }

+};

+

+// Functions ////////////////////////////////////////////////////////////////////////////

+

+extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

+{

+	hInst = hinstDLL;

+	return TRUE;

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

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

+{

+	return &pluginInfo;

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

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

+{

+	mir_getLP(&pluginInfo);

+	pcli = Clist_GetInterface();

+

+	CoInitialize(NULL);

+

+	InitServices();

+	InitMusic();

+	InitOptions();

+	return 0;

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+extern "C" int __declspec(dllexport) Unload(void)

+{

+	CoUninitialize();

+

+	return 0;

+}

diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h
index 9bf16d8c66..c8b4d5ca1f 100644
--- a/plugins/ListeningTo/src/stdafx.h
+++ b/plugins/ListeningTo/src/stdafx.h
@@ -111,6 +111,21 @@ static bool IsEmpty(const WCHAR *str)
 #define DUPD(_X_, _DEF_) ( IsEmpty(_X_) ? mir_wstrdup(_DEF_) : mir_wstrdup(_X_))

 #define U2T(_X_) ( IsEmpty(_X_) ? NULL : mir_wstrdup(_X_))

 #define U2TD(_X_, _DEF_) ( IsEmpty(_X_) ? mir_wstrdup(_DEF_) : mir_wstrdup(_X_))

-

+#define UNKNOWN(_X_) ( _X_ == NULL || _X_[0] == '\0' ? opts.unknown : _X_ )

+

+void InitServices();

+

+void ReplaceTemplate(Buffer<wchar_t> *out, MCONTACT hContact, wchar_t *templ, wchar_t **vars, int numVars);
+

+wchar_t* VariablesParseInfo(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseType(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseArtist(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseAlbum(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseTitle(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseTrack(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseYear(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseGenre(ARGUMENTSINFO *ai);

+wchar_t* VariablesParseLength(ARGUMENTSINFO *ai);

+wchar_t* VariablesParsePlayer(ARGUMENTSINFO *ai);

 

 #endif // __COMMONS_H__

diff --git a/plugins/ListeningTo/src/variables.cpp b/plugins/ListeningTo/src/variables.cpp
new file mode 100644
index 0000000000..011404689f
--- /dev/null
+++ b/plugins/ListeningTo/src/variables.cpp
@@ -0,0 +1,116 @@
+/* 

+Copyright (C) 2006 Ricardo Pescuma Domenecci

+

+This is free software; you can redistribute it and/or

+modify it under the terms of the GNU Library General Public

+License as published by the Free Software Foundation; either

+version 2 of the License, or (at your option) any later version.

+

+This is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+Library General Public License for more details.

+

+You should have received a copy of the GNU Library General Public

+License along with this file; see the file license.txt.  If

+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+Boston, MA 02111-1307, USA.  

+*/

+

+#include "stdafx.h"

+

+wchar_t* VariablesParseInfo(ARGUMENTSINFO *ai)

+{

+	if (ai->cbSize < sizeof(ARGUMENTSINFO))

+		return NULL;

+

+	LISTENINGTOINFO *lti = GetListeningInfo();

+	if (lti == NULL) {

+		ai->flags = AIF_FALSE;

+		return mir_wstrdup(L"");

+	}

+

+	wchar_t *fr[] = {

+		L"artist", UNKNOWN(lti->ptszArtist),

+		L"album", UNKNOWN(lti->ptszAlbum),

+		L"title", UNKNOWN(lti->ptszTitle),

+		L"track", UNKNOWN(lti->ptszTrack),

+		L"year", UNKNOWN(lti->ptszYear),

+		L"genre", UNKNOWN(lti->ptszGenre),

+		L"length", UNKNOWN(lti->ptszLength),

+		L"player", UNKNOWN(lti->ptszPlayer),

+		L"type", UNKNOWN(lti->ptszType)

+	};

+

+	Buffer<wchar_t> ret;

+	ReplaceTemplate(&ret, NULL, opts.templ, fr, _countof(fr));

+	return ret.detach();

+}

+

+#define VARIABLES_PARSE_BODY(__field__) \

+	if (ai == NULL || ai->cbSize < sizeof(ARGUMENTSINFO)) \

+		return NULL; \

+	\

+	LISTENINGTOINFO *lti = GetListeningInfo(); \

+	if (lti == NULL) \

+			{ \

+		ai->flags = AIF_FALSE; \

+		return mir_wstrdup(L""); \

+			} \

+				else if (IsEmpty(lti->__field__))  \

+	{ \

+		ai->flags = AIF_FALSE; \

+		return mir_wstrdup(opts.unknown); \

+	} \

+				else \

+	{ \

+		ai->flags = AIF_DONTPARSE; \

+		wchar_t *ret = mir_wstrdup(lti->__field__); \

+		return ret; \

+	}

+

+

+wchar_t* VariablesParseType(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszType);

+}

+

+wchar_t* VariablesParseArtist(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszArtist);

+}

+

+wchar_t* VariablesParseAlbum(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszAlbum);

+}

+

+wchar_t* VariablesParseTitle(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszTitle);

+}

+

+wchar_t* VariablesParseTrack(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszTrack);

+}

+

+wchar_t* VariablesParseYear(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszYear);

+}

+

+wchar_t* VariablesParseGenre(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszGenre);

+}

+

+wchar_t* VariablesParseLength(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszLength);

+}

+

+wchar_t* VariablesParsePlayer(ARGUMENTSINFO *ai)

+{

+	VARIABLES_PARSE_BODY(ptszPlayer);

+}

diff --git a/utils/mir_buffer.h b/utils/mir_buffer.h
index 3adc17fd4c..f8cfd41fa4 100644
--- a/utils/mir_buffer.h
+++ b/utils/mir_buffer.h
@@ -434,85 +434,4 @@ class Buffer
 		size_t size;
 };
 
-
-static void ReplaceVars(Buffer<wchar_t> *buffer, MCONTACT hContact, wchar_t **variables, int numVariables)
-{
-	if (buffer->len < 3)
-		return;
-
-	if (numVariables < 0)
-		return;
-
-	for(size_t i = buffer->len - 1; i > 0; i--)
-	{
-		if (buffer->str[i] == '%')
-		{
-			// Find previous
-			size_t j;
-			for(j = i - 1; j > 0 && ((buffer->str[j] >= 'a' && buffer->str[j] <= 'z')
-								    || (buffer->str[j] >= 'A' && buffer->str[j] <= 'Z')
-									|| buffer->str[j] == '-'
-									|| buffer->str[j] == '_'); j--) ;
-
-			if (buffer->str[j] == '%')
-			{
-				size_t foundLen = i - j + 1;
-				if (foundLen == 9 && wcsncmp(&buffer->str[j], L"%contact%", 9) == 0)
-				{
-					buffer->replace(j, i + 1, pcli->pfnGetContactDisplayName(hContact, 0));
-				}
-				else if (foundLen == 6 && wcsncmp(&buffer->str[j], L"%date%", 6) == 0)
-				{
-					wchar_t tmp[128];
-					TimeZone_ToStringT(time(NULL), L"d s", tmp, _countof(tmp));
-					buffer->replace(j, i + 1, tmp);
-				}
-				else
-				{
-					for(int k = 0; k < numVariables; k += 2)
-					{
-						size_t len = mir_wstrlen(variables[k]);
-						if (foundLen == len + 2 && wcsncmp(&buffer->str[j]+1, variables[k], len) == 0)
-						{
-							buffer->replace(j, i + 1, variables[k + 1]);
-							break;
-						}
-					}
-				}
-			}
-
-			i = j;
-			if (i == 0)
-				break;
-		}
-		else if (buffer->str[i] == '\\' && i+1 <= buffer->len-1 && buffer->str[i+1] == 'n')
-		{
-			buffer->str[i] = '\r';
-			buffer->str[i+1] = '\n';
-		}
-	}
-}
-
-
-static void ReplaceTemplate(Buffer<wchar_t> *out, MCONTACT hContact, wchar_t *templ, wchar_t **vars, int numVars)
-{
-
-	if (ServiceExists(MS_VARS_FORMATSTRING))
-	{
-		wchar_t *tmp = variables_parse_ex(templ, NULL, hContact, vars, numVars);
-		if (tmp != NULL)
-		{
-			out->append(tmp);
-			mir_free(tmp);
-			out->pack();
-			return;
-		}
-	}
-
-	out->append(templ);
-	ReplaceVars(out, hContact, vars, numVars);
-	out->pack();
-}
-
-
 #endif // __MIR_BUFFER_H__