mirror of
https://github.com/Tha14/toxic.git
synced 2025-07-03 03:36:45 +02:00
Began conversion of audio code to new ToxAV API
This commit is contained in:
cnhenry
580
src/audio_call.c
580
src/audio_call.c
@ -53,7 +53,7 @@
|
||||
|
||||
#define MAX_CALLS 10
|
||||
|
||||
#define frame_size (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000)
|
||||
#define frame_size (CallContrl.audio_bit_rate * CallContrl.audio_frame_duration / 1000)
|
||||
|
||||
static int set_call(Call* call, bool start)
|
||||
{
|
||||
@ -75,148 +75,211 @@ static int set_call(Call* call, bool start)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct ASettings {
|
||||
typedef struct CallControl {
|
||||
AudioError errors;
|
||||
|
||||
ToxAv *av;
|
||||
|
||||
ToxAvCSettings cs;
|
||||
ToxAV *av;
|
||||
ToxWindow *window;
|
||||
|
||||
Call calls[MAX_CALLS];
|
||||
} ASettins;
|
||||
bool pending_call;
|
||||
uint32_t call_state;
|
||||
|
||||
void callback_recv_invite ( void* av, int32_t call_index, void *arg );
|
||||
void callback_recv_ringing ( void* av, int32_t call_index, void *arg );
|
||||
void callback_recv_starting ( void* av, int32_t call_index, void *arg );
|
||||
void callback_recv_ending ( void* av, int32_t call_index, void *arg );
|
||||
void callback_call_started ( void* av, int32_t call_index, void *arg );
|
||||
void callback_call_canceled ( void* av, int32_t call_index, void *arg );
|
||||
void callback_call_rejected ( void* av, int32_t call_index, void *arg );
|
||||
void callback_call_ended ( void* av, int32_t call_index, void *arg );
|
||||
void callback_requ_timeout ( void* av, int32_t call_index, void *arg );
|
||||
void callback_peer_timeout ( void* av, int32_t call_index, void *arg );
|
||||
void callback_media_change ( void* av, int32_t call_index, void *arg );
|
||||
bool audio_enabled;
|
||||
bool video_enabled;
|
||||
|
||||
void write_device_callback( void* agent, int32_t call_index, const int16_t* PCM, uint16_t size, void* arg );
|
||||
uint32_t audio_bit_rate;
|
||||
uint32_t video_bit_rate;
|
||||
|
||||
uint32_t audio_sample_rate;
|
||||
|
||||
int32_t audio_frame_duration;
|
||||
int32_t video_frame_duration;
|
||||
|
||||
uint8_t audio_channels;
|
||||
|
||||
} CallControl;
|
||||
|
||||
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, int16_t const *pcm, size_t sample_count, uint8_t channels, uint32_t sampling_rate, void *user_data);
|
||||
void audio_bit_rate_status_cb(ToxAV *av, uint32_t friend_number, bool stable, uint32_t bit_rate, void *user_data);
|
||||
void receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
|
||||
uint16_t width, uint16_t height,
|
||||
uint8_t const *y, uint8_t const *u, uint8_t const *v, uint8_t const *a,
|
||||
int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride,
|
||||
void *user_data);
|
||||
void video_bit_rate_status_cb(ToxAV *av, uint32_t friend_number,
|
||||
bool stable, uint32_t bit_rate, void *user_data);
|
||||
|
||||
void callback_recv_invite ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_recv_ringing ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_recv_starting ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_recv_ending ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_call_started ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_call_canceled ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_call_rejected ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_call_ended ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_requ_timeout ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_peer_timeout ( void* av, uint32_t friend_number, void *arg );
|
||||
void callback_media_change ( void* av, uint32_t friend_number, void *arg );
|
||||
|
||||
void write_device_callback( void* agent, int32_t friend_number, const int16_t* PCM, uint16_t size, void* arg );
|
||||
|
||||
static void print_err (ToxWindow *self, const char *error_str)
|
||||
{
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", error_str);
|
||||
}
|
||||
|
||||
ToxAv *init_audio(ToxWindow *self, Tox *tox)
|
||||
ToxAV *init_audio(ToxWindow *self, Tox *tox)
|
||||
{
|
||||
ASettins.cs = av_DefaultSettings;
|
||||
ASettins.cs.max_video_height = ASettins.cs.max_video_width = 0;
|
||||
TOXAV_ERR_NEW error;
|
||||
|
||||
ASettins.errors = ae_None;
|
||||
CallContrl.window = self;
|
||||
|
||||
memset(ASettins.calls, 0, sizeof(ASettins.calls));
|
||||
CallContrl.audio_enabled = true;
|
||||
CallContrl.audio_bit_rate = 48;
|
||||
CallContrl.audio_sample_rate = 48000;
|
||||
CallContrl.audio_frame_duration = 10;
|
||||
CallContrl.audio_channels = 1;
|
||||
|
||||
CallContrl.errors = ae_None;
|
||||
|
||||
memset(CallContrl.calls, 0, sizeof(CallContrl.calls));
|
||||
|
||||
/* Streaming stuff from core */
|
||||
|
||||
ASettins.av = toxav_new(tox, MAX_CALLS);
|
||||
CallContrl.av = toxav_new(tox, &error);
|
||||
|
||||
if ( !ASettins.av ) {
|
||||
ASettins.errors |= ae_StartingCoreAudio;
|
||||
if( error == TOXAV_ERR_NEW_OK) {
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_ERR_NEW_OK");
|
||||
}
|
||||
|
||||
if(tox == toxav_get_tox(CallContrl.av)) {
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Tox instance matches");
|
||||
}
|
||||
|
||||
if ( !CallContrl.av ) {
|
||||
CallContrl.errors |= ae_StartingCoreAudio;
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to init ToxAV");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ( init_devices(ASettins.av) == de_InternalError ) {
|
||||
if ( init_devices(CallContrl.av) == de_InternalError ) {
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to init devices");
|
||||
toxav_kill(ASettins.av);
|
||||
return ASettins.av = NULL;
|
||||
toxav_kill(CallContrl.av);
|
||||
return CallContrl.av = NULL;
|
||||
}
|
||||
|
||||
toxav_register_callstate_callback(ASettins.av, callback_call_started, av_OnStart, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_call_canceled, av_OnCancel, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_call_rejected, av_OnReject, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_call_ended, av_OnEnd, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_recv_invite, av_OnInvite, self);
|
||||
|
||||
/*toxav_register_callstate_callback(CallContrl.av, callback_call_started, av_OnStart, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_call_canceled, av_OnCancel, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_call_rejected, av_OnReject, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_call_ended, av_OnEnd, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_recv_invite, av_OnInvite, self);
|
||||
|
||||
toxav_register_callstate_callback(ASettins.av, callback_recv_ringing, av_OnRinging, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_recv_starting, av_OnStart, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_recv_ending, av_OnEnd, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_recv_ringing, av_OnRinging, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_recv_starting, av_OnStart, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_recv_ending, av_OnEnd, self);
|
||||
|
||||
toxav_register_callstate_callback(ASettins.av, callback_requ_timeout, av_OnRequestTimeout, self);
|
||||
toxav_register_callstate_callback(ASettins.av, callback_peer_timeout, av_OnPeerTimeout, self);
|
||||
//toxav_register_callstate_callback(ASettins.av, callback_media_change, av_OnMediaChange, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_requ_timeout, av_OnRequestTimeout, self);
|
||||
toxav_register_callstate_callback(CallContrl.av, callback_peer_timeout, av_OnPeerTimeout, self);
|
||||
//toxav_register_callstate_callback(CallContrl.av, callback_media_change, av_OnMediaChange, self);
|
||||
|
||||
toxav_register_audio_callback(ASettins.av, write_device_callback, NULL);
|
||||
toxav_register_audio_callback(CallContrl.av, write_device_callback, NULL);
|
||||
*/
|
||||
|
||||
return ASettins.av;
|
||||
toxav_callback_call(CallContrl.av, call_cb, &CallContrl);
|
||||
toxav_callback_call_state(CallContrl.av, callstate_cb, &CallContrl);
|
||||
toxav_callback_audio_receive_frame(CallContrl.av, receive_audio_frame_cb, &CallContrl);
|
||||
toxav_callback_audio_bit_rate_status(CallContrl.av, audio_bit_rate_status_cb, &CallContrl);
|
||||
toxav_callback_video_receive_frame(CallContrl.av, receive_video_frame_cb, &CallContrl);
|
||||
toxav_callback_video_bit_rate_status(CallContrl.av, video_bit_rate_status_cb, &CallContrl);
|
||||
|
||||
return CallContrl.av;
|
||||
}
|
||||
|
||||
void terminate_audio()
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < MAX_CALLS; ++i)
|
||||
stop_transmission(&ASettins.calls[i], i);
|
||||
stop_transmission(&CallContrl.calls[i], i);
|
||||
|
||||
if ( ASettins.av )
|
||||
toxav_kill(ASettins.av);
|
||||
if ( CallContrl.av )
|
||||
toxav_kill(CallContrl.av);
|
||||
|
||||
terminate_devices();
|
||||
}
|
||||
|
||||
void read_device_callback (const int16_t* captured, uint32_t size, void* data)
|
||||
{
|
||||
int32_t call_index = *((int32_t*)data); /* TODO: Or pass an array of call_idx's */
|
||||
int32_t friend_number = *((int32_t*)data); /* TODO: Or pass an array of call_idx's */
|
||||
|
||||
uint8_t encoded_payload[RTP_PAYLOAD_SIZE];
|
||||
int32_t payload_size = toxav_prepare_audio_frame(ASettins.av, call_index, encoded_payload, RTP_PAYLOAD_SIZE, captured, size);
|
||||
if ( payload_size <= 0 || toxav_send_audio(ASettins.av, call_index, encoded_payload, payload_size) < 0 ) {
|
||||
/*fprintf(stderr, "Could not encode audio packet\n");*/
|
||||
}
|
||||
//uint8_t encoded_payload[RTP_PAYLOAD_SIZE];
|
||||
//int32_t payload_size = toxav_prepare_audio_frame(CallContrl.av, friend_number, encoded_payload, RTP_PAYLOAD_SIZE, captured, size);
|
||||
//if ( payload_size <= 0 || toxav_send_audio(CallContrl.av, friend_number, encoded_payload, payload_size) < 0 ) {
|
||||
// /*fprintf(stderr, "Could not encode audio packet\n");*/
|
||||
//}
|
||||
}
|
||||
|
||||
void write_device_callback(void *agent, int32_t call_index, const int16_t* PCM, uint16_t size, void* arg)
|
||||
void write_device_callback(void *agent, int32_t friend_number, const int16_t* PCM, uint16_t size, void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
(void)agent;
|
||||
|
||||
if (call_index >= 0 && ASettins.calls[call_index].ttas) {
|
||||
ToxAvCSettings csettings = ASettins.cs;
|
||||
toxav_get_peer_csettings(ASettins.av, call_index, 0, &csettings);
|
||||
write_out(ASettins.calls[call_index].out_idx, PCM, size, csettings.audio_channels);
|
||||
|
||||
if (friend_number >= 0 && CallContrl.calls[friend_number].ttas) {
|
||||
//ToxAvCSettings csettings = CallContrl.cs;
|
||||
//toxav_get_peer_csettings(CallContrl.av, friend_number, 0, &csettings);
|
||||
write_out(CallContrl.calls[friend_number].out_idx, PCM, size, CallContrl.audio_channels);
|
||||
}
|
||||
}
|
||||
|
||||
int start_transmission(ToxWindow *self, Call *call)
|
||||
{
|
||||
if ( !self || !ASettins.av || self->call_idx == -1 ) {
|
||||
if ( !self || !CallContrl.av || self->num == -1 ) {
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Could not prepare transmission");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Don't provide support for video */
|
||||
if ( 0 != toxav_prepare_transmission(ASettins.av, self->call_idx, 0) ) {
|
||||
/*
|
||||
if ( 0 != toxav_prepare_transmission(CallContrl.av, self->num, 0) ) {
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Could not prepare transmission");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ( !toxav_capability_supported(ASettins.av, self->call_idx, av_AudioDecoding) ||
|
||||
!toxav_capability_supported(ASettins.av, self->call_idx, av_AudioEncoding) )
|
||||
if ( !toxav_capability_supported(CallContrl.av, self->num, av_AudioDecoding) ||
|
||||
!toxav_capability_supported(CallContrl.av, self->num, av_AudioEncoding) )
|
||||
return -1;
|
||||
*/
|
||||
|
||||
if (set_call(call, true) == -1)
|
||||
return -1;
|
||||
|
||||
ToxAvCSettings csettings;
|
||||
toxav_get_peer_csettings(ASettins.av, self->call_idx, 0, &csettings);
|
||||
//ToxAvCSettings csettings;
|
||||
//toxav_get_peer_csettings(CallContrl.av, self->call_idx, 0, &csettings);
|
||||
|
||||
if ( open_primary_device(input, &call->in_idx,
|
||||
csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels) != de_None )
|
||||
DeviceError test = open_primary_device(input, &call->in_idx, CallContrl.audio_bit_rate, CallContrl.audio_frame_duration, CallContrl.audio_channels);
|
||||
|
||||
if ( test == de_FailedStart)
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed Start");
|
||||
|
||||
if ( test == de_InternalError )
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Internal Error");
|
||||
|
||||
if ( test != de_None )
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open input device!");
|
||||
|
||||
if ( register_device_callback(self->call_idx, call->in_idx,
|
||||
read_device_callback, &self->call_idx, true) != de_None)
|
||||
if ( register_device_callback(self->num, call->in_idx,
|
||||
read_device_callback, &self->num, true) != de_None)
|
||||
/* Set VAD as true for all; TODO: Make it more dynamic */
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to register input handler!");
|
||||
|
||||
if ( open_primary_device(output, &call->out_idx,
|
||||
csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels) != de_None ) {
|
||||
CallContrl.audio_bit_rate, CallContrl.audio_frame_duration, CallContrl.audio_channels) != de_None ) {
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open output device!");
|
||||
call->has_output = 0;
|
||||
}
|
||||
@ -224,22 +287,29 @@ int start_transmission(ToxWindow *self, Call *call)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int stop_transmission(Call *call, int32_t call_index)
|
||||
int stop_transmission(Call *call, int32_t friend_number)
|
||||
{
|
||||
if ( call->ttas ) {
|
||||
toxav_kill_transmission(ASettins.av, call_index);
|
||||
call->ttas = false;
|
||||
TOXAV_ERR_CALL_CONTROL error;
|
||||
bool call_running = toxav_call_control(CallContrl.av, friend_number, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
//toxav_kill_transmission(CallContrl.av, friend_number);
|
||||
if(error == TOXAV_ERR_CALL_CONTROL_OK) {
|
||||
call->ttas = false;
|
||||
|
||||
if ( call->in_idx != -1 )
|
||||
close_device(input, call->in_idx);
|
||||
if ( call->in_idx != -1 )
|
||||
close_device(input, call->in_idx);
|
||||
|
||||
if ( call->out_idx != -1 )
|
||||
close_device(output, call->out_idx);
|
||||
if ( call->out_idx != -1 )
|
||||
close_device(output, call->out_idx);
|
||||
|
||||
if (set_call(call, false) == -1)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
} else {
|
||||
|
||||
if (set_call(call, false) == -1)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
@ -256,81 +326,247 @@ int stop_transmission(Call *call, int32_t call_index)
|
||||
* Callbacks
|
||||
*/
|
||||
|
||||
#define CB_BODY(call_idx, Arg, onFunc) do { ToxWindow* windows = (Arg); int i;\
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i) if (windows[i].onFunc != NULL) windows[i].onFunc(&windows[i], ASettins.av, call_idx); } while (0)
|
||||
void call_cb(ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled, void *user_data)
|
||||
{
|
||||
TOXAV_ERR_ANSWER error;
|
||||
CallControl* cc = user_data;
|
||||
ToxWindow* window = cc->window;
|
||||
cc->pending_call = true;
|
||||
|
||||
void callback_recv_invite ( void* av, int32_t call_index, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onInvite);
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "Incoming call callback! Friend number: %d", friend_number);
|
||||
|
||||
callback_recv_invite(av, friend_number, user_data);
|
||||
//toxav_answer(CallContrl.av, friend_number, 48, 0, &error);
|
||||
}
|
||||
void callback_recv_ringing ( void* av, int32_t call_index, void* arg )
|
||||
|
||||
void callstate_cb(ToxAV *av, uint32_t friend_number, uint32_t state, void *user_data)
|
||||
{
|
||||
CB_BODY(call_index, arg, onRinging);
|
||||
CallControl* cc = user_data;
|
||||
ToxWindow* window = cc->window;
|
||||
cc->call_state = state;
|
||||
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "Callstate callback! Friend number: %d", friend_number);
|
||||
|
||||
switch(state) {
|
||||
case TOXAV_CALL_STATE_ERROR:
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_CALL_STATE_ERROR");
|
||||
break;
|
||||
case TOXAV_CALL_STATE_FINISHED:
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_CALL_STATE_FINISHED");
|
||||
|
||||
if(CallContrl.pending_call) {
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "Pending Call Rejected");
|
||||
CallContrl.pending_call = false;
|
||||
callback_call_rejected(CallContrl.av, window->num, &CallContrl);
|
||||
} else {
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "Existing Call Cancelled");
|
||||
callback_call_canceled(CallContrl.av, window->num, &CallContrl);
|
||||
}
|
||||
break;
|
||||
case TOXAV_CALL_STATE_SENDING_A:
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_CALL_STATE_SENDING_A");
|
||||
break;
|
||||
case TOXAV_CALL_STATE_SENDING_V:
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_CALL_STATE_SENDING_V");
|
||||
break;
|
||||
case TOXAV_CALL_STATE_RECEIVING_A:
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_CALL_STATE_RECEIVING_A");
|
||||
break;
|
||||
case TOXAV_CALL_STATE_RECEIVING_V:
|
||||
line_info_add(window, NULL, NULL, NULL, SYS_MSG, 0, 0, "TOXAV_CALL_STATE_RECEIVING_V");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
void callback_recv_starting ( void* av, int32_t call_index, void* arg )
|
||||
|
||||
void receive_audio_frame_cb(ToxAV *av, uint32_t friend_number, int16_t const *pcm, size_t sample_count, uint8_t channels, uint32_t sampling_rate, void *user_data)
|
||||
{
|
||||
ToxWindow* windows = arg;
|
||||
CallControl* cc = user_data;
|
||||
|
||||
write_device_callback(CallContrl.calls[friend_number].out_idx, friend_number, pcm, frame_size, cc);
|
||||
}
|
||||
|
||||
void audio_bit_rate_status_cb(ToxAV *av, uint32_t friend_number, bool stable, uint32_t bit_rate, void *user_data)
|
||||
{
|
||||
|
||||
CallControl* cc = user_data;
|
||||
|
||||
if (stable)
|
||||
cc->audio_bit_rate = bit_rate;
|
||||
}
|
||||
|
||||
void receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
|
||||
uint16_t width, uint16_t height,
|
||||
uint8_t const *y, uint8_t const *u, uint8_t const *v, uint8_t const *a,
|
||||
int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride,
|
||||
void *user_data)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void video_bit_rate_status_cb(ToxAV *av, uint32_t friend_number,
|
||||
bool stable, uint32_t bit_rate, void *user_data)
|
||||
{
|
||||
CallControl* cc = user_data;
|
||||
|
||||
if (stable)
|
||||
cc->video_bit_rate = bit_rate;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define CB_BODY(friend_number, Arg, onFunc) do { ToxWindow* windows = (Arg); int i;\
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i) if (windows[i].onFunc != NULL) windows[i].onFunc(&windows[i], CallContrl.av, friend_number); } while (0)
|
||||
|
||||
|
||||
void callback_recv_invite ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
//CB_BODY(friend_number, arg, onInvite);
|
||||
CallControl* cc = (CallControl*)arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onStarting != NULL && windows[i].call_idx == call_index) {
|
||||
windows[i].onStarting(&windows[i], ASettins.av, call_index);
|
||||
if ( 0 != start_transmission(&windows[i], &ASettins.calls[call_index])) {/* YEAH! */
|
||||
if (windows[i].onInvite != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onInvite(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
} else {
|
||||
//if(windows[i].num != friend_number)
|
||||
//line_info_add(&windows, NULL, NULL, NULL, SYS_MSG, 0, 0, "Non-matching friend number");
|
||||
}
|
||||
}
|
||||
|
||||
void callback_recv_ringing ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
//CB_BODY(friend_number, arg, onRinging);
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onRinging != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onRinging(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
}
|
||||
void callback_recv_starting ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onStarting != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onStarting(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
if ( 0 != start_transmission(&windows[i], &CallContrl.calls[friend_number])) {/* YEAH! */
|
||||
line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0 , "Error starting transmission!");
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
void callback_recv_ending ( void* av, int32_t call_index, void* arg )
|
||||
void callback_recv_ending ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onEnding);
|
||||
stop_transmission(&ASettins.calls[call_index], call_index);
|
||||
}
|
||||
//CB_BODY(friend_number, arg, onEnding);
|
||||
|
||||
void callback_call_started ( void* av, int32_t call_index, void* arg )
|
||||
{
|
||||
ToxWindow* windows = arg;
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onStart != NULL && windows[i].call_idx == call_index) {
|
||||
windows[i].onStart(&windows[i], ASettins.av, call_index);
|
||||
if ( 0 != start_transmission(&windows[i], &ASettins.calls[call_index]) ) {/* YEAH! */
|
||||
if (windows[i].onEnding != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onEnding(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
|
||||
stop_transmission(&CallContrl.calls[friend_number], friend_number);
|
||||
}
|
||||
|
||||
void callback_call_started ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onStart != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onStart(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
if ( 0 != start_transmission(&windows[i], &CallContrl.calls[friend_number]) ) {/* YEAH! */
|
||||
line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0, "Error starting transmission!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
void callback_call_canceled ( void* av, int32_t call_index, void* arg )
|
||||
void callback_call_canceled ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onCancel);
|
||||
//CB_BODY(friend_number, arg, onCancel);
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onCancel != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onCancel(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
|
||||
/* In case call is active */
|
||||
stop_transmission(&ASettins.calls[call_index], call_index);
|
||||
stop_transmission(&CallContrl.calls[friend_number], friend_number);
|
||||
}
|
||||
void callback_call_rejected ( void* av, int32_t call_index, void* arg )
|
||||
void callback_call_rejected ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onReject);
|
||||
//CB_BODY(friend_number, arg, onReject);
|
||||
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onReject != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onReject(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
|
||||
}
|
||||
void callback_call_ended ( void* av, int32_t call_index, void* arg )
|
||||
void callback_call_ended ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onEnd);
|
||||
stop_transmission(&ASettins.calls[call_index], call_index);
|
||||
//CB_BODY(friend_number, arg, onEnd);
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onEnd != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onEnd(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
|
||||
stop_transmission(&CallContrl.calls[friend_number], friend_number);
|
||||
}
|
||||
|
||||
void callback_requ_timeout ( void* av, int32_t call_index, void* arg )
|
||||
void callback_requ_timeout ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onRequestTimeout);
|
||||
//CB_BODY(friend_number, arg, onRequestTimeout);
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onRequestTimeout != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onRequestTimeout(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
}
|
||||
void callback_peer_timeout ( void* av, int32_t call_index, void* arg )
|
||||
void callback_peer_timeout ( void* av, uint32_t friend_number, void* arg )
|
||||
{
|
||||
CB_BODY(call_index, arg, onPeerTimeout);
|
||||
stop_transmission(&ASettins.calls[call_index], call_index);
|
||||
//CB_BODY(friend_number, arg, onPeerTimeout);
|
||||
CallControl* cc = arg;
|
||||
ToxWindow* windows = cc->window;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < MAX_WINDOWS_NUM; ++i)
|
||||
if (windows[i].onPeerTimeout != NULL && windows[i].num == friend_number) {
|
||||
windows[i].onPeerTimeout(&windows[i], cc->av, friend_number, cc->call_state);
|
||||
}
|
||||
|
||||
stop_transmission(&CallContrl.calls[friend_number], friend_number);
|
||||
/* Call is stopped manually since there might be some other
|
||||
* actions that one can possibly take on timeout
|
||||
*/
|
||||
toxav_stop_call(ASettins.av, call_index);
|
||||
TOXAV_ERR_CALL_CONTROL error;
|
||||
bool call_running = toxav_call_control(cc->av, friend_number, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
}
|
||||
|
||||
// void callback_media_change(void* av, int32_t call_index, void* arg)
|
||||
// void callback_media_change(void* av, int32_t friend_number, void* arg)
|
||||
// {
|
||||
/*... TODO cancel all media change requests */
|
||||
// }
|
||||
@ -345,6 +581,7 @@ void callback_peer_timeout ( void* av, int32_t call_index, void* arg )
|
||||
*/
|
||||
void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
|
||||
{
|
||||
TOXAV_ERR_CALL error;
|
||||
const char *error_str;
|
||||
|
||||
if (argc != 0) {
|
||||
@ -352,8 +589,8 @@ void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
if ( !ASettins.av ) {
|
||||
error_str = "Audio not supported!";
|
||||
if ( !CallContrl.av ) {
|
||||
error_str = "ToxAV not supported!";
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
@ -362,16 +599,21 @@ void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
ToxAvError error = toxav_call(ASettins.av, &self->call_idx, self->num, &ASettins.cs, 30);
|
||||
bool call_running;
|
||||
call_running = toxav_call(CallContrl.av, self->num, CallContrl.audio_bit_rate, CallContrl.video_bit_rate, &error);
|
||||
|
||||
if ( error != av_ErrorNone ) {
|
||||
if ( error == av_ErrorAlreadyInCallWithPeer ) error_str = "Already in a call!";
|
||||
if ( !call_running ) {
|
||||
if ( error == TOXAV_ERR_CALL_FRIEND_ALREADY_IN_CALL ) error_str = "Already in a call!";
|
||||
else if ( error == TOXAV_ERR_CALL_MALLOC ) error_str = "Resource allocation issue";
|
||||
else if ( error == TOXAV_ERR_CALL_FRIEND_NOT_FOUND) error_str = "Friend number invalid";
|
||||
else if ( error == TOXAV_ERR_CALL_FRIEND_NOT_CONNECTED) error_str = "Friend is valid but not currently connected";
|
||||
else error_str = "Internal error!";
|
||||
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Calling... idx: %d", self->call_idx);
|
||||
CallContrl.pending_call = true;
|
||||
callback_recv_ringing(CallContrl.av, self->num, &CallContrl);
|
||||
|
||||
return;
|
||||
on_error:
|
||||
@ -380,6 +622,7 @@ on_error:
|
||||
|
||||
void cmd_answer(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
|
||||
{
|
||||
TOXAV_ERR_ANSWER error;
|
||||
const char *error_str;
|
||||
|
||||
if (argc != 0) {
|
||||
@ -387,16 +630,19 @@ void cmd_answer(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
if ( !ASettins.av ) {
|
||||
if ( !CallContrl.av ) {
|
||||
error_str = "Audio not supported!";
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
ToxAvError error = toxav_answer(ASettins.av, self->call_idx, &ASettins.cs);
|
||||
bool call_running = toxav_answer(CallContrl.av, self->num, 48, 0, &error);
|
||||
|
||||
if ( error != av_ErrorNone ) {
|
||||
if ( error == av_ErrorInvalidState ) error_str = "Cannot answer in invalid state!";
|
||||
else if ( error == av_ErrorNoCall ) error_str = "No incoming call!";
|
||||
if ( !call_running ) {
|
||||
//if ( error != TOXAV_ERR_ANSWER_OK ) error_str = "Cannot answer in invalid state!";
|
||||
if ( error == TOXAV_ERR_ANSWER_FRIEND_NOT_CALLING ) error_str = "No incoming call!";
|
||||
else if ( error == TOXAV_ERR_ANSWER_CODEC_INITIALIZATION ) error_str = "Failed to initialize codecs";
|
||||
else if ( error == TOXAV_ERR_ANSWER_FRIEND_NOT_FOUND ) error_str = "Friend not found";
|
||||
else if ( error == TOXAV_ERR_ANSWER_INVALID_BIT_RATE ) error_str = "Invalid bit rate";
|
||||
else error_str = "Internal error!";
|
||||
|
||||
goto on_error;
|
||||
@ -404,6 +650,10 @@ void cmd_answer(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
|
||||
|
||||
/* Callback will print status... */
|
||||
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Starting call");
|
||||
CallContrl.pending_call = false;
|
||||
callback_recv_starting(CallContrl.av, self->num, &CallContrl);
|
||||
|
||||
return;
|
||||
on_error:
|
||||
print_err (self, error_str);
|
||||
@ -411,6 +661,7 @@ on_error:
|
||||
|
||||
void cmd_reject(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
|
||||
{
|
||||
TOXAV_ERR_CALL_CONTROL error;
|
||||
const char *error_str;
|
||||
|
||||
if (argc != 0) {
|
||||
@ -418,16 +669,18 @@ void cmd_reject(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
if ( !ASettins.av ) {
|
||||
if ( !CallContrl.av ) {
|
||||
error_str = "Audio not supported!";
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
ToxAvError error = toxav_reject(ASettins.av, self->call_idx, "Why not?");
|
||||
bool call_running;
|
||||
call_running = toxav_call_control(CallContrl.av, self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
//ToxAvError error = toxav_reject(CallContrl.av, self->call_idx, "Why not?");
|
||||
|
||||
if ( error != av_ErrorNone ) {
|
||||
if ( error == av_ErrorInvalidState ) error_str = "Cannot reject in invalid state!";
|
||||
else if ( error == av_ErrorNoCall ) error_str = "No incoming call!";
|
||||
if ( error != TOXAV_ERR_CALL_CONTROL_OK ) {
|
||||
if ( error == TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION ) error_str = "Cannot reject in invalid state!";
|
||||
else if ( CallContrl.pending_call == false ) error_str = "No incoming call!";
|
||||
else error_str = "Internal error!";
|
||||
|
||||
goto on_error;
|
||||
@ -435,6 +688,8 @@ void cmd_reject(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
|
||||
|
||||
/* Callback will print status... */
|
||||
|
||||
CallContrl.pending_call = false;
|
||||
callback_call_rejected(CallContrl.av, self->num, &CallContrl);
|
||||
return;
|
||||
on_error:
|
||||
print_err (self, error_str);
|
||||
@ -442,6 +697,7 @@ on_error:
|
||||
|
||||
void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
|
||||
{
|
||||
TOXAV_ERR_CALL_CONTROL error;
|
||||
const char *error_str;
|
||||
|
||||
if (argc != 0) {
|
||||
@ -449,27 +705,27 @@ void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
if ( !ASettins.av ) {
|
||||
if ( !CallContrl.av ) {
|
||||
error_str = "Audio not supported!";
|
||||
goto on_error;
|
||||
}
|
||||
|
||||
ToxAvError error;
|
||||
|
||||
if (toxav_get_call_state(ASettins.av, self->call_idx) == av_CallInviting) {
|
||||
error = toxav_cancel(ASettins.av, self->call_idx, self->num,
|
||||
"Only those who appreciate small things know the beauty that is life");
|
||||
bool call_running;
|
||||
if( CallContrl.call_state != TOXAV_CALL_STATE_SENDING_A | TOXAV_CALL_STATE_RECEIVING_A | TOXAV_CALL_STATE_SENDING_V | TOXAV_CALL_STATE_RECEIVING_V ) {
|
||||
call_running = toxav_call_control(CallContrl.av, self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
#ifdef SOUND_NOTIFY
|
||||
stop_sound(self->ringing_sound);
|
||||
#endif
|
||||
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call canceled!");
|
||||
CallContrl.pending_call = false;
|
||||
callback_call_canceled(CallContrl.av, self->num, &CallContrl);
|
||||
} else {
|
||||
error = toxav_hangup(ASettins.av, self->call_idx);
|
||||
call_running = toxav_call_control(CallContrl.av, &self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
callback_call_ended(CallContrl.av, self->num, &CallContrl);
|
||||
}
|
||||
|
||||
if ( error != av_ErrorNone ) {
|
||||
if ( error == av_ErrorInvalidState ) error_str = "Cannot hangup in invalid state!";
|
||||
else if ( error == av_ErrorNoCall ) error_str = "No call!";
|
||||
if ( error != TOXAV_ERR_CALL_CONTROL_OK ) {
|
||||
if ( error == TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION ) error_str = "Cannot hangup in invalid state!";
|
||||
else if ( error == TOXAV_ERR_CALL_CONTROL_FRIEND_NOT_IN_CALL ) error_str = "No call!";
|
||||
else error_str = "Internal error!";
|
||||
|
||||
goto on_error;
|
||||
@ -596,28 +852,28 @@ void cmd_ccur_device(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*a
|
||||
}
|
||||
|
||||
/* If call is active, change device */
|
||||
if ( self->call_idx > -1) {
|
||||
Call* this_call = &ASettins.calls[self->call_idx];
|
||||
if ( self->num > -1) {
|
||||
Call* this_call = &CallContrl.calls[self->num];
|
||||
if (this_call->ttas) {
|
||||
|
||||
ToxAvCSettings csettings;
|
||||
toxav_get_peer_csettings(ASettins.av, self->call_idx, 0, &csettings);
|
||||
//ToxAvCSettings csettings;
|
||||
//toxav_get_peer_csettings(CallContrl.av, self->num, 0, &csettings);
|
||||
|
||||
if (type == output) {
|
||||
pthread_mutex_lock(&this_call->mutex);
|
||||
close_device(output, this_call->out_idx);
|
||||
this_call->has_output = open_device(output, selection, &this_call->out_idx,
|
||||
csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels)
|
||||
CallContrl.audio_bit_rate, CallContrl.audio_frame_duration, CallContrl.audio_channels)
|
||||
== de_None ? 1 : 0;
|
||||
pthread_mutex_unlock(&this_call->mutex);
|
||||
}
|
||||
else {
|
||||
/* TODO: check for failure */
|
||||
close_device(input, this_call->in_idx);
|
||||
open_device(input, selection, &this_call->in_idx, csettings.audio_sample_rate,
|
||||
csettings.audio_frame_duration, csettings.audio_channels);
|
||||
open_device(input, selection, &this_call->in_idx, CallContrl.audio_bit_rate,
|
||||
CallContrl.audio_frame_duration, CallContrl.audio_channels);
|
||||
/* Set VAD as true for all; TODO: Make it more dynamic */
|
||||
register_device_callback(self->call_idx, this_call->in_idx, read_device_callback, &self->call_idx, true);
|
||||
register_device_callback(self->num, this_call->in_idx, read_device_callback, &self->num, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -655,8 +911,8 @@ void cmd_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
|
||||
|
||||
|
||||
/* If call is active, use this_call values */
|
||||
if ( self->call_idx > -1) {
|
||||
Call* this_call = &ASettins.calls[self->call_idx];
|
||||
if ( self->num > -1) {
|
||||
Call* this_call = &CallContrl.calls[self->num];
|
||||
|
||||
pthread_mutex_lock(&this_call->mutex);
|
||||
if (type == input) {
|
||||
@ -695,8 +951,8 @@ void cmd_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[M
|
||||
}
|
||||
|
||||
/* Call must be active */
|
||||
if ( self->call_idx > -1) {
|
||||
device_set_VAD_treshold(ASettins.calls[self->call_idx].in_idx, value);
|
||||
if ( self->num > -1) {
|
||||
device_set_VAD_treshold(CallContrl.calls[self->num].in_idx, value);
|
||||
self->chatwin->infobox.vad_lvl = value;
|
||||
}
|
||||
|
||||
@ -709,23 +965,31 @@ on_error:
|
||||
|
||||
void stop_current_call(ToxWindow* self)
|
||||
{
|
||||
TOXAV_ERR_CALL_CONTROL error;
|
||||
bool call_running = toxav_call_control(CallContrl.av, &self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
|
||||
/*
|
||||
ToxAvCallState callstate;
|
||||
if ( ASettins.av != NULL && self->call_idx != -1 &&
|
||||
( callstate = toxav_get_call_state(ASettins.av, self->call_idx) ) != av_CallNonExistent) {
|
||||
if ( CallContrl.av != NULL && self->num != -1 &&
|
||||
CallContrl.call_state != TOXAV_CALL_STATE_SENDING_A | TOXAV_CALL_STATE_RECEIVING_A | TOXAV_CALL_STATE_SENDING_V | TOXAV_CALL_STATE_RECEIVING_V) {
|
||||
switch (callstate)
|
||||
{
|
||||
case av_CallActive:
|
||||
case av_CallHold:
|
||||
toxav_hangup(ASettins.av, self->call_idx);
|
||||
//toxav_hangup(CallContrl.av, self->num);
|
||||
toxav_call_control(CallContrl.av, &self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
break;
|
||||
case av_CallInviting:
|
||||
toxav_cancel(ASettins.av, self->call_idx, 0, "Not interested anymore");
|
||||
//toxav_cancel(CallContrl.av, self->num, 0, "Not interested anymore");
|
||||
toxav_call_control(CallContrl.av, &self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
break;
|
||||
case av_CallStarting:
|
||||
toxav_reject(ASettins.av, self->call_idx, "Not interested");
|
||||
//toxav_reject(CallContrl.av, self->num, "Not interested");
|
||||
toxav_call_control(CallContrl.av, &self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user