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

This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.

3 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 97ac6a7adf..7a174bf528 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -161,7 +161,7 @@ static int ackevent(WPARAM, LPARAM lParam)
 	}

 	else if (hwndSender != nullptr) {

 		SendMessage(hwndSender, DM_STOPMESSAGESENDING, 0, 0);

-		Skin_PlaySound("SendMsg");

+		SkinPlaySound("SendMsg");

 	}

 

 	return 0;

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index cd49dd8bdd..c642e0e422 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1435,8 +1435,8 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 					m_lastMessage = dbei.timestamp;

 					UpdateStatusBar();

 					if (GetForegroundWindow() == m_hwndParent && m_pParent->hwndActive == m_hwnd)

-						Skin_PlaySound("RecvMsgActive");

-					else Skin_PlaySound("RecvMsgInactive");

+						SkinPlaySound("RecvMsgActive");

+					else SkinPlaySound("RecvMsgInactive");

 					if ((g_dat.flags2 & SMF2_SWITCHTOACTIVE) && (IsIconic(m_hwndParent) || GetActiveWindow() != m_hwndParent) && IsWindowVisible(m_hwndParent))

 						SendMessage(m_hwndParent, CM_ACTIVATECHILD, 0, (LPARAM)m_hwnd);

 					if (IsAutoPopup(m_hContact))

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 26ee901ae6..d7a2e05b74 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -106,7 +106,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	/* does a window for the contact exist? */

 	if (hwnd == nullptr) {

 		/* new message */

-		Skin_PlaySound("AlertMsg");

+		SkinPlaySound("AlertMsg");

 		if (IsAutoPopup(hContact)) {

 			(new CSrmmWindow(hContact, true))->Show();

 			return 0;

@@ -188,7 +188,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)

@@ -647,12 +647,12 @@ int OnLoadModule(void)
 	CreateServiceFunction(MS_MSG_SENDMESSAGEW, SendMessageCommandW);

 	CreateServiceFunction(MS_MSG_TYPINGMESSAGE, TypingMessageCommand);

 

-	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("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("TNStart", LPGEN("Instant messages"), LPGEN("Contact started typing"));

+	SkinAddNewSoundEx("TNStop", LPGEN("Instant messages"), LPGEN("Contact stopped typing"));

 

 	hDragCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_DRAGCURSOR));