Tox: audio support pt.3

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

1 files changed, 6 insertions, 4 deletions

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 8d75753713..6fc1dc9c9c 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -6,9 +6,9 @@ struct CToxProto : public PROTO<CToxProto>
 	friend CToxPasswordEditor;

 	friend CToxOptionsMain;

 	friend CToxOptionsNodeList;

+	friend CToxAudioCall;

 

 public:

-

 	//////////////////////////////////////////////////////////////////////////////////////

 	//Ctors

 

@@ -241,8 +241,12 @@ private:
 	void OnGotFriendAvatarInfo(FileTransferParam *transfer, const uint8_t *hash);

 

 	// multimedia

-	std::map<int, int> calls;

+	HANDLE hAudioDialogs;

+	std::map<MCONTACT, int> calls;

+	

 	static void OnFriendAudio(void *agent, int32_t callId, const int16_t *PCM, uint16_t size, void *arg);

+	INT_PTR __cdecl OnRecvAudioCall(WPARAM wParam, LPARAM lParam);

+	INT_PTR __cdecl OnAudioRing(WPARAM hContact, LPARAM lParam);

 

 	static void OnAvInvite(void*, int32_t callId, void *arg);

 	static void OnAvRinging(void*, int32_t callId, void *arg);

@@ -254,8 +258,6 @@ private:
 	static void OnAvRequestTimeout(void*, int32_t callId, void *arg);

 	static void OnAvPeerTimeout(void*, int32_t callId, void *arg);

 

-	INT_PTR __cdecl OnRecvAudioCall(WPARAM wParam, LPARAM lParam);

-

 	// utils

 	TOX_USER_STATUS MirandaToToxStatus(int status);

 	int ToxToMirandaStatus(TOX_USER_STATUS userstatus);