diff options
| author | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
| commit | 69409021aced78b31da0c9f2def7332a4c4b973e (patch) | |
| tree | 3d9a6607f042acb8d44ece5f3fb08a4125a94e45 /plugins/NewXstatusNotify/src | |
| parent | e09448dd03e3647717166e92ee818e395041993a (diff) | |
Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng"
This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.
Diffstat (limited to 'plugins/NewXstatusNotify/src')
| -rw-r--r-- | plugins/NewXstatusNotify/src/indsnd.cpp | 6 | ||||
| -rw-r--r-- | plugins/NewXstatusNotify/src/main.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index 6c7d5e9ee5..8d5a27e7b1 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -35,13 +35,13 @@ void PreviewSound(HWND hList) ListView_GetItemText(hList, lvi.iItem, 1, buff, _countof(buff));
if (!mir_wstrcmp(buff, TranslateW(DEFAULT_SOUND))) {
if (hlpStatus < ID_STATUS_MIN)
- Skin_PlaySound(StatusListEx[hlpStatus].lpzSkinSoundName);
+ SkinPlaySound(StatusListEx[hlpStatus].lpzSkinSoundName);
else
- Skin_PlaySound(StatusList[Index(hlpStatus)].lpzSkinSoundName);
+ SkinPlaySound(StatusList[Index(hlpStatus)].lpzSkinSoundName);
}
else {
PathToAbsoluteW(buff, stzSoundPath);
- Skin_PlaySoundFile(stzSoundPath);
+ SkinPlaySoundFile(stzSoundPath);
}
}
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index fa54d48e23..aca8e1d4fd 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -334,13 +334,13 @@ void PlayChangeSound(MCONTACT hContact, const char *name) //Now make path to IndSound absolute, as it isn't registered
wchar_t stzSoundPath[MAX_PATH];
PathToAbsoluteW(stzSoundFile, stzSoundPath);
- Skin_PlaySoundFile(stzSoundPath);
+ SkinPlaySoundFile(stzSoundPath);
return;
}
}
if (db_get_b(0, "SkinSoundsOff", name, 0) == 0)
- Skin_PlaySound(name);
+ SkinPlaySound(name);
}
int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
@@ -1104,10 +1104,10 @@ void InitIcolib() void InitSound()
{
for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++)
- Skin_AddSound(StatusList[Index(i)].lpzSkinSoundName, LPGENW("Status Notify"), StatusList[Index(i)].lpzSkinSoundDesc);
+ SkinAddNewSoundExW(StatusList[Index(i)].lpzSkinSoundName, LPGENW("Status Notify"), StatusList[Index(i)].lpzSkinSoundDesc);
for (int i = 0; i <= ID_STATUSEX_MAX; i++)
- Skin_AddSound(StatusListEx[i].lpzSkinSoundName, LPGENW("Status Notify"), StatusListEx[i].lpzSkinSoundDesc);
+ SkinAddNewSoundExW(StatusListEx[i].lpzSkinSoundName, LPGENW("Status Notify"), StatusListEx[i].lpzSkinSoundDesc);
}
int InitTopToolbar(WPARAM, LPARAM)
|