diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Tox/src/tox_core.cpp | 7 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_menus.cpp | 18 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_menus.h | 1 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_multimedia.cpp | 301 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_multimedia.h | 39 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_proto.h | 15 |
6 files changed, 313 insertions, 68 deletions
diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index 769383c9cb..36b53f8c19 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -67,11 +67,8 @@ bool CToxProto::InitToxCore() toxav_register_callstate_callback(toxAv, OnAvCancel, av_OnCancel, this);
toxav_register_callstate_callback(toxAv, OnAvReject, av_OnReject, this);
toxav_register_callstate_callback(toxAv, OnAvEnd, av_OnEnd, this);
- toxav_register_callstate_callback(toxAv, OnAvRinging, av_OnRinging, this);
- toxav_register_callstate_callback(toxAv, OnAvCsChange, av_OnPeerCSChange, this);
- toxav_register_callstate_callback(toxAv, OnAvCsChange, av_OnSelfCSChange, this);
- toxav_register_callstate_callback(toxAv, OnAvRequestTimeout, av_OnRequestTimeout, this);
- toxav_register_callstate_callback(toxAv, OnAvPeerTimeout, av_OnPeerTimeout, this);
+ toxav_register_callstate_callback(toxAv, OnAvTimeout, av_OnRequestTimeout, this);
+ //toxav_register_callstate_callback(toxAv, OnAvTimeout, av_OnPeerTimeout, this);
uint8_t data[TOX_ADDRESS_SIZE];
tox_self_get_address(tox, data);
diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index 9b6cc1b875..10f3316bdf 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -23,6 +23,8 @@ int CToxProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) Menu_ShowItem(ContactMenuItems[CMI_AUTH_REQUEST], isCtrlPressed || isAuthNeed);
Menu_ShowItem(ContactMenuItems[CMI_AUTH_GRANT], isCtrlPressed || isGrantNeed);
+ Menu_ShowItem(ContactMenuItems[CMI_AUDIO_CALL], TRUE);
+
return 0;
}
@@ -58,6 +60,22 @@ void CToxProto::InitMenus() mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);
ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnGrantAuth>);
+
+ // Grant authorization
+ mi.pszService = MODULE"/GrantAuth";
+ mi.ptszName = LPGENT("Grant authorization");
+ mi.position = CMI_POSITION + CMI_AUTH_GRANT;
+ mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);
+ ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
+ CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnGrantAuth>);
+
+ // Start audio call
+ mi.pszService = MODULE"/Audio/Call";
+ mi.ptszName = LPGENT("Audio call");
+ mi.position = CMI_POSITION + CMI_AUDIO_CALL;
+ mi.icolibItem = GetIconHandle("audio_start");
+ ContactMenuItems[CMI_AUDIO_CALL] = Menu_AddContactMenuItem(&mi);
+ CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnSendAudioCall>);
}
void CToxProto::UninitMenus()
diff --git a/protocols/Tox/src/tox_menus.h b/protocols/Tox/src/tox_menus.h index 0becb02269..f4930265a2 100644 --- a/protocols/Tox/src/tox_menus.h +++ b/protocols/Tox/src/tox_menus.h @@ -7,6 +7,7 @@ enum CMI_MENU_ITEMS {
CMI_AUTH_REQUEST,
CMI_AUTH_GRANT,
+ CMI_AUDIO_CALL,
CMI_MAX // this item shall be the last one
};
diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp index abe371a409..e33ed69487 100644 --- a/protocols/Tox/src/tox_multimedia.cpp +++ b/protocols/Tox/src/tox_multimedia.cpp @@ -2,58 +2,161 @@ /* AUDIO RECEIVING */
-CToxAudioCall::CToxAudioCall(CToxProto *proto, int callId) :
-CToxDlgBase(proto, IDD_AUDIO, false), callId(callId),
-ok(this, IDOK), cancel(this, IDCANCEL)
+CToxAudioCall::CToxAudioCall(CToxProto *proto, MCONTACT hContact) :
+ CToxDlgBase(proto, IDD_AUDIO, false),
+ hContact(hContact), isCallStarted(false),
+ ok(this, IDOK), cancel(this, IDCANCEL)
{
m_autoClose = CLOSE_ON_CANCEL;
ok.OnClick = Callback(this, &CToxAudioCall::OnOk);
cancel.OnClick = Callback(this, &CToxAudioCall::OnCancel);
}
-void CToxAudioCall::OnInitDialog()
+void CToxAudioCall::SetIcon(const char *name)
{
char iconName[100];
- mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "audio_start");
+ mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);
SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(iconName, 16));
SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(iconName, 32));
+}
+void CToxAudioCall::OnInitDialog()
+{
Utils_RestoreWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "AudioCallWindow");
}
-void CToxAudioCall::OnOk(CCtrlBase*)
+void CToxAudioCall::OnClose()
+{
+ WindowList_Remove(m_proto->hAudioDialogs, m_hwnd);
+ Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "AudioCallWindow");
+}
+
+INT_PTR CToxAudioCall::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ if (msg == WM_AUDIO_END)
+ if (wParam == hContact)
+ Close();
+
+ return CToxDlgBase::DlgProc(msg, wParam, lParam);
+}
+
+void CToxAudioCall::OnStartCall()
{
ok.Enable(FALSE);
- ToxAvCSettings cSettings;// = av_DefaultSettings;
- //cSettings.call_type = av_TypeAudio;
- toxav_get_peer_csettings(m_proto->toxAv, callId, 0, &cSettings);
+ isCallStarted = true;
+ SetIcon("audio_start");
+}
+
+//
+
+ToxAvCSettings* CToxProto::GetAudioCSettings()
+{
+ ToxAvCSettings *cSettings = (ToxAvCSettings*)mir_calloc(sizeof(ToxAvCSettings));
+
+ DWORD deviceId = getDword("AudioInputDeviceID", TOX_ERROR);
+ if (deviceId == TOX_ERROR)
+ {
+ debugLogA(__FUNCTION__": failed to get input device id");
+ mir_free(cSettings);
+ return NULL;
+ }
+
+ WAVEINCAPS wic;
+ if (waveInGetDevCaps(deviceId, &wic, sizeof(WAVEINCAPS)) != MMSYSERR_NOERROR)
+ {
+ debugLogA(__FUNCTION__": failed to get input device caps");
+ mir_free(cSettings);
+ return NULL;
+ }
+
+ cSettings->audio_channels = wic.wChannels;
+ if ((wic.dwFormats & WAVE_FORMAT_96S16) || (wic.dwFormats & WAVE_FORMAT_96M16))
+ {
+ cSettings->audio_bitrate = 16 * 1000;
+ cSettings->audio_sample_rate = 96000;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_96S08) || (wic.dwFormats & WAVE_FORMAT_96M08))
+ {
+ cSettings->audio_bitrate = 8 * 1000;
+ cSettings->audio_sample_rate = 96000;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_4S16) || (wic.dwFormats & WAVE_FORMAT_4M16))
+ {
+ cSettings->audio_bitrate = 16 * 1000;
+ cSettings->audio_sample_rate = 44100;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_4S08) || (wic.dwFormats & WAVE_FORMAT_4S08))
+ {
+ cSettings->audio_bitrate = 8 * 1000;
+ cSettings->audio_sample_rate = 44100;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_2M16) || (wic.dwFormats & WAVE_FORMAT_2S16))
+ {
+ cSettings->audio_bitrate = 16 * 1000;
+ cSettings->audio_sample_rate = 22050;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_2M08) || (wic.dwFormats & WAVE_FORMAT_2S08))
+ {
+ cSettings->audio_bitrate = 8 * 1000;
+ cSettings->audio_sample_rate = 22050;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_1M16) || (wic.dwFormats & WAVE_FORMAT_1S16))
+ {
+ cSettings->audio_bitrate = 16 * 1000;
+ cSettings->audio_sample_rate = 11025;
+ }
+ else if ((wic.dwFormats & WAVE_FORMAT_1M08) || (wic.dwFormats & WAVE_FORMAT_1S08))
+ {
+ cSettings->audio_bitrate = 8 * 1000;
+ cSettings->audio_sample_rate = 11025;
+ }
+ else + { + debugLogA(__FUNCTION__": failed to get input device caps"); + mir_free(cSettings); + return NULL;
+ }
- toxav_answer(m_proto->toxAv, callId, &cSettings);
+ return cSettings;
}
-void CToxAudioCall::OnCancel(CCtrlBase*)
+// incoming call flow
+
+CToxIncomingAudioCall::CToxIncomingAudioCall(CToxProto *proto, MCONTACT hContact) :
+ CToxAudioCall(proto, hContact)
{
- if (ok.Enabled())
- toxav_reject(m_proto->toxAv, callId, NULL);
- else
- toxav_stop_call(m_proto->toxAv, callId);
}
-void CToxAudioCall::OnClose()
+void CToxIncomingAudioCall::OnInitDialog()
{
- WindowList_Remove(m_proto->hAudioDialogs, m_hwnd);
- Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "AudioCallWindow");
+ SetIcon("audio_ring");
+ CToxAudioCall::OnInitDialog();
}
-INT_PTR CToxAudioCall::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
+void CToxIncomingAudioCall::OnOk(CCtrlBase*)
{
- if (msg == WM_AUDIO_END)
+ ToxAvCSettings *cSettings = m_proto->GetAudioCSettings();
+ if (cSettings == NULL)
+ {
Close();
+ return;
+ }
- return CToxDlgBase::DlgProc(msg, wParam, lParam);
+ if (toxav_answer(m_proto->toxAv, m_proto->calls[hContact], cSettings) == TOX_ERROR)
+ {
+ m_proto->debugLogA(__FUNCTION__": failed to start incoming audio call");
+ Close();
+ }
+}
+
+void CToxIncomingAudioCall::OnCancel(CCtrlBase*)
+{
+ if (!isCallStarted)
+ toxav_reject(m_proto->toxAv, m_proto->calls[hContact], NULL);
+ else
+ toxav_stop_call(m_proto->toxAv, m_proto->calls[hContact]);
}
-// incoming call flow
void CToxProto::OnAvInvite(void*, int32_t callId, void *arg)
{
CToxProto *proto = (CToxProto*)arg;
@@ -133,19 +236,17 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam) }
//
-INT_PTR CToxProto::OnAudioRing(WPARAM hContact, LPARAM lParam)
+INT_PTR CToxProto::OnAudioRing(WPARAM wParam, LPARAM lParam)
{
- CToxAudioCall *audioCall = new CToxAudioCall(this, calls[hContact]);
+ CLISTEVENT *cle = (CLISTEVENT*)lParam;
+ CToxAudioCall *audioCall = new CToxIncomingAudioCall(this, cle->hContact);
audioCall->Show();
- WindowList_Add(hAudioDialogs, audioCall->GetHwnd(), hContact);
- return 0;
-}
+ WindowList_Add(hAudioDialogs, audioCall->GetHwnd(), cle->hContact);
-void CToxProto::OnAvRinging(void*, int32_t callId, void *arg)
-{
+ return 0;
}
-void CToxProto::OnAvStart(void*, int32_t callId, void *arg)
+void CToxProto::OnAvCancel(void*, int32_t callId, void *arg)
{
CToxProto *proto = (CToxProto*)arg;
@@ -165,24 +266,80 @@ void CToxProto::OnAvStart(void*, int32_t callId, void *arg) return;
}
+ CLISTEVENT *cle = (CLISTEVENT*)CallService(MS_CLIST_GETEVENT, hContact, 0);
+ if (cle)
+ CallService(MS_CLIST_REMOVEEVENT, hContact, cle->hDbEvent);
+
DBEVENTINFO dbei = { sizeof(dbei) };
dbei.szModule = proto->m_szModuleName;
dbei.timestamp = time(NULL);
dbei.flags = DBEF_UTF;
- dbei.eventType = DB_EVENT_AUDIO_START;
- dbei.pBlob = (PBYTE)mir_utf8encodeT(TranslateT("Audio call start"));;
+ dbei.eventType = DB_EVENT_AUDIO_END;
+ dbei.pBlob = (PBYTE)mir_utf8encodeT(TranslateT("Audio call end"));;
dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob) + 1;
db_event_add(hContact, &dbei);
- if (toxav_prepare_transmission(proto->toxAv, callId, false) == TOX_ERROR)
+ WindowList_Broadcast(proto->hAudioDialogs, WM_AUDIO_END, hContact, 0);
+}
+
+/* AUDIO SENDING */
+
+// outcoming audio flow
+CToxOutcomingAudioCall::CToxOutcomingAudioCall(CToxProto *proto, MCONTACT hContact) :
+ CToxAudioCall(proto, hContact)
+{
+}
+
+void CToxOutcomingAudioCall::OnInitDialog()
+{
+ SetIcon("audio_end");
+ CToxAudioCall::OnInitDialog();
+}
+
+void CToxOutcomingAudioCall::OnOk(CCtrlBase*)
+{
+ int32_t callId;
+ int friendNumber = m_proto->GetToxFriendNumber(hContact);
+ if (friendNumber == UINT32_MAX)
{
- proto->debugLogA(__FUNCTION__": failed to prepare transmition");
- toxav_stop_call(proto->toxAv, callId);
+ Close();
return;
}
+
+ ToxAvCSettings *cSettings = m_proto->GetAudioCSettings();
+ if (cSettings == NULL)
+ {
+ Close();
+ return;
+ }
+
+ if (toxav_call(m_proto->toxAv, &callId, friendNumber, cSettings, 10) == TOX_ERROR)
+ {
+ m_proto->debugLogA(__FUNCTION__": failed to start outcoming audio call");
+ return;
+ }
+ m_proto->calls[hContact] = callId;
+ SetIcon("audio_call");
}
-void CToxProto::OnAvEnd(void*, int32_t callId, void *arg)
+void CToxOutcomingAudioCall::OnCancel(CCtrlBase*)
+{
+ if (!isCallStarted)
+ toxav_cancel(m_proto->toxAv, m_proto->calls[hContact], 0, NULL);
+ else
+ toxav_stop_call(m_proto->toxAv, m_proto->calls[hContact]);
+}
+
+INT_PTR CToxProto::OnSendAudioCall(WPARAM hContact, LPARAM)
+{
+ CToxAudioCall *audioCall = new CToxOutcomingAudioCall(this, hContact);
+ audioCall->Show();
+ WindowList_Add(hAudioDialogs, audioCall->GetHwnd(), hContact);
+
+ return 0;
+}
+
+void CToxProto::OnAvReject(void*, int32_t callId, void *arg)
{
CToxProto *proto = (CToxProto*)arg;
@@ -211,10 +368,10 @@ void CToxProto::OnAvEnd(void*, int32_t callId, void *arg) dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob) + 1;
db_event_add(hContact, &dbei);
- WindowList_Broadcast(proto->hAudioDialogs, WM_AUDIO_END, 0, 0);
+ WindowList_Broadcast(proto->hAudioDialogs, WM_AUDIO_END, hContact, 0);
}
-void CToxProto::OnAvReject(void*, int32_t callId, void *arg)
+void CToxProto::OnAvTimeout(void*, int32_t callId, void *arg)
{
CToxProto *proto = (CToxProto*)arg;
@@ -242,9 +399,54 @@ void CToxProto::OnAvReject(void*, int32_t callId, void *arg) dbei.pBlob = (PBYTE)mir_utf8encodeT(TranslateT("Audio call end"));;
dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob) + 1;
db_event_add(hContact, &dbei);
+
+ WindowList_Broadcast(proto->hAudioDialogs, WM_AUDIO_END, hContact, 0);
}
-void CToxProto::OnAvCancel(void*, int32_t callId, void *arg)
+/* --- */
+
+void CToxProto::OnAvStart(void*, int32_t callId, void *arg)
+{
+ CToxProto *proto = (CToxProto*)arg;
+
+ int friendNumber = toxav_get_peer_id(proto->toxAv, callId, 0);
+ if (friendNumber == TOX_ERROR)
+ {
+ proto->debugLogA(__FUNCTION__": failed to get friend number");
+ toxav_stop_call(proto->toxAv, callId);
+ return;
+ }
+
+ MCONTACT hContact = proto->GetContact(friendNumber);
+ if (hContact == NULL)
+ {
+ proto->debugLogA(__FUNCTION__": failed to get contact");
+ toxav_stop_call(proto->toxAv, callId);
+ return;
+ }
+
+ HWND hwnd = WindowList_Find(proto->hAudioDialogs, hContact);
+ CToxAudioCall *audioCall = (CToxAudioCall*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+ audioCall->OnStartCall();
+
+ DBEVENTINFO dbei = { sizeof(dbei) };
+ dbei.szModule = proto->m_szModuleName;
+ dbei.timestamp = time(NULL);
+ dbei.flags = DBEF_UTF;
+ dbei.eventType = DB_EVENT_AUDIO_START;
+ dbei.pBlob = (PBYTE)mir_utf8encodeT(TranslateT("Audio call start"));;
+ dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob) + 1;
+ db_event_add(hContact, &dbei);
+
+ if (toxav_prepare_transmission(proto->toxAv, callId, false) == TOX_ERROR)
+ {
+ proto->debugLogA(__FUNCTION__": failed to prepare transmition");
+ toxav_stop_call(proto->toxAv, callId);
+ return;
+ }
+}
+
+void CToxProto::OnAvEnd(void*, int32_t callId, void *arg)
{
CToxProto *proto = (CToxProto*)arg;
@@ -273,12 +475,10 @@ void CToxProto::OnAvCancel(void*, int32_t callId, void *arg) dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob) + 1;
db_event_add(hContact, &dbei);
- WindowList_Broadcast(proto->hAudioDialogs, WM_AUDIO_END, 0, 0);
+ WindowList_Broadcast(proto->hAudioDialogs, WM_AUDIO_END, hContact, 0);
}
-void CToxProto::OnAvCsChange(void*, int32_t callId, void *arg) { }
-void CToxProto::OnAvRequestTimeout(void*, int32_t callId, void *arg) { }
-void CToxProto::OnAvPeerTimeout(void*, int32_t callId, void *arg) { }
+//////
void CToxProto::OnFriendAudio(void*, int32_t callId, const int16_t *PCM, uint16_t size, void *arg)
{
@@ -289,14 +489,12 @@ void CToxProto::OnFriendAudio(void*, int32_t callId, const int16_t *PCM, uint16_ if (err != av_ErrorNone)
{
proto->debugLogA(__FUNCTION__": failed to get codec settings");
- toxav_stop_call(proto->toxAv, callId);
return;
}
if (dest.call_type != av_TypeAudio)
{
proto->debugLogA(__FUNCTION__": failed to play video");
- toxav_stop_call(proto->toxAv, callId);
return;
}
@@ -320,28 +518,27 @@ void CToxProto::OnFriendAudio(void*, int32_t callId, const int16_t *PCM, uint16_ MMRESULT result = waveOutOpen(&hDevice, deviceId, &wfx, 0, 0, CALLBACK_NULL);
if (result != MMSYSERR_NOERROR)
{
- proto->debugLogA(__FUNCTION__": failed to open audio device");
- toxav_stop_call(proto->toxAv, callId);
+ proto->debugLogA(__FUNCTION__": failed to open audio device (%d)", result);
return;
}
WAVEHDR header = { 0 };
header.lpData = (LPSTR)PCM;
- header.dwBufferLength = size;
+ header.dwBufferLength = size * 2 * 5;
+
+ waveOutSetVolume(hDevice, 0xFFFF);
result = waveOutPrepareHeader(hDevice, &header, sizeof(WAVEHDR));
if (result != MMSYSERR_NOERROR)
{
- proto->debugLogA(__FUNCTION__": failed to prepare audio device header");
- toxav_stop_call(proto->toxAv, callId);
+ proto->debugLogA(__FUNCTION__": failed to prepare audio device header (%d)", result);
return;
}
result = waveOutWrite(hDevice, &header, sizeof(WAVEHDR));
if (result != MMSYSERR_NOERROR)
{
- proto->debugLogA(__FUNCTION__": failed to write to audio device");
- toxav_stop_call(proto->toxAv, callId);
+ proto->debugLogA(__FUNCTION__": failed to write to audio device (%d)", result);
return;
}
diff --git a/protocols/Tox/src/tox_multimedia.h b/protocols/Tox/src/tox_multimedia.h index 3dd5ad475b..5145bc3539 100644 --- a/protocols/Tox/src/tox_multimedia.h +++ b/protocols/Tox/src/tox_multimedia.h @@ -3,22 +3,51 @@ class CToxAudioCall : public CToxDlgBase
{
-private:
- int callId;
+protected:
+ MCONTACT hContact;
+ bool isCallStarted;
CCtrlButton ok;
CCtrlButton cancel;
+ void SetIcon(const char *name);
+
+ virtual void OnInitDialog();
+ void OnClose();
+
+ virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam);
+
+ virtual void OnOk(CCtrlBase*) = 0;
+ virtual void OnCancel(CCtrlBase*) = 0;
+
+public:
+ CToxAudioCall(CToxProto *proto, MCONTACT hContact);
+
+ void OnStartCall();
+};
+
+class CToxIncomingAudioCall : public CToxAudioCall
+{
protected:
void OnInitDialog();
+
void OnOk(CCtrlBase*);
void OnCancel(CCtrlBase*);
- void OnClose();
- INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam);
+public:
+ CToxIncomingAudioCall(CToxProto *proto, MCONTACT hContact);
+};
+
+class CToxOutcomingAudioCall : public CToxAudioCall
+{
+protected:
+ void OnInitDialog();
+
+ void OnOk(CCtrlBase*);
+ void OnCancel(CCtrlBase*);
public:
- CToxAudioCall(CToxProto *proto, int callId);
+ CToxOutcomingAudioCall(CToxProto *proto, MCONTACT hContact);
};
#endif //_TOX_MULTIMEDIA_H_
\ No newline at end of file diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index c6c953a8b2..5919b97f84 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -7,6 +7,8 @@ struct CToxProto : public PROTO<CToxProto> friend CToxOptionsMain;
friend CToxOptionsNodeList;
friend CToxAudioCall;
+ friend CToxIncomingAudioCall;
+ friend CToxOutcomingAudioCall;
public:
//////////////////////////////////////////////////////////////////////////////////////
@@ -241,21 +243,22 @@ private: // multimedia
HANDLE hAudioDialogs;
- std::map<MCONTACT, int> calls;
+ std::map<MCONTACT, int32_t> calls;
+
+ 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 hContact, 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 OnAvRinging(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 OnAvCsChange(void*, int32_t callId, void *arg);
- static void OnAvRequestTimeout(void*, int32_t callId, void *arg);
- static void OnAvPeerTimeout(void*, int32_t callId, void *arg);
+ static void OnAvTimeout(void*, int32_t callId, void *arg);
// utils
TOX_USER_STATUS MirandaToToxStatus(int status);
|