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.
---
 plugins/XSoundNotify/src/dialog.cpp   |  4 ++--
 plugins/XSoundNotify/src/options.cpp  |  8 ++++----
 plugins/XSoundNotify/src/xsn_main.cpp | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/XSoundNotify/src')

diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index 7c8a3e794c..bbc972fac2 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -137,14 +137,14 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {
 					wchar_t longpath[MAX_PATH] = { 0 };
 					PathToAbsoluteW(dbv.ptszVal, longpath);
-					Skin_PlaySoundFile(longpath);
+					SkinPlaySoundFile(longpath);
 					db_free(&dbv);
 				}
 			}
 			else {
 				wchar_t longpath[MAX_PATH] = { 0 };
 				PathToAbsoluteW(p->path, longpath);
-				Skin_PlaySoundFile(longpath);
+				SkinPlaySoundFile(longpath);
 			}
 			break;
 
diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index fd5bc06ca8..f7735d774b 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -205,14 +205,14 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 					if (!db_get_ws(NULL, SETTINGSNAME, pa->szModuleName, &dbv)) {
 						wchar_t longpath[MAX_PATH];
 						PathToAbsoluteW(dbv.ptszVal, longpath);
-						Skin_PlaySoundFile(longpath);
+						SkinPlaySoundFile(longpath);
 						db_free(&dbv);
 					}
 				}
 				else {
 					wchar_t longpath[MAX_PATH] = { 0 };
 					PathToAbsoluteW(p->path, longpath);
-					Skin_PlaySoundFile(longpath);
+					SkinPlaySoundFile(longpath);
 				}
 			}
 			else {
@@ -224,14 +224,14 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 					if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {
 						wchar_t longpath[MAX_PATH];
 						PathToAbsoluteW(dbv.ptszVal, longpath);
-						Skin_PlaySoundFile(longpath);
+						SkinPlaySoundFile(longpath);
 						db_free(&dbv);
 					}
 				}
 				else {
 					wchar_t longpath[MAX_PATH] = { 0 };
 					PathToAbsoluteW(p->path, longpath);
-					Skin_PlaySoundFile(longpath);
+					SkinPlaySoundFile(longpath);
 				}
 			}
 		}
diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index 417dd08dbd..b97d930f8d 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -78,7 +78,7 @@ void InitSelfSounds()
 
 			wchar_t infobuf[256];
 			mir_snwprintf(infobuf, L"%s [%s]", TranslateT("Self status"), protos[i]->tszAccountName);
-			Skin_AddSound(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));
+			SkinAddNewSoundExW(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));
 		}
 	}
 }
@@ -91,7 +91,7 @@ static int ProtoAck(WPARAM, LPARAM lParam)
 			if (selfSounds[i].iStatus == ack->lParam) {
 				char buf[128];
 				mir_snprintf(buf, "%s%s", ack->szModule, selfSounds[i].szName);
-				Skin_PlaySound(buf);
+				SkinPlaySound(buf);
 				break;
 			}
 		}
@@ -121,7 +121,7 @@ static int ProcessEvent(WPARAM hContact, LPARAM lParam)
 		wchar_t PlaySoundPath[MAX_PATH] = { 0 };
 		PathToAbsoluteW(dbv.ptszVal, PlaySoundPath);
 		isOwnSound = 0;
-		Skin_PlaySoundFile(PlaySoundPath);
+		SkinPlaySoundFile(PlaySoundPath);
 		db_free(&dbv);
 		isOwnSound = 1;
 		return 0;
@@ -138,7 +138,7 @@ static int ProcessEvent(WPARAM hContact, LPARAM lParam)
 		wchar_t PlaySoundPath[MAX_PATH] = { 0 };
 		PathToAbsoluteW(dbv.ptszVal, PlaySoundPath);
 		isAccSound = 0;
-		Skin_PlaySoundFile(PlaySoundPath);
+		SkinPlaySoundFile(PlaySoundPath);
 		db_free(&dbv);
 		isAccSound = 1;
 	}
@@ -168,7 +168,7 @@ static int ProcessChatEvent(WPARAM, LPARAM lParam)
 				wchar_t PlaySoundPath[MAX_PATH] = { 0 };
 				PathToAbsoluteW(dbv.ptszVal, PlaySoundPath);
 				isOwnSound = 0;
-				Skin_PlaySoundFile(PlaySoundPath);
+				SkinPlaySoundFile(PlaySoundPath);
 				db_free(&dbv);
 				isOwnSound = 1;
 				return 0;
@@ -184,7 +184,7 @@ static int ProcessChatEvent(WPARAM, LPARAM lParam)
 				wchar_t PlaySoundPath[MAX_PATH] = { 0 };
 				PathToAbsoluteW(dbv.ptszVal, PlaySoundPath);
 				isAccSound = 0;
-				Skin_PlaySoundFile(PlaySoundPath);
+				SkinPlaySoundFile(PlaySoundPath);
 				db_free(&dbv);
 				isAccSound = 1;
 			}
-- 
cgit v1.2.3