old good sound services became finally functions

8 files changed, 22 insertions, 22 deletions

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index b27e605d2a..864745498f 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -214,11 +214,11 @@ void DoFlashAndSoundWorker(FLASH_PARAMS *p)
 			p->bInactive = dat->m_pContainer->m_hwnd != GetForegroundWindow();

 			p->bActiveTab = (dat->m_pContainer->m_hwndActive == si->pDlg->GetHwnd());

 			if (p->sound && dat->MustPlaySound())

-				SkinPlaySound(p->sound);

+				Skin_PlaySound(p->sound);

 		}

 	}

 	else if (p->sound)

-		SkinPlaySound(p->sound);

+		Skin_PlaySound(p->sound);

 

 	if (dat) {

 		HWND hwndTab = GetParent(si->pDlg->GetHwnd());

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index 7b2fd8f54a..cb105d1aee 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -665,7 +665,7 @@ void CChatRoomDlg::onClick_OK(CCtrlButton*)
 	UpdateStatusBar();
 	if (m_pContainer)
 		if (fSound && !nen_options.iNoSounds && !(m_pContainer->dwFlags & CNT_NOSOUND))
-			SkinPlaySound("ChatSent");
+			Skin_PlaySound("ChatSent");
 
 	SetFocus(m_message.GetHwnd());
 }
@@ -1193,7 +1193,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 		KbdState(isShift, isCtrl, isAlt);
 
 		if (PluginConfig.m_bSoundOnTyping && !isAlt && !isCtrl && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam != VK_ESCAPE && !(wParam == VK_TAB && PluginConfig.m_bAllowTab))
-			SkinPlaySound("SoundOnTyping");
+			Skin_PlaySound("SoundOnTyping");
 
 		if (isCtrl && !isAlt && !isShift)
 			switch (wParam) {
@@ -1209,7 +1209,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 
 		// sound on typing..
 		if (PluginConfig.m_bSoundOnTyping && !isAlt && wParam == VK_DELETE)
-			SkinPlaySound("SoundOnTyping");
+			Skin_PlaySound("SoundOnTyping");
 
 		if (wParam != VK_ESCAPE)
 			if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 5b4539fb8f..298bee3138 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -69,11 +69,11 @@ void CGlobals::reloadSystemStartup()
 	PluginConfig.g_hMenuContext = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_TABCONTEXT));

 	TranslateMenu(g_hMenuContext);

 

-	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"));

+	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"));

 

 	hCurSplitNS = LoadCursor(nullptr, IDC_SIZENS);

 	hCurSplitWE = LoadCursor(nullptr, IDC_SIZEWE);

@@ -212,7 +212,7 @@ void CGlobals::reloadAdv()
 	m_bDontUseDefaultKbd = M.GetBool("adv_leaveKeyboardAlone", true);

 

 	if (m_bSoundOnTyping && m_TypingSoundAdded == false) {

-		SkinAddNewSoundEx("SoundOnTyping", LPGEN("Other"), LPGEN("TabSRMM: typing"));

+		Skin_AddSound("SoundOnTyping", LPGENW("Other"), LPGENW("TabSRMM: typing"));

 		m_TypingSoundAdded = true;

 	}

 	m_bAllowOfflineMultisend = M.GetBool("AllowOfflineMultisend", true);

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index a275fa74be..d1af47ec4b 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -238,7 +238,7 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode)
 	else fShowOnClist = false;
 
 	if ((!foundWin || !(pContainer->dwFlags & CNT_NOSOUND)) && preTyping != (mode != 0))
-		SkinPlaySound(mode ? "TNStart" : "TNStop");
+		Skin_PlaySound(mode ? "TNStart" : "TNStop");
 
 	if (M.GetByte(SRMSGMOD, "ShowTypingPopup", 0)) {
 		BOOL fShow = false;
@@ -447,7 +447,7 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM hDbEvent)
 	// if no window is open, we are not interested in anything else but unread message events
 	// new message
 	if (!nen_options.iNoSounds)
