Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 03:26:45 +02:00
Code Issues Projects Releases Wiki Activity

Implemented video preview and preparations for ToxAV

Browse Source
This commit is contained in:
cnhenry
2015-07-30 01:49:27 -05:00
parent c8ea02376e
commit 9b6efb65de
11 changed files with 447 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/audio_call.c
View File

@ -73,8 +73,6 @@ static int set_call(Call* call, bool start)
return 0;
}
CallControl CallContrl;
void call_cb( ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled, void *user_data );
void callstate_cb( ToxAV *av, uint32_t friend_number, uint32_t state, void *user_data );
void receive_audio_frame_cb( ToxAV *av, uint32_t friend_number,
@ -124,18 +122,19 @@ ToxAV *init_audio(ToxWindow *self, Tox *tox)
CallContrl.audio_channels = 1;
#ifdef VIDEO
if ( !init_video(self, tox, CallContrl.av, &CallContrl) ) {
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to init video");
return NULL;
}
if (CallContrl.video_enabled == true) {
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Video enabled");
}
#else
CallContrl.video_enabled = false;
CallContrl.video_bit_rate = 0;
CallContrl.video_sample_rate = 0;
CallContrl.video_frame_duration = 0;
#endif /* VIDEO */
memset(CallContrl.calls, 0, sizeof(CallContrl.calls));
@ -343,7 +342,6 @@ void callback_recv_invite ( void* av, uint32_t friend_number, void* arg )
windows[i].onInvite(&windows[i], av, friend_number, cc->call_state);
}
}
void callback_recv_ringing ( void* av, uint32_t friend_number, void* arg )
{
//CB_BODY(friend_number, arg, onRinging);
@ -385,7 +383,6 @@ void callback_recv_ending ( void* av, uint32_t friend_number, void* arg )
stop_transmission(&CallContrl.calls[friend_number], friend_number);
}
void callback_call_started ( void* av, uint32_t friend_number, void* arg )
{
CallControl* cc = arg;