Core: SkinAddNewSound removed and replaced by SkinAddNewSoundEx

git-svn-id: http://svn.miranda-ng.org/main/trunk@15788 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 13 insertions, 15 deletions

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index b276d21bc7..d695488cbe 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -219,8 +219,8 @@ extern "C" __declspec(dllexport) int Load(void)
 	CreateServiceFunction(MS_CONTACTS_RECEIVE, ServiceReceiveCommand);

 

 	//define event sounds

-	SkinAddNewSound("RecvContacts", LPGEN("Incoming Contacts"), "contacts.wav");

-	SkinAddNewSound("SentContacts", LPGEN("Outgoing Contacts"), "ocontacts.wav");

+	SkinAddNewSoundEx("RecvContacts", LPGEN("Incoming Contacts"), LPGEN("Events"), "contacts.wav");

+	SkinAddNewSoundEx("SentContacts", LPGEN("Outgoing Contacts"), LPGEN("Events"), "ocontacts.wav");

 	return 0;

 }

 

diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp
index 73a143fbc3..c4cc057978 100644
--- a/plugins/Ping/src/ping.cpp
+++ b/plugins/Ping/src/ping.cpp
@@ -144,8 +144,8 @@ extern "C" __declspec(dllexport) int Load(void)
 

 	LoadOptions();

 

-	SkinAddNewSound("PingTimeout", "Ping Timeout", 0);

-	SkinAddNewSound("PingReply", "Ping Reply", 0);

+	SkinAddNewSoundEx("PingTimeout", LPGEN("Timeout"), LPGEN("Ping"));

+	SkinAddNewSoundEx("PingReply", LPGEN("Reply"), LPGEN("Ping"));

 

 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

 

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 77094f61f1..7bfafb983d 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -209,8 +209,8 @@ static int onModulesLoaded(WPARAM, LPARAM)
 	loadContactList();

 

 	// add new skin sound

-	SkinAddNewSound("IncomingSecureMessage", LPGEN("Incoming Secure Message"), "Sounds\\iSecureMessage.wav");

-	SkinAddNewSound("OutgoingSecureMessage", LPGEN("Outgoing Secure Message"), "Sounds\\oSecureMessage.wav");

+	SkinAddNewSoundEx("IncomingSecureMessage", LPGEN("Incoming Secure Message"), LPGEN("SecureIM"), "Sounds\\iSecureMessage.wav");

+	SkinAddNewSoundEx("OutgoingSecureMessage", LPGEN("Outgoing Secure Message"), LPGEN("SecureIM"), "Sounds\\oSecureMessage.wav");

 

 	// init extra icons

 	for (int i = 0; i < _countof(g_IEC); i++)

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index cf5aa7d4dc..64752a8759 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -138,12 +138,12 @@ int CTooltipNotify::ModulesLoaded(WPARAM, LPARAM)
 		db_set_b(NULL, MODULENAME, "firstrun", 0);

 	}

 

-	// register fonts

-	SkinAddNewSound(SND_ONLINE, LPGEN("Tooltip Notify: Online"), "online.wav");

-	SkinAddNewSound(SND_OFFLINE, LPGEN("Tooltip Notify: Offline"), "offline.wav");

-	SkinAddNewSound(SND_OTHER, LPGEN("Tooltip Notify: Other"), "other.wav");

-	SkinAddNewSound(SND_TYPING, LPGEN("Tooltip Notify: Typing"), "typing.wav");

+	SkinAddNewSoundEx(SND_ONLINE, LPGEN("Online"), LPGEN("Tooltip Notify"), "online.wav");

+	SkinAddNewSoundEx(SND_OFFLINE, LPGEN("Offline"), LPGEN("Tooltip Notify"), "offline.wav");

+	SkinAddNewSoundEx(SND_OTHER, LPGEN("Other"), LPGEN("Tooltip Notify"), "other.wav");

+	SkinAddNewSoundEx(SND_TYPING, LPGEN("Typing"), LPGEN("Tooltip Notify"), "typing.wav");

 

+	// register fonts

 	RegisterFonts();

 

 	return 0;

@@ -834,10 +834,8 @@ TCHAR* CTooltipNotify::MakeTooltipString(MCONTACT hContact, int iStatus, TCHAR *
 	const TCHAR *szFormatString = m_sOptions.bPrefixProto ? _T("%s%s%s") : _T("%.0s%.0s%s");

 	const TCHAR* szIs = TranslateT("is");

 

-	const char* szProto =

-		hContact == 0 ? "Proto" : (char*)::GetContactProto(hContact);

-	const TCHAR* szContactName =

-		(TCHAR *)::pcli->pfnGetContactDisplayName(hContact, 0);

+	const char* szProto = hContact == 0 ? "Proto" : ::GetContactProto(hContact);

+	const TCHAR* szContactName = ::pcli->pfnGetContactDisplayName(hContact, 0);

 

 	memset(szString, 0, iBufSize*sizeof(TCHAR));