From 7deea6cec5d2173f66d4c2dd75ca0b633b887bc7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 20 May 2018 00:17:30 +0300 Subject: sounds packed into CMPlugin (reduces usage of hLangpack) --- protocols/FacebookRM/src/proto.cpp | 12 ++++++------ protocols/MRA/src/MraProto.cpp | 2 +- protocols/MSN/src/msn_proto.cpp | 4 ++-- protocols/Omegle/src/proto.cpp | 8 ++++---- protocols/SkypeWeb/src/skype_proto.cpp | 4 ++-- protocols/Twitter/src/theme.cpp | 4 ++-- protocols/VKontakte/src/vk_proto.cpp | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'protocols') diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index e1c7f3764a..64127caef8 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -1035,12 +1035,12 @@ void FacebookProto::InitHotkeys() */ void FacebookProto::InitSounds() { - Skin_AddSound("Notification", m_tszUserName, LPGENW("Notification")); - Skin_AddSound("NewsFeed", m_tszUserName, LPGENW("Newsfeed event")); - Skin_AddSound("OtherEvent", m_tszUserName, LPGENW("Other event")); - Skin_AddSound("Friendship", m_tszUserName, LPGENW("Friendship event")); - Skin_AddSound("Ticker", m_tszUserName, LPGENW("Ticker event")); - Skin_AddSound("Memories", m_tszUserName, LPGENW("Memories")); + g_plugin.addSound("Notification", m_tszUserName, LPGENW("Notification")); + g_plugin.addSound("NewsFeed", m_tszUserName, LPGENW("Newsfeed event")); + g_plugin.addSound("OtherEvent", m_tszUserName, LPGENW("Other event")); + g_plugin.addSound("Friendship", m_tszUserName, LPGENW("Friendship event")); + g_plugin.addSound("Ticker", m_tszUserName, LPGENW("Ticker event")); + g_plugin.addSound("Memories", m_tszUserName, LPGENW("Memories")); } /** diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 4edeb5694b..3329a31aa0 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -47,7 +47,7 @@ CMraProto::CMraProto(const char* _module, const wchar_t* _displayName) : InitMenus(); mir_snprintf(szNewMailSound, "%s_new_email", m_szModuleName); - Skin_AddSound(szNewMailSound, m_tszUserName, MRA_SOUND_NEW_EMAIL); + g_plugin.addSound(szNewMailSound, m_tszUserName, MRA_SOUND_NEW_EMAIL); HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CMraProto::MraRebuildStatusMenu); diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 1361d363e0..3b307b07a6 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -113,11 +113,11 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) : mailsoundname = (char*)mir_alloc(64); mir_snprintf(mailsoundname, 64, "%s:Hotmail", m_szModuleName); - Skin_AddSound(mailsoundname, m_tszUserName, LPGENW("Live Mail")); + g_plugin.addSound(mailsoundname, m_tszUserName, LPGENW("Live Mail")); alertsoundname = (char*)mir_alloc(64); mir_snprintf(alertsoundname, 64, "%s:Alerts", m_szModuleName); - Skin_AddSound(alertsoundname, m_tszUserName, LPGENW("Live Alert")); + g_plugin.addSound(alertsoundname, m_tszUserName, LPGENW("Live Alert")); AvatarQueue_Init(); InitCustomFolders(); diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index 37c127f940..5bd7fc668d 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -57,10 +57,10 @@ PROTO(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")); + g_plugin.addSound("StrangerTyp", m_tszUserName, LPGENW("Stranger is typing")); + g_plugin.addSound("StrangerTypStop", m_tszUserName, LPGENW("Stranger stopped typing")); + g_plugin.addSound("StrangerChange", m_tszUserName, LPGENW("Changing stranger")); + g_plugin.addSound("StrangerMessage", m_tszUserName, LPGENW("Receive message")); } OmegleProto::~OmegleProto() diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index fe1b897aa1..416aad562c 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -51,8 +51,8 @@ CSkypeProto::CSkypeProto(const char* protoName, const wchar_t* userName) : CreateDirectoryTreeW(m_tszAvatarFolder.c_str()); //sounds - Skin_AddSound("skype_inc_call", L"SkypeWeb", LPGENW("Incoming call sound")); - Skin_AddSound("skype_call_canceled", L"SkypeWeb", LPGENW("Incoming call canceled sound")); + g_plugin.addSound("skype_inc_call", L"SkypeWeb", LPGENW("Incoming call sound")); + g_plugin.addSound("skype_call_canceled", L"SkypeWeb", LPGENW("Incoming call canceled sound")); SkypeSetTimer(); diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index d30633d1fb..e74d1872be 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -31,8 +31,8 @@ static IconItem iconList[] = void TwitterInitSounds(void) { - Skin_AddSound("TwitterNewContact", LPGENW("Twitter"), LPGENW("First tweet from new contact")); - Skin_AddSound("TwitterNew", LPGENW("Twitter"), LPGENW("New tweet")); + g_plugin.addSound("TwitterNewContact", LPGENW("Twitter"), LPGENW("First tweet from new contact")); + g_plugin.addSound("TwitterNew", LPGENW("Twitter"), LPGENW("New tweet")); } // TODO: uninit diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index e8325d3d41..597825a617 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -108,7 +108,7 @@ void CVkProto::OnModulesLoaded() HookProtoEvent(ME_DB_CONTACT_SETTINGCHANGED, &CVkProto::OnDbSettingChanged); //Sounds - Skin_AddSound("VKNewsFeed", m_tszUserName, LPGENW("VKontakte newsfeed & notification event")); + g_plugin.addSound("VKNewsFeed", m_tszUserName, LPGENW("VKontakte newsfeed & notification event")); InitPopups(); InitMenus(); -- cgit v1.2.3