Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng"

This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.

21 files changed, 51 insertions, 46 deletions

diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp
index 13129f43f3..f46ad30d58 100644
--- a/protocols/FacebookRM/src/events.cpp
+++ b/protocols/FacebookRM/src/events.cpp
@@ -41,22 +41,22 @@ HWND FacebookProto::NotifyEvent(wchar_t* title, wchar_t* text, MCONTACT contact,
 
 	case EVENT_NOTIFICATION:
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");
-		Skin_PlaySound("Notification");
+		SkinPlaySound("Notification");
 		break;
 
 	case EVENT_OTHER:
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Other");
-		Skin_PlaySound("OtherEvent");
+		SkinPlaySound("OtherEvent");
 		break;
 
 	case EVENT_FRIENDSHIP:
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Friendship");
-		Skin_PlaySound("Friendship");
+		SkinPlaySound("Friendship");
 		break;
 
 	case EVENT_TICKER:
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Ticker");
-		Skin_PlaySound("Ticker");
+		SkinPlaySound("Ticker");
 		break;
 
 	case EVENT_ON_THIS_DAY:
diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index 297576d219..2a60d15060 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -695,7 +695,7 @@ void FacebookProto::ProcessMemories(void *p)
 			parseFeeds(html, news, new_time, true);
 
 			if (!news.empty()) {
-				Skin_PlaySound("Memories");
+				SkinPlaySound("Memories");
 			}
 
 			numMemories = news.size();
@@ -1176,7 +1176,7 @@ void FacebookProto::ProcessFeeds(void *p)
 	parseFeeds(resp.data, news, new_time, filterAds);
 
 	if (!news.empty()) {
-		Skin_PlaySound("NewsFeed");
+		SkinPlaySound("NewsFeed");
 	}
 
 	if (manuallyTriggered) {
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 27be2e50d6..0490710df1 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -1120,12 +1120,12 @@ void FacebookProto::InitHotkeys()
  */
 void FacebookProto::InitSounds()
 {
-	Skin_AddSound("Notification", m_tszUserName, LPGENW("Notification"));
-	Skin_AddSound("NewsFeed", m_tszUserName, LPGENW("Newsfeed event"));
-	Skin_AddSound("OtherEvent", m_tszUserName, LPGENW("Other event"));
-	Skin_AddSound("Friendship", m_tszUserName, LPGENW("Friendship event"));
-	Skin_AddSound("Ticker", m_tszUserName, LPGENW("Ticker event"));
-	Skin_AddSound("Memories", m_tszUserName, LPGENW("Memories"));
+	SkinAddNewSoundExW("Notification", m_tszUserName, LPGENW("Notification"));
+	SkinAddNewSoundExW("NewsFeed", m_tszUserName, LPGENW("Newsfeed event"));
+	SkinAddNewSoundExW("OtherEvent", m_tszUserName, LPGENW("Other event"));
+	SkinAddNewSoundExW("Friendship", m_tszUserName, LPGENW("Friendship event"));
+	SkinAddNewSoundExW("Ticker", m_tszUserName, LPGENW("Ticker event"));
+	SkinAddNewSoundExW("Memories", m_tszUserName, LPGENW("Memories"));
 }
 
 /**
diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index 406f471c27..ab2eb18dc0 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -119,7 +119,7 @@ static const LPSTR lpcszMailRuDomains[] =
 #define ADV_ICON_BLOGSTATUS_ID               "ADV_ICON_BLOGSTATUS"

 #define ADV_ICON_BLOGSTATUS_STR              LPGEN("Blog status message")

 

-#define MRA_SOUND_NEW_EMAIL                   LPGENW("New E-mail available in Inbox")

+#define MRA_SOUND_NEW_EMAIL                   LPGEN("New E-mail available in Inbox")

 

 #define MAILRU_SERVER_TIME_ZONE              -180 //internal // +0300

 #define MAILRU_CONTACTISTYPING_TIMEOUT       10 //internal

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index ca19b6290a..4ced9192fc 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -47,7 +47,7 @@ CMraProto::CMraProto(const char* _module, const wchar_t* _displayName) :
 	InitMenus();

 

 	mir_snprintf(szNewMailSound, "%s_new_email", m_szModuleName);

-	Skin_AddSound(szNewMailSound, m_tszUserName, MRA_SOUND_NEW_EMAIL);

+	SkinAddNewSoundEx(szNewMailSound, m_szModuleName, MRA_SOUND_NEW_EMAIL);

 

 	HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CMraProto::MraRebuildStatusMenu);

 

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index bf8dea15bb..928efc9328 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -663,7 +663,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 			pcli->pfnAddEvent(&cle);

 		}

 

-		Skin_PlaySound(szNewMailSound);

+		SkinPlaySound(szNewMailSound);

 		if (hContact) {// update user info

 			MraUpdateContactInfo(hContact);

 			MraPopupShowFromContactW(hContact, MRA_POPUP_TYPE_EMAIL_STATUS, szStatusText);

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 2f7d21d088..f8662107a3 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -718,7 +718,7 @@ void CMsnProto::MSN_ProcessNotificationMessage(char* buf, size_t len)
 		mir_snprintf((fullurl + sz), (_countof(fullurl) - sz), "notification_id=%s&message_id=%s",

 			ezxml_attr(xmlnot, "id"), ezxml_attr(xmlmsg, "id"));

 

-		Skin_PlaySound(alertsoundname);

+		SkinPlaySound(alertsoundname);

 

 		wchar_t* alrt = mir_utf8decodeW(ezxml_txt(xmltxt));

 		MSN_ShowPopup(TranslateT("MSN Alert"), alrt, MSN_ALERT_POPUP | MSN_ALLOW_MSGBOX, fullurl);

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 7bc2b7fb33..dd385c6070 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -304,7 +304,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
 

 	// Disable to notify receiving hotmail

 	if (ShowPopup && !getByte("DisableHotmail", 0)) {

-		Skin_PlaySound(mailsoundname);

+		SkinPlaySound(mailsoundname);

 

 		const char *msgurl = tFileInfo["Message-URL"];

 		if (msgurl) {

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index dbce865552..57e190da30 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -114,11 +114,11 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) :
 

 	mailsoundname = (char*)mir_alloc(64);

 	mir_snprintf(mailsoundname, 64, "%s:Hotmail", m_szModuleName);

-	Skin_AddSound(mailsoundname, m_tszUserName, LPGENW("Live Mail"));

+	SkinAddNewSoundExW(mailsoundname, m_tszUserName, LPGENW("Live Mail"));

 

 	alertsoundname = (char*)mir_alloc(64);

 	mir_snprintf(alertsoundname, 64, "%s:Alerts", m_szModuleName);

-	Skin_AddSound(alertsoundname, m_tszUserName, LPGENW("Live Alert"));

+	SkinAddNewSoundExW(alertsoundname, m_tszUserName, LPGENW("Live Alert"));

 

 	AvatarQueue_Init();

 	InitCustomFolders();

diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp
index 8e8f69e2cf..32e0d891df 100644
--- a/protocols/Omegle/src/communication.cpp
+++ b/protocols/Omegle/src/communication.cpp
@@ -555,7 +555,7 @@ bool Omegle_client::events()
 			}
 			else if (name == "typing" || name == "spyTyping") {
 				// Stranger is typing, not supported by chat module yet
-				Skin_PlaySound("StrangerTyp");
+				SkinPlaySound("StrangerTyp");
 
 				ptrW who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_wstrdup(L"Stranger"));
 				Srmm_SetStatusText(parent->GetChatHandle(), 
@@ -564,7 +564,7 @@ bool Omegle_client::events()
 			}
 			else if (name == "stoppedTyping" || name == "spyStoppedTyping") {
 				// Stranger stopped typing, not supported by chat module yet
-				Skin_PlaySound("StrangerTypStop");
+				SkinPlaySound("StrangerTypStop");
 
 				ptrW who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_wstrdup(L"Stranger"));
 				Srmm_SetStatusText(parent->GetChatHandle(), 
@@ -575,7 +575,7 @@ bool Omegle_client::events()
 				Srmm_SetStatusText(parent->GetChatHandle(), nullptr);
 
 				// Play sound as we received message
-				Skin_PlaySound("StrangerMessage");
+				SkinPlaySound("StrangerMessage");
 
 				if (state_ == STATE_ACTIVE) {
 					ptrW msg(json_as_string(json_at(item, 1)));
@@ -586,7 +586,7 @@ bool Omegle_client::events()
 				Srmm_SetStatusText(parent->GetChatHandle(), nullptr);
 
 				// Play sound as we received message
-				Skin_PlaySound("StrangerMessage");
+				SkinPlaySound("StrangerMessage");
 
 				if (state_ == STATE_SPY) {
 					ptrW stranger(json_as_string(json_at(item, 1)));
@@ -600,7 +600,7 @@ bool Omegle_client::events()
 				// Stranger disconnected
 				if (db_get_b(NULL, parent->m_szModuleName, OMEGLE_KEY_DONT_STOP, 0))
 				{
-					Skin_PlaySound("StrangerChange");
+					SkinPlaySound("StrangerChange");
 					parent->NewChat();
 				}
 				else
@@ -618,7 +618,7 @@ bool Omegle_client::events()
 				// Stranger disconnected
 				if (db_get_b(NULL, parent->m_szModuleName, OMEGLE_KEY_DONT_STOP, 0))
 				{
-					Skin_PlaySound("StrangerChange");
+					SkinPlaySound("StrangerChange");
 					parent->NewChat();
 				}
 				else
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp
index aa46bbc601..3eae533cda 100644
--- a/protocols/Omegle/src/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
@@ -57,10 +57,10 @@ PROTO<OmegleProto>(proto_name, username)
 

 	facy.set_handle(m_hNetlibUser);

 

-	Skin_AddSound("StrangerTyp", m_tszUserName, LPGENW("Stranger is typing"));

-	Skin_AddSound("StrangerTypStop", m_tszUserName, LPGENW("Stranger stopped typing"));

-	Skin_AddSound("StrangerChange", m_tszUserName, LPGENW("Changing stranger"));

-	Skin_AddSound("StrangerMessage", m_tszUserName, LPGENW("Receive message"));

+	SkinAddNewSoundExW("StrangerTyp", m_tszUserName, LPGENW("Stranger is typing"));

+	SkinAddNewSoundExW("StrangerTypStop", m_tszUserName, LPGENW("Stranger stopped typing"));

+	SkinAddNewSoundExW("StrangerChange", m_tszUserName, LPGENW("Changing stranger"));

+	SkinAddNewSoundExW("StrangerMessage", m_tszUserName, LPGENW("Receive message"));

 }

 

 OmegleProto::~OmegleProto()

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index e6d76d9e10..cc90e0d25b 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -48,8 +48,8 @@ CSkypeProto::CSkypeProto(const char* protoName, const wchar_t* userName) :
 		CreateDirectoryTreeW(m_tszAvatarFolder.c_str());
 
 	//sounds
-	Skin_AddSound("skype_inc_call", L"SkypeWeb", LPGENW("Incoming call sound"));
-	Skin_AddSound("skype_call_canceled", L"SkypeWeb", LPGENW("Incoming call canceled sound"));
+	SkinAddNewSoundEx("skype_inc_call", "SkypeWeb", LPGEN("Incoming call sound"));
+	SkinAddNewSoundEx("skype_call_canceled", "SkypeWeb", LPGEN("Incoming call canceled sound"));
 
 	SkypeSetTimer();
 
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp
index a34e35c8e9..668431554b 100644
--- a/protocols/SkypeWeb/src/skype_trouter.cpp
+++ b/protocols/SkypeWeb/src/skype_trouter.cpp
@@ -187,7 +187,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
 				MCONTACT hContact = AddContact(uid.c_str(), true);

 

 				MEVENT hEvent = AddDbEvent(SKYPE_DB_EVENT_TYPE_INCOMING_CALL, hContact, time(NULL), DBEF_READ, gp.c_str(), callId.c_str());

-				Skin_PlaySound("skype_inc_call");

+				SkinPlaySound("skype_inc_call");

 

 				CLISTEVENT cle = {};

 				cle.flags = CLEF_UNICODE;

@@ -210,7 +210,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
 

 	case 104: //call canceled: callerId=""; conversationId=NULL; callId=call id

 		// std::string callId = body["callId"].as_string();

-		Skin_PlaySound("skype_call_canceled");

+		SkinPlaySound("skype_call_canceled");

 		break;

 	}

 }

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index db1a4bbfb1..34f6828abf 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -230,14 +230,19 @@ INT_PTR TlenProtocol::MenuHandleInbox(WPARAM, LPARAM)
 

 int TlenProtocol::OnModulesLoaded(WPARAM, LPARAM)

 {

+	char str[128];

 	/* Set all contacts to offline */

+

 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))

 		if (db_get_w(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)

 			db_set_w(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);

 

-	Skin_AddSound("TlenMailNotify", m_tszUserName, LPGENW("Incoming mail"));

-	Skin_AddSound("TlenAlertNotify", m_tszUserName, LPGENW("Alert"));

-	Skin_AddSound("TlenVoiceNotify", m_tszUserName, LPGENW("Voice chat"));

+	strncpy_s(str, LPGEN("Incoming mail"), _TRUNCATE);

+	SkinAddNewSoundEx("TlenMailNotify", m_szModuleName, str);

+	strncpy_s(str, LPGEN("Alert"), _TRUNCATE);

+	SkinAddNewSoundEx("TlenAlertNotify", m_szModuleName, str);

+	strncpy_s(str, LPGEN("Voice chat"), _TRUNCATE);

+	SkinAddNewSoundEx("TlenVoiceNotify", m_szModuleName, str);

 

 	HookProtoEvent(ME_USERINFO_INITIALISE, &TlenProtocol::UserInfoInit);

 	return 0;

diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index 8396a9ab45..2528b62f9e 100644
--- a/protocols/Tlen/src/tlen_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -991,7 +991,7 @@ static void TlenProcessM(XmlNode *node, ThreadData *info)
 						else {

 							if (info->proto->tlenOptions.logAlerts)

 								TlenLogMessage(info->proto, hContact, 0, Translate("An alert has been received."));

-							Skin_PlaySound("TlenAlertNotify");

+							SkinPlaySound("TlenAlertNotify");

 						}

 					}

 				}

