From f2656f118f63643151e53694bd223018c29b4a55 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Sep 2017 22:27:34 +0300 Subject: old good sound services became finally functions --- plugins/ChangeKeyboardLayout/src/hook_events.cpp | 4 ++-- plugins/ChangeKeyboardLayout/src/stdafx.h | 3 ++- plugins/ChangeKeyboardLayout/src/text_operations.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/ChangeKeyboardLayout/src') diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 4fb45f049e..6f1451a5bb 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -122,8 +122,8 @@ int ModulesLoaded(WPARAM, LPARAM) ReadPopupOptions(); // Зарегим звук - SkinAddNewSoundEx(SND_ChangeLayout, ModuleName, LPGEN("Changing Layout")); - SkinAddNewSoundEx(SND_ChangeCase, ModuleName, LPGEN("Changing Case")); + Skin_AddSound(SND_ChangeLayout, ModuleNameW, LPGENW("Changing Layout")); + Skin_AddSound(SND_ChangeCase, ModuleNameW, LPGENW("Changing Case")); // Хук на нажатие клавиши kbHook_All = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)Keyboard_Hook, NULL, GetCurrentThreadId()); diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h index 6eb9e0fadf..b1a3bac5f5 100644 --- a/plugins/ChangeKeyboardLayout/src/stdafx.h +++ b/plugins/ChangeKeyboardLayout/src/stdafx.h @@ -26,7 +26,8 @@ #include "version.h" #define MaxTextSize 64000 -#define ModuleName LPGEN("ChangeKeyboardLayout") +#define ModuleName LPGEN("ChangeKeyboardLayout") +#define ModuleNameW LPGENW("ChangeKeyboardLayout") // History++ API #define MS_HPP_EG_WINDOW "History++/ExtGrid/NewWindow" diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp index c8c44b1042..7df6916a89 100644 --- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp +++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp @@ -436,9 +436,9 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) } if (TextOperation == TOT_Layout) - SkinPlaySound(SND_ChangeLayout); + Skin_PlaySound(SND_ChangeLayout); else if (TextOperation == TOT_Case) - SkinPlaySound(SND_ChangeCase); + Skin_PlaySound(SND_ChangeCase); if (moOptions.CopyToClipboard) CopyTextToClipboard(ptszMBox); @@ -540,9 +540,9 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) InvalidateRect(hTextWnd, NULL, FALSE); if (TextOperation == TOT_Layout) - SkinPlaySound(SND_ChangeLayout); + Skin_PlaySound(SND_ChangeLayout); else if (TextOperation == TOT_Case) - SkinPlaySound(SND_ChangeCase); + Skin_PlaySound(SND_ChangeCase); } return 0; -- cgit v1.2.3