From 69409021aced78b31da0c9f2def7332a4c4b973e Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 12 Sep 2017 12:14:57 +0300
Subject: Revert "Merge branch 'master' of
 https://github.com/miranda-ng/miranda-ng"

This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.
---
 src/core/stdmsg/src/globals.cpp     |  2 +-
 src/core/stdmsg/src/msgdialog.cpp   |  4 ++--
 src/core/stdmsg/src/msgs.cpp        | 24 ++++++++++++------------
 src/core/stdmsg/src/msgtimedout.cpp |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index 661837a1b2..4675677588 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -87,7 +87,7 @@ static int ackevent(WPARAM, LPARAM lParam)
 		msgQueue_processack(pAck->hContact, (INT_PTR)pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam);
 
 		if (pAck->result == ACKRESULT_SUCCESS)
-			Skin_PlaySound("SendMsg");
+			SkinPlaySound("SendMsg");
 	}
 	return 0;
 }
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index e3834976ff..7f418e285d 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1148,9 +1148,9 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 				// Sounds *only* for sent messages, not for custom events
 				if (isMessage && !isSent) {
 					if (GetForegroundWindow() == m_pOwner->GetHwnd())
-						Skin_PlaySound("RecvMsgActive");
+						SkinPlaySound("RecvMsgActive");
 					else
-						Skin_PlaySound("RecvMsgInactive");
+						SkinPlaySound("RecvMsgInactive");
 				}
 				if (isMessage && !isSent) {
 					m_lastMessage = dbei.timestamp;
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 1b2fa2a775..7df2891d00 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -72,18 +72,18 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 			ShowWindow(hwnd, SW_RESTORE);
 			SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 			SetForegroundWindow(hwnd);
-			Skin_PlaySound("RecvMsgActive");
+			SkinPlaySound("RecvMsgActive");
 		}
 		else {
 			if (GetForegroundWindow() == GetParent(hwnd))
-				Skin_PlaySound("RecvMsgActive");
+				SkinPlaySound("RecvMsgActive");
 			else
-				Skin_PlaySound("RecvMsgInactive");
+				SkinPlaySound("RecvMsgInactive");
 		}
 		return 0;
 	}
 	/* new message */
-	Skin_PlaySound("AlertMsg");
+	SkinPlaySound("AlertMsg");
 
 	char *szProto = GetContactProto(hContact);
 	if (szProto && (g_dat.openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) {
@@ -164,7 +164,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 
 	hContact = db_mc_tryMeta(hContact);
 
-	Skin_PlaySound((lParam) ? "TNStart" : "TNStop");
+	SkinPlaySound((lParam) ? "TNStart" : "TNStop");
 
 	HWND hwnd = Srmm_FindWindow(hContact);
 	if (hwnd)
@@ -511,13 +511,13 @@ int LoadSendRecvMessageModule(void)
 	CreateServiceFunction(MS_MSG_SENDMESSAGEW, SendMessageCommand_W);
 	CreateServiceFunction(MS_MSG_READMESSAGE, ReadMessageCommand);
 
-	Skin_AddSound("RecvMsgActive",   LPGENW("Instant messages"), LPGENW("Incoming (focused window)"));
-	Skin_AddSound("RecvMsgInactive", LPGENW("Instant messages"), LPGENW("Incoming (unfocused window)"));
-	Skin_AddSound("AlertMsg",        LPGENW("Instant messages"), LPGENW("Incoming (new session)"));
-	Skin_AddSound("SendMsg",         LPGENW("Instant messages"), LPGENW("Outgoing"));
-	Skin_AddSound("SendError",       LPGENW("Instant messages"), LPGENW("Message send error"));
-	Skin_AddSound("TNStart",         LPGENW("Instant messages"), LPGENW("Contact started typing"));
-	Skin_AddSound("TNStop",          LPGENW("Instant messages"), LPGENW("Contact stopped typing"));
+	SkinAddNewSoundEx("RecvMsgActive", LPGEN("Instant messages"), LPGEN("Incoming (focused window)"));
+	SkinAddNewSoundEx("RecvMsgInactive", LPGEN("Instant messages"), LPGEN("Incoming (unfocused window)"));
+	SkinAddNewSoundEx("AlertMsg", LPGEN("Instant messages"), LPGEN("Incoming (new session)"));
+	SkinAddNewSoundEx("SendMsg", LPGEN("Instant messages"), LPGEN("Outgoing"));
+	SkinAddNewSoundEx("SendError", LPGEN("Instant messages"), LPGEN("Message send error"));
+	SkinAddNewSoundEx("TNStart", LPGEN("Instant messages"), LPGEN("Contact started typing"));
+	SkinAddNewSoundEx("TNStop", LPGEN("Instant messages"), LPGEN("Contact stopped typing"));
 
 	InitStatusIcons();
 	return 0;
diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp
index e0ce1ad97c..7596198ce5 100644
--- a/src/core/stdmsg/src/msgtimedout.cpp
+++ b/src/core/stdmsg/src/msgtimedout.cpp
@@ -93,7 +93,7 @@ void MessageFailureProcess(TMsgQueue *item, const char* err)
 	}
 	else SendMessage(hwnd, DM_REMAKELOG, 0, 0);
 
-	Skin_PlaySound("SendError");
+	SkinPlaySound("SendError");
 
 	ErrorDlgParam param = { err, item };
 	CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSGSENDERROR), hwnd, ErrorDlgProc, (LPARAM)&param);
-- 
cgit v1.2.3