@@ -1107,7 +1107,7 @@ static void TlenProcessN(XmlNode *node, ThreadData *info)
 		TlenStringAppend(&str, &strSize, "%s: %s", Translate("Subject"), s);

 		popupText = TlenTextDecode(str);

 		TlenMailPopup(info->proto, popupTitle, popupText);

-		Skin_PlaySound("TlenMailNotify");

+		SkinPlaySound("TlenMailNotify");

 

 		mir_free(popupTitle);

 		mir_free(popupText);

@@ -1211,7 +1211,7 @@ static void TlenProcessV(XmlNode *node, ThreadData *info)
 		if ((e=TlenXmlGetAttrValue(node, "e")) != NULL) {

 			if (!mir_strcmp(e, "1")) {

 				if ((id=TlenXmlGetAttrValue(node, "i")) != NULL) {

-					Skin_PlaySound("TlenVoiceNotify");

+					SkinPlaySound("TlenVoiceNotify");

 					TlenVoiceAccept(info->proto, id, from);

 				}

 			} else if (!mir_strcmp(e, "3")) {

diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index 3e399e6e5e..21c7ce6cb9 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -589,7 +589,7 @@ void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg)
 			if (!pre_read && popups) {

 				std::stringstream url;

 				url << std::string("https://twitter.com/") << i->username << std::string("/status/") << i->status.id;

-				Skin_PlaySound("TwitterNew");

+				SkinPlaySound("TwitterNew");

 				ShowContactPopup(hContact, i->status.text, new std::string(url.str()));

 			}

 		}

diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index 9c9f6f4d50..c0bcddb4f5 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -249,7 +249,7 @@ MCONTACT TwitterProto::AddToClientList(const char *name, const char *status)
 

 			std::string url = profile_base_url("https://twitter.com/") + http::url_encode(name);

 			setString(hContact, "Homepage", url.c_str());

-			Skin_PlaySound("TwitterNewContact");

+			SkinPlaySound("TwitterNewContact");

 			DBVARIANT dbv;

 			if (!getWString(TWITTER_KEY_GROUP, &dbv)) {

 				db_set_ws(hContact, "CList", "Group", dbv.ptszVal);

diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index a32b8e6e46..1040df4819 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -33,8 +33,8 @@ static IconItem icons[] =
 

 void TwitterInitSounds(void)

 {

-	Skin_AddSound("TwitterNewContact", LPGENW("Twitter"), LPGENW("First tweet from new contact"));

-	Skin_AddSound("TwitterNew",        LPGENW("Twitter"), LPGENW("New tweet"));

+	SkinAddNewSoundEx("TwitterNewContact", LPGEN("Twitter"), LPGEN("First tweet from new contact"));

+	SkinAddNewSoundEx("TwitterNew", LPGEN("Twitter"), LPGEN("New tweet"));

 }

 

 // TODO: uninit

diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index 64654c3813..1ee8c9bae9 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -71,7 +71,7 @@ void CVkProto::AddFeedEvent(CVKNewsItem& vkNewsItem)
 

 void CVkProto::AddCListEvent(bool bNews)

 {

-	Skin_PlaySound("VKNewsFeed");

+	SkinPlaySound("VKNewsFeed");

 

 	if (!m_vkOptions.bUseNonStandardNotifications)

 		return;

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index dec31de534..fbfea1b4c1 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -121,7 +121,7 @@ int CVkProto::OnModulesLoaded(WPARAM, LPARAM)
 	HookProtoEvent(ME_DB_EVENT_MARKED_READ, &CVkProto::OnDbEventRead);

 	HookProtoEvent(ME_DB_CONTACT_SETTINGCHANGED, &CVkProto::OnDbSettingChanged);

 	//Sounds

-	Skin_AddSound("VKNewsFeed", m_tszUserName, LPGENW("VKontakte newsfeed & notification event"));

+	SkinAddNewSoundExW("VKNewsFeed", m_tszUserName, LPGENW("VKontakte newsfeed & notification event"));

 

 	InitPopups();

 	InitMenus();

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index 3d19f7fe72..c41266f98c 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -399,7 +399,7 @@ void WhatsAppProto::NotifyEvent(const wchar_t *title, const wchar_t *info, MCONT
 			colorText = getDword(WHATSAPP_KEY_EVENT_OTHER_COLTEXT, DEFAULT_EVENT_COLTEXT);

 		}

 		timeout = getDword(WHATSAPP_KEY_EVENT_OTHER_TIMEOUT, -1);

-		Skin_PlaySound("OtherEvent");

+		SkinPlaySound("OtherEvent");

 		flags |= NIIF_INFO;

 		break;

 	}