Tox: some refactoring

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

1 files changed, 6 insertions, 2 deletions

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 61041a2eb4..37a41138c9 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -221,6 +221,7 @@ private:
 	int __cdecl OnPreCreateMessage(WPARAM wParam, LPARAM lParam);

 

 	// transfer

+

 	HANDLE OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath);

 	int OnFileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename);

 	int OnFileCancel(MCONTACT hContact, HANDLE hTransfer);

@@ -228,10 +229,12 @@ private:
 

 	static void OnFileRequest(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, TOX_FILE_CONTROL control, void *arg);

 	static void OnFriendFile(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, uint32_t kind, uint64_t fileSize, const uint8_t *fileName, size_t filenameLength, void *arg);

-	static void OnFileReceiveData(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, uint64_t position, const uint8_t *data, size_t length, void *arg);

+	static void OnDataReceiving(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, uint64_t position, const uint8_t *data, size_t length, void *arg);

 

 	static void OnFileSendData(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, uint64_t position, size_t length, void *arg);

 

+	void OnTransferCompleted(FileTransferParam *transfer);

+

 	// avatars

 	std::tstring GetAvatarFilePath(MCONTACT hContact = NULL);

 	void SetToxAvatar(std::tstring path, bool checkHash = false);

@@ -241,7 +244,8 @@ private:
 	INT_PTR __cdecl GetMyAvatar(WPARAM wParam, LPARAM lParam);

 	INT_PTR __cdecl SetMyAvatar(WPARAM wParam, LPARAM lParam);

 

-	void OnGotFriendAvatarInfo(FileTransferParam *transfer, const uint8_t *hash);

+	void OnGotFriendAvatarInfo(AvatarTransferParam *transfer);

+	void OnGotFriendAvatarData(AvatarTransferParam *transfer);

 

 	// multimedia

 	HANDLE hAudioDialogs;