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/Nudge/src/main.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'plugins/Nudge')
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index 5c90b286ae..a956df53bd 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -139,7 +139,7 @@ int NudgeReceived(WPARAM hContact, LPARAM lParam)
if (p.autoResend)
mir_forkthread(AutoResendNudge, (void*)hContact);
- Skin_PlaySound(p.NudgeSoundname);
+ SkinPlaySound(p.NudgeSoundname);
}
}
@@ -182,7 +182,7 @@ int NudgeReceived(WPARAM hContact, LPARAM lParam)
if (DefaultNudge.autoResend)
mir_forkthread(AutoResendNudge, (void*)hContact);
- Skin_PlaySound(DefaultNudge.NudgeSoundname);
+ SkinPlaySound(DefaultNudge.NudgeSoundname);
}
}
@@ -210,7 +210,7 @@ void LoadProtocols(void)
//Load the default nudge
mir_snprintf(DefaultNudge.ProtocolName, "Default");
mir_snprintf(DefaultNudge.NudgeSoundname, "Nudge : Default");
- Skin_AddSound(DefaultNudge.NudgeSoundname, LPGENW("Nudge"), LPGENW("Default Nudge"));
+ SkinAddNewSoundEx(DefaultNudge.NudgeSoundname, LPGEN("Nudge"), LPGEN("Default Nudge"));
DefaultNudge.Load();
GlobalNudge.Load();
@@ -411,7 +411,7 @@ int Preview()
for (int i = 0; i < arNudges.getCount(); i++) {
CNudgeElement &p = arNudges[i];
if (p.enabled) {
- Skin_PlaySound(p.NudgeSoundname);
+ SkinPlaySound(p.NudgeSoundname);
if (p.showPopup)
Nudge_ShowPopup(&p, hContact, p.recText);
if (p.openContactList)
@@ -427,7 +427,7 @@ int Preview()
}
else {
if (DefaultNudge.enabled) {
- Skin_PlaySound(DefaultNudge.NudgeSoundname);
+ SkinPlaySound(DefaultNudge.NudgeSoundname);
if (DefaultNudge.showPopup)
Nudge_ShowPopup(&DefaultNudge, hContact, DefaultNudge.recText);
if (DefaultNudge.openContactList)
@@ -525,7 +525,7 @@ void Nudge_AddAccount(PROTOACCOUNT *proto)
wchar_t soundDesc[MAXMODULELABELLENGTH + 10];
mir_snwprintf(soundDesc, LPGENW("Nudge for %s"), proto->tszAccountName);
- Skin_AddSound(p->NudgeSoundname, LPGENW("Nudge"), soundDesc);
+ SkinAddNewSoundExW(p->NudgeSoundname, LPGENW("Nudge"), soundDesc);
arNudges.insert(p);
}
--
cgit v1.2.3