diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-11-03 20:23:48 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-11-03 20:23:48 +0000 |
| commit | 63945ebb21dee8bd7ebd7c0144fd4fcdf00feff6 (patch) | |
| tree | 37bd82205fec0af0fae3635313fcf6686435b76e /protocols/Tox/src/tox_proto.h | |
| parent | afeb99849818ec79199eb7af39693fc5a522f017 (diff) | |
Tox: updated tox core
git-svn-id: http://svn.miranda-ng.org/main/trunk@15677 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_proto.h')
| -rw-r--r-- | protocols/Tox/src/tox_proto.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index fcb66f8177..aebf85148e 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -253,21 +253,24 @@ private: HWAVEOUT hOutDevice;
std::map<MCONTACT, int32_t> calls;
- ToxAvCSettings* GetAudioCSettings();
+ //ToxAvCSettings* GetAudioCSettings();
+
- 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 wParam, LPARAM lParam);
INT_PTR __cdecl OnSendAudioCall(WPARAM wParam, LPARAM);
- static void OnAvInvite(void*, int32_t callId, void *arg);
- static void OnAvStart(void*, int32_t callId, void *arg);
- static void OnAvEnd(void*, int32_t callId, void *arg);
- static void OnAvReject(void*, int32_t callId, void *arg);
- static void OnAvCancel(void*, int32_t callId, void *arg);
- static void OnAvCallTimeout(void*, int32_t callId, void *arg);
- static void OnAvPeerTimeout(void*, int32_t callId, void *arg);
+ static void OnFriendCall(ToxAV *toxAV, uint32_t friend_number, bool audio_enabled, bool video_enabled, void *arg);
+ static void OnFriendCallState(ToxAV *toxAV, uint32_t friend_number, uint32_t state, void *user_data);
+ static void OnBitrateChanged(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_rate, void *arg);
+ static void OnFriendAudioFrame(ToxAV *toxAV, uint32_t friend_number, const int16_t *pcm, size_t sample_count, uint8_t channels, uint32_t sampling_rate, void *user_data);
+
+ //static void OnAvEnd(void*, int32_t callId, void *arg);
+ //static void OnAvReject(void*, int32_t callId, void *arg);
+ //static void OnAvCancel(void*, int32_t callId, void *arg);
+ //static void OnAvCallTimeout(void*, int32_t callId, void *arg);
+ //static void OnAvPeerTimeout(void*, int32_t callId, void *arg);
// utils
static int MapStatus(int status);
|