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/Alarms/src/alarm_win.cpp | 2 +- plugins/Alarms/src/alarmlist.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Alarms/src') diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index f00893fbc9..d419884193 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -178,7 +178,7 @@ INT_PTR CALLBACK DlgProcAlarm(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar if (data->sound_num <= 3) { char buff[128]; mir_snprintf(buff, "Triggered%d", data->sound_num); - Skin_PlaySound(buff); + SkinPlaySound(buff); } else if (data->sound_num == 4) { if (data->szTitle != NULL && data->szTitle[0] != '\0') { diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index a8c04b7d42..254e5119fd 100755 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -648,7 +648,7 @@ void DoAlarm(ALARM *alarm) if (alarm->sound_num > 0 && alarm->sound_num <= 3) { char buff[128]; mir_snprintf(buff, "Triggered%d", alarm->sound_num); - Skin_PlaySound(buff); + SkinPlaySound(buff); } else if (alarm->sound_num == 4) { if (alarm->szTitle != NULL && alarm->szTitle[0] != '\0') { @@ -779,9 +779,9 @@ int IdleChanged(WPARAM, LPARAM lParam) void InitList() { - Skin_AddSound("Triggered1", LPGENW("Alarms"), LPGENW("Alert 1")); - Skin_AddSound("Triggered2", LPGENW("Alarms"), LPGENW("Alert 2")); - Skin_AddSound("Triggered3", LPGENW("Alarms"), LPGENW("Alert 3")); + SkinAddNewSoundEx("Triggered1", LPGEN("Alarms"), LPGEN("Alert 1")); + SkinAddNewSoundEx("Triggered2", LPGEN("Alarms"), LPGEN("Alert 2")); + SkinAddNewSoundEx("Triggered3", LPGEN("Alarms"), LPGEN("Alert 3")); // load last checked time DBVARIANT dbv; -- cgit v1.2.3