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/UserInfoEx/src/svc_reminder.cpp | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index 151b3a7bfb..ffaa8b8a0b 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -352,11 +352,11 @@ static BYTE NotifyWithSound(const CEvent &evt) if (evt._wDaysLeft <= min(db_get_b(NULL, MODNAME, SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), gRemindOpts.wDaysEarlier)) { switch (evt._eType) { case CEvent::BIRTHDAY: - Skin_PlaySound(evt._wDaysLeft == 0 ? SOUND_BIRTHDAY_TODAY : SOUND_BIRTHDAY_SOON); + SkinPlaySound(evt._wDaysLeft == 0 ? SOUND_BIRTHDAY_TODAY : SOUND_BIRTHDAY_SOON); return 0; case CEvent::ANNIVERSARY: - Skin_PlaySound(SOUND_ANNIVERSARY); + SkinPlaySound(SOUND_ANNIVERSARY); return 0; } } @@ -893,9 +893,24 @@ void SvcReminderOnModulesLoaded(void) void SvcReminderLoadModule(void) { // init sounds - Skin_AddSound(SOUND_BIRTHDAY_TODAY, LPGENW("Birthday reminder"), L"Sounds\\BirthDay.wav"); - Skin_AddSound(SOUND_BIRTHDAY_SOON, LPGENW("Birthday reminder: it's coming"), L"Sounds\\BirthDayComing.wav"); - Skin_AddSound(SOUND_ANNIVERSARY, LPGENW("Anniversary Reminder"), L"Sounds\\Reminder.wav"); + SKINSOUNDDESCEX ssd = { 0 }; + ssd.cbSize = sizeof(ssd); + ssd.pszSection = MODNAME; + + ssd.pszName = SOUND_BIRTHDAY_TODAY; + ssd.pszDescription = LPGEN("Birthday reminder"); + ssd.pszDefaultFile = "Sounds\\BirthDay.wav"; + Skin_AddSound(&ssd); + + ssd.pszName = SOUND_BIRTHDAY_SOON; + ssd.pszDescription = LPGEN("Birthday reminder: it's coming"); + ssd.pszDefaultFile = "Sounds\\BirthDayComing.wav"; + Skin_AddSound(&ssd); + + ssd.pszName = SOUND_ANNIVERSARY; + ssd.pszDescription = LPGEN("Anniversary Reminder"); + ssd.pszDefaultFile = "Sounds\\Reminder.wav"; + Skin_AddSound(&ssd); // create service functions CreateServiceFunction(MS_USERINFO_REMINDER_CHECK, CheckService); @@ -911,6 +926,7 @@ void SvcReminderLoadModule(void) if (db_get_b(NULL, MODNAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF && ExtraIcon == INVALID_HANDLE_VALUE) ExtraIcon = ExtraIcon_RegisterIcolib("Reminder", LPGEN("Reminder (UInfoEx)"), ICO_COMMON_ANNIVERSARY); + } /** -- cgit v1.2.3