From 69409021aced78b31da0c9f2def7332a4c4b973e Mon Sep 17 00:00:00 2001 From: George Hazan 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/TooltipNotify/src/TooltipNotify.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'plugins/TooltipNotify') diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 9b17cb37e6..fc3e2ccd9d 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -133,13 +133,14 @@ int CTooltipNotify::ModulesLoaded(WPARAM, LPARAM) db_set_b(NULL, MODULENAME, "firstrun", 0); } - Skin_AddSound(SND_ONLINE, LPGENW("Tooltip Notify"), LPGENW("Online"), L"online.wav"); - Skin_AddSound(SND_OFFLINE, LPGENW("Tooltip Notify"), LPGENW("Offline"), L"offline.wav"); - Skin_AddSound(SND_OTHER, LPGENW("Tooltip Notify"), LPGENW("Other"), L"other.wav"); - Skin_AddSound(SND_TYPING, LPGENW("Tooltip Notify"), LPGENW("Typing"), L"typing.wav"); + SkinAddNewSoundEx(SND_ONLINE, LPGEN("Tooltip Notify"), LPGEN("Online"), "online.wav"); + SkinAddNewSoundEx(SND_OFFLINE, LPGEN("Tooltip Notify"), LPGEN("Offline"), "offline.wav"); + SkinAddNewSoundEx(SND_OTHER, LPGEN("Tooltip Notify"), LPGEN("Other"), "other.wav"); + SkinAddNewSoundEx(SND_TYPING, LPGEN("Tooltip Notify"), LPGEN("Typing"), "typing.wav"); // register fonts RegisterFonts(); + return 0; } @@ -155,7 +156,7 @@ int CTooltipNotify::ProtoContactIsTyping(WPARAM hContact, LPARAM lParam) pTooltipData->iStatus = ID_TTNTF_STATUS_TYPING; EndNotifyAll(); - Skin_PlaySound(SND_TYPING); + SkinPlaySound(SND_TYPING); BeginNotify(pTooltipData); } else EndNotifyAll(); @@ -224,18 +225,18 @@ int CTooltipNotify::ContactSettingChanged(WPARAM hContact, LPARAM lParam) switch (wNewStatus) { case ID_STATUS_OFFLINE: if (!m_sOptions.bOffline) return 0; - Skin_PlaySound(SND_OFFLINE); + SkinPlaySound(SND_OFFLINE); break; case ID_STATUS_ONLINE: if (CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_USERONLINE) && m_sOptions.bConjSOLN) return 0; if (!m_sOptions.bOnline) return 0; - Skin_PlaySound(SND_ONLINE); + SkinPlaySound(SND_ONLINE); break; default: if (!m_sOptions.bOther) return 0; - Skin_PlaySound(SND_OTHER); + SkinPlaySound(SND_OTHER); break; } -- cgit v1.2.3