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 /protocols/Omegle | |
| 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 'protocols/Omegle')
| -rw-r--r-- | protocols/Omegle/src/communication.cpp | 12 | ||||
| -rw-r--r-- | protocols/Omegle/src/proto.cpp | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp index 8e8f69e2cf..32e0d891df 100644 --- a/protocols/Omegle/src/communication.cpp +++ b/protocols/Omegle/src/communication.cpp @@ -555,7 +555,7 @@ bool Omegle_client::events() } else if (name == "typing" || name == "spyTyping") { // Stranger is typing, not supported by chat module yet - Skin_PlaySound("StrangerTyp"); + SkinPlaySound("StrangerTyp"); ptrW who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_wstrdup(L"Stranger")); Srmm_SetStatusText(parent->GetChatHandle(), @@ -564,7 +564,7 @@ bool Omegle_client::events() } else if (name == "stoppedTyping" || name == "spyStoppedTyping") { // Stranger stopped typing, not supported by chat module yet - Skin_PlaySound("StrangerTypStop"); + SkinPlaySound("StrangerTypStop"); ptrW who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_wstrdup(L"Stranger")); Srmm_SetStatusText(parent->GetChatHandle(), @@ -575,7 +575,7 @@ bool Omegle_client::events() Srmm_SetStatusText(parent->GetChatHandle(), nullptr); // Play sound as we received message - Skin_PlaySound("StrangerMessage"); + SkinPlaySound("StrangerMessage"); if (state_ == STATE_ACTIVE) { ptrW msg(json_as_string(json_at(item, 1))); @@ -586,7 +586,7 @@ bool Omegle_client::events() Srmm_SetStatusText(parent->GetChatHandle(), nullptr); // Play sound as we received message - Skin_PlaySound("StrangerMessage"); + SkinPlaySound("StrangerMessage"); if (state_ == STATE_SPY) { ptrW stranger(json_as_string(json_at(item, 1))); @@ -600,7 +600,7 @@ bool Omegle_client::events() // Stranger disconnected if (db_get_b(NULL, parent->m_szModuleName, OMEGLE_KEY_DONT_STOP, 0)) { - Skin_PlaySound("StrangerChange"); + SkinPlaySound("StrangerChange"); parent->NewChat(); } else @@ -618,7 +618,7 @@ bool Omegle_client::events() // Stranger disconnected if (db_get_b(NULL, parent->m_szModuleName, OMEGLE_KEY_DONT_STOP, 0)) { - Skin_PlaySound("StrangerChange"); + SkinPlaySound("StrangerChange"); parent->NewChat(); } else diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index aa46bbc601..3eae533cda 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -57,10 +57,10 @@ PROTO<OmegleProto>(proto_name, username) facy.set_handle(m_hNetlibUser);
- Skin_AddSound("StrangerTyp", m_tszUserName, LPGENW("Stranger is typing"));
- Skin_AddSound("StrangerTypStop", m_tszUserName, LPGENW("Stranger stopped typing"));
- Skin_AddSound("StrangerChange", m_tszUserName, LPGENW("Changing stranger"));
- Skin_AddSound("StrangerMessage", m_tszUserName, LPGENW("Receive message"));
+ SkinAddNewSoundExW("StrangerTyp", m_tszUserName, LPGENW("Stranger is typing"));
+ SkinAddNewSoundExW("StrangerTypStop", m_tszUserName, LPGENW("Stranger stopped typing"));
+ SkinAddNewSoundExW("StrangerChange", m_tszUserName, LPGENW("Changing stranger"));
+ SkinAddNewSoundExW("StrangerMessage", m_tszUserName, LPGENW("Receive message"));
}
OmegleProto::~OmegleProto()
|