From 340910bcc3aaea0fb48a8679cf93e855b413fdc9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 21 Aug 2017 21:28:58 +0300
Subject: Tox:

- fixes #898 (Tox: usability issues);
- fixes #893 (Tox: failed to connect to DHT);
- massive code cleaning;
---
 protocols/Tox/src/tox_multimedia.cpp | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'protocols/Tox/src/tox_multimedia.cpp')

diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp
index c5c42ac79d..cb8f17fdb9 100644
--- a/protocols/Tox/src/tox_multimedia.cpp
+++ b/protocols/Tox/src/tox_multimedia.cpp
@@ -2,8 +2,7 @@
 
 CToxCallDlgBase::CToxCallDlgBase(CToxProto *proto, int idDialog, MCONTACT hContact) :
 	CToxDlgBase(proto, idDialog, false), hContact(hContact)
-{
-}
+{}
 
 void CToxCallDlgBase::OnInitDialog()
 {
@@ -74,16 +73,14 @@ void CToxIncomingCall::OnAnswer(CCtrlBase*)
 		return;*/
 
 	int friendNumber = m_proto->GetToxFriendNumber(hContact);
-	if (friendNumber == UINT32_MAX)
-	{
+	if (friendNumber == UINT32_MAX) {
 		//mir_free(cSettings);
 		Close();
 		return;
 	}
 
 	TOXAV_ERR_ANSWER error;
-	if (!toxav_answer(m_proto->toxThread->ToxAV(), friendNumber, 0, 0, &error))
-	{
+	if (!toxav_answer(m_proto->toxThread->ToxAV(), friendNumber, 0, 0, &error)) {
 		m_proto->debugLogA(__FUNCTION__": failed to answer the call (%d)", error);
 		Close();
 	}
@@ -130,16 +127,14 @@ void CToxOutgoingCall::OnCall(CCtrlBase*)
 	}*/
 
 	int friendNumber = m_proto->GetToxFriendNumber(hContact);
-	if (friendNumber == UINT32_MAX)
-	{
+	if (friendNumber == UINT32_MAX) {
 		//mir_free(cSettings);
 		Close();
 		return;
 	}
 
 	TOXAV_ERR_CALL error;
-	if (!toxav_call(m_proto->toxThread->ToxAV(), friendNumber, 0, 0, &error))
-	{
+	if (!toxav_call(m_proto->toxThread->ToxAV(), friendNumber, 0, 0, &error)) {
 		//mir_free(cSettings);
 		m_proto->debugLogA(__FUNCTION__": failed to make a call (%d)", error);
 		return;
@@ -161,8 +156,7 @@ void CToxOutgoingCall::OnCall(CCtrlBase*)
 void CToxOutgoingCall::OnCancel(CCtrlBase*)
 {
 	int friendNumber = m_proto->GetToxFriendNumber(hContact);
-	if (friendNumber == UINT32_MAX)
-	{
+	if (friendNumber == UINT32_MAX) {
 		//mir_free(cSettings);
 		Close();
 		return;
@@ -176,8 +170,7 @@ void CToxOutgoingCall::OnCancel(CCtrlBase*)
 
 CToxCallDialog::CToxCallDialog(CToxProto *proto, MCONTACT hContact) :
 	CToxCallDlgBase(proto, IDD_CALL, hContact), end(this, IDCANCEL)
-{
-}
+{}
 
 void CToxCallDialog::OnInitDialog()
 {
@@ -189,8 +182,7 @@ void CToxCallDialog::OnInitDialog()
 void CToxCallDialog::OnClose()
 {
 	int friendNumber = m_proto->GetToxFriendNumber(hContact);
-	if (friendNumber == UINT32_MAX)
-	{
+	if (friendNumber == UINT32_MAX) {
 		//mir_free(cSettings);
 		Close();
 		return;
@@ -327,12 +319,10 @@ void CToxProto::OnFriendCall(ToxAV *toxAV, uint32_t friend_number, bool audio_en
 }
 
 void CToxProto::OnFriendCallState(ToxAV *toxAV, uint32_t friend_number, uint32_t state, void *user_data)
-{
-}
+{}
 
 void CToxProto::OnBitrateChanged(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_rate, void *arg)
-{
-}
+{}
 
 // save event to db
 INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam)
@@ -469,8 +459,7 @@ void CToxProto::OnAvCallTimeout(void*, int32_t callId, void *arg)
 
 static void CALLBACK WaveOutCallback(HWAVEOUT hOutDevice, UINT uMsg, DWORD/* dwInstance*/, DWORD dwParam1, DWORD/* dwParam2*/)
 {
-	if (uMsg == WOM_DONE)
-	{
+	if (uMsg == WOM_DONE) {
 		WAVEHDR *header = (WAVEHDR*)dwParam1;
 		if (header->dwFlags & WHDR_PREPARED)
 			waveOutUnprepareHeader(hOutDevice, header, sizeof(WAVEHDR));
@@ -634,4 +623,4 @@ void CToxProto::OnFriendAudioFrame(ToxAV *toxAV, uint32_t friend_number, const i
 		proto->debugLogA(__FUNCTION__": failed to play audio samples (%d)", error);
 		return;
 	}*/
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3