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/NotesAndReminders/src/main.cpp | 6 +++--- plugins/NotesAndReminders/src/reminders.cpp | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/NotesAndReminders') diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index e006e4f13b..8341330d1a 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -150,9 +150,9 @@ static void InitServices() { // register sounds - Skin_AddSound("AlertReminder", LPGENW("Alerts"), LPGENW("Reminder triggered")); - Skin_AddSound("AlertReminder2", LPGENW("Alerts"), LPGENW("Reminder triggered (Alternative 1)")); - Skin_AddSound("AlertReminder3", LPGENW("Alerts"), LPGENW("Reminder triggered (Alternative 2)")); + SkinAddNewSoundEx("AlertReminder", LPGEN("Alerts"), LPGEN("Reminder triggered")); + SkinAddNewSoundEx("AlertReminder2", LPGEN("Alerts"), LPGEN("Reminder triggered (Alternative 1)")); + SkinAddNewSoundEx("AlertReminder3", LPGEN("Alerts"), LPGEN("Reminder triggered (Alternative 2)")); // register menu command services diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 3bb2361b9a..f999000d78 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -458,10 +458,10 @@ void GetTriggerTimeString(const ULARGE_INTEGER *When, char *s, UINT strSize, BOO else mir_snprintf(s, strSize, "%d-%02d-%02d %02d:%02d", tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute); } -static void Skin_PlaySoundPoly(LPCSTR pszSoundName) +static void SkinPlaySoundPoly(LPCSTR pszSoundName) { if (g_UseDefaultPlaySound) { - Skin_PlaySound(pszSoundName); + SkinPlaySound(pszSoundName); return; } @@ -501,10 +501,10 @@ static void UpdateReminderEvent(REMINDERDATA *pReminder, UINT nElapsedSeconds, B if (!(*pHasPlayedSound & dwSoundMask)) { switch (pReminder->SoundSel) { - case 1: Skin_PlaySoundPoly("AlertReminder2"); break; - case 2: Skin_PlaySoundPoly("AlertReminder3"); break; + case 1: SkinPlaySoundPoly("AlertReminder2"); break; + case 2: SkinPlaySoundPoly("AlertReminder3"); break; default: - Skin_PlaySoundPoly("AlertReminder"); + SkinPlaySoundPoly("AlertReminder"); } *pHasPlayedSound |= dwSoundMask; @@ -546,10 +546,10 @@ static void FireReminder(REMINDERDATA *pReminder, BOOL *pHasPlayedSound) if (!(*pHasPlayedSound & dwSoundMask)) { switch (pReminder->SoundSel) { - case 1: Skin_PlaySoundPoly("AlertReminder2"); break; - case 2: Skin_PlaySoundPoly("AlertReminder3"); break; + case 1: SkinPlaySoundPoly("AlertReminder2"); break; + case 2: SkinPlaySoundPoly("AlertReminder3"); break; default: - Skin_PlaySoundPoly("AlertReminder"); + SkinPlaySoundPoly("AlertReminder"); } *pHasPlayedSound |= dwSoundMask; @@ -1825,9 +1825,9 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog, UINT Message, WPARAM wPa int n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETCURSEL, 0, 0); n = (int)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETITEMDATA, n, 0); switch (n) { - case 0: Skin_PlaySound("AlertReminder"); break; - case 1: Skin_PlaySound("AlertReminder2"); break; - case 2: Skin_PlaySound("AlertReminder3"); break; + case 0: SkinPlaySound("AlertReminder"); break; + case 1: SkinPlaySound("AlertReminder2"); break; + case 2: SkinPlaySound("AlertReminder3"); break; } } return TRUE; -- cgit v1.2.3