From 9834746e6a7e5cf04a32273155265bc3a2f57180 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 --- src/core/stdfile/src/file.cpp | 10 +++++----- src/core/stdfile/src/filerecvdlg.cpp | 2 +- src/core/stdfile/src/filexferdlg.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/core/stdfile') diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp index bc68940dd9..3d391dd7a7 100644 --- a/src/core/stdfile/src/file.cpp +++ b/src/core/stdfile/src/file.cpp @@ -105,7 +105,7 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam) CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILERECV), NULL, DlgProcRecvFile, (LPARAM)&cle); } else { - SkinPlaySound("RecvFile"); + Skin_PlaySound("RecvFile"); wchar_t szTooltip[256]; mir_snwprintf(szTooltip, TranslateT("File from %s"), pcli->pfnGetContactDisplayName(hContact, 0)); @@ -443,9 +443,9 @@ int LoadSendRecvFileModule(void) CreateServiceFunction("SRFile/OpenContRecDir", openContRecDir); CreateServiceFunction("SRFile/OpenRecDir", openRecDir); - SkinAddNewSoundEx("RecvFile", LPGEN("File"), LPGEN("Incoming")); - SkinAddNewSoundEx("FileDone", LPGEN("File"), LPGEN("Complete")); - SkinAddNewSoundEx("FileFailed", LPGEN("File"), LPGEN("Error")); - SkinAddNewSoundEx("FileDenied", LPGEN("File"), LPGEN("Denied")); + Skin_AddSound("RecvFile", LPGENW("File"), LPGENW("Incoming")); + Skin_AddSound("FileDone", LPGENW("File"), LPGENW("Complete")); + Skin_AddSound("FileFailed", LPGENW("File"), LPGENW("Error")); + Skin_AddSound("FileDenied", LPGENW("File"), LPGENW("Denied")); return 0; } diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index 7a9edaad87..5f6baa2e04 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -388,7 +388,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l EnableWindow(GetDlgItem(hwndDlg, IDC_FILEDIR), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_FILEDIRBROWSE), FALSE); SetDlgItemText(hwndDlg, IDC_MSG, TranslateT("This file transfer has been canceled by the other side")); - SkinPlaySound("FileDenied"); + Skin_PlaySound("FileDenied"); FlashWindow(hwndDlg, TRUE); } else if (ack->result != ACKRESULT_FILERESUME) diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index ed875004c1..d3499bfcb8 100644 --- a/src/core/stdfile/src/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp @@ -624,16 +624,16 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if (ack->result == ACKRESULT_DENIED) { dat->fs = NULL; /* protocol will free structure */ - SkinPlaySound("FileDenied"); + Skin_PlaySound("FileDenied"); SetFtStatus(hwndDlg, LPGENW("File transfer denied"), FTS_TEXT); } else if (ack->result == ACKRESULT_FAILED) { dat->fs = NULL; /* protocol will free structure */ - SkinPlaySound("FileFailed"); + Skin_PlaySound("FileFailed"); SetFtStatus(hwndDlg, LPGENW("File transfer failed"), FTS_TEXT); } else { - SkinPlaySound("FileDone"); + Skin_PlaySound("FileDone"); if (dat->send) { dat->fs = NULL; /* protocol will free structure */ SetFtStatus(hwndDlg, LPGENW("Transfer completed."), FTS_TEXT); -- cgit v1.2.3