-		SkinPlaySound("AlertMsg");
+		Skin_PlaySound("AlertMsg");
 
 	if (nen_options.iNoAutoPopup)
 		goto nowindowcreate;
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 2eba71af45..147555a9c3 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1991,7 +1991,7 @@ LRESULT CSrmmWindow::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 		KbdState(isShift, isCtrl, isAlt);

 

 		if (PluginConfig.m_bSoundOnTyping && !isAlt && !isCtrl && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam != VK_ESCAPE && !(wParam == VK_TAB && PluginConfig.m_bAllowTab))

-			SkinPlaySound("SoundOnTyping");

+			Skin_PlaySound("SoundOnTyping");

 

 		if (isCtrl && !isAlt) {

 			switch (wParam) {

@@ -2044,7 +2044,7 @@ LRESULT CSrmmWindow::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 		KbdState(isShift, isCtrl, isAlt);

 

 		if (PluginConfig.m_bSoundOnTyping && !isAlt && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam == VK_DELETE)

-			SkinPlaySound("SoundOnTyping");

+			Skin_PlaySound("SoundOnTyping");

 

 		if (wParam == VK_INSERT && !isShift && !isCtrl && !isAlt) {

 			m_bInsertMode = !m_bInsertMode;

@@ -2679,7 +2679,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 				mir_snwprintf(job->szErrorMsg, TranslateT("Delivery failure: %s"), TranslateT("The message send timed out"));

 				job->iStatus = SendQueue::SQ_ERROR;

 				if (!nen_options.iNoSounds && !(m_pContainer->dwFlags & CNT_NOSOUND))

-					SkinPlaySound("SendError");

+					Skin_PlaySound("SendError");

 				if (!(m_dwFlags & MWF_ERRORSTATE))

 					sendQueue->handleError(this, iIndex);

 				break;

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 24487881b8..09f477af63 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1162,9 +1162,9 @@ void CTabBaseDlg::PlayIncomingSound() const
 	int iPlay = MustPlaySound();

 	if (iPlay) {

 		if (GetForegroundWindow() == m_pContainer->m_hwnd && m_pContainer->m_hwndActive == m_hwnd)

-			SkinPlaySound("RecvMsgActive");

+			Skin_PlaySound("RecvMsgActive");

 		else

-			SkinPlaySound("RecvMsgInactive");

+			Skin_PlaySound("RecvMsgInactive");

 	}

 }

 

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index b78867654f..cae1d654e7 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -442,7 +442,7 @@ int SendQueue::ackMessage(CTabBaseDlg *dat, WPARAM wParam, LPARAM lParam)
 			// "hard" errors are handled differently in multisend. There is no option to retry - once failed, they
 			// are discarded and the user is notified with a small log message.
 			if (!nen_options.iNoSounds && !(m_pContainer->dwFlags & CNT_NOSOUND))
-				SkinPlaySound("SendError");
+				Skin_PlaySound("SendError");
 
 			mir_snwprintf(job.szErrorMsg, TranslateT("Delivery failure: %s"), _A2T((char *)ack->lParam));
 			job.iStatus = SQ_ERROR;
@@ -485,7 +485,7 @@ int SendQueue::ackMessage(CTabBaseDlg *dat, WPARAM wParam, LPARAM lParam)
 
 	if (m_pContainer)
 		if (!nen_options.iNoSounds && !(m_pContainer->dwFlags & CNT_NOSOUND))
-			SkinPlaySound("SendMsg");
+			Skin_PlaySound("SendMsg");
 
 	Srmm_Broadcast(DM_APPENDMCEVENT, job.hContact, hNewEvent);
 
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 0e133464a3..42a3238131 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -548,8 +548,8 @@ int TN_ModuleInit()
 		hDisableMenu = Menu_AddMainMenuItem(&mi);

 	}

 

-	SkinAddNewSoundEx("TNStart", LPGEN("Instant messages"), LPGEN("Contact started typing"));

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

+	Skin_AddSound("TNStart", LPGENW("Instant messages"), LPGENW("Contact started typing"));

+	Skin_AddSound("TNStop", LPGENW("Instant messages"), LPGENW("Contact stopped typing"));

 	return 0;

 }