Skip to content

Commit

Permalink
using toxav_get_peer_id, added some debug output
Browse files Browse the repository at this point in the history
  • Loading branch information
@naxuroqa
naxuroqa committed Jun 13, 2014
1 parent 228b96c commit 1082381
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 57 deletions.
34 changes: 22 additions & 12 deletions src/core/ToxSession.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ namespace Venom {
private DhtNode[] dht_nodes = {};
private GLib.HashTable<int, Contact> _contacts = new GLib.HashTable<int, Contact>(null, null);
private GLib.HashTable<int, GroupChat> _groups = new GLib.HashTable<int, GroupChat>(null, null);
private GLib.HashTable<int, Contact> _call_indices = new GLib.HashTable<int, Contact>(null, null);
private Thread<int> session_thread = null;
private bool bootstrapped = false;
private bool ipv6 = false;
Expand Down Expand Up @@ -867,68 +866,79 @@ namespace Venom {

// TOXAV functions
private void on_av_invite_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_invite(_call_indices.get(call_index));
on_av_invite(_contacts.get(friend_id));
return false;
});
}
private void on_av_start_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_start(_call_indices.get(call_index));
on_av_start(_contacts.get(friend_id));
return false;
});
}
private void on_av_cancel_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_cancel(_call_indices.get(call_index));
on_av_cancel(_contacts.get(friend_id));
return false;
});
}
private void on_av_reject_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_reject(_call_indices.get(call_index));
on_av_reject(_contacts.get(friend_id));
return false;
});
}
private void on_av_end_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_end(_call_indices.get(call_index));
on_av_end(_contacts.get(friend_id));
return false;
});
}
private void on_av_ringing_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_ringing(_call_indices.get(call_index));
on_av_ringing(_contacts.get(friend_id));
return false;
});
}
private void on_av_starting_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_starting(_call_indices.get(call_index));
on_av_starting(_contacts.get(friend_id));
return false;
});
}
private void on_av_ending_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_ending(_call_indices.get(call_index));
on_av_ending(_contacts.get(friend_id));
return false;
});
}
private void on_av_error_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_error(_call_indices.get(call_index));
on_av_error(_contacts.get(friend_id));
return false;
});
}
private void on_av_request_timeout_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_request_timeout(_call_indices.get(call_index));
on_av_request_timeout(_contacts.get(friend_id));
return false;
});
}
private void on_av_peer_timeout_callback(int32 call_index) {
int friend_id = toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
on_av_peer_timeout(_call_indices.get(call_index));
on_av_peer_timeout(_contacts.get(friend_id));
return false;
});
}
Expand Down
68 changes: 23 additions & 45 deletions src/ui/ContactListWindow.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,48 +800,48 @@ namespace Venom {
groupchat_changed(g);
}

private void on_av_invite(Contact c) {

private void on_av_invite(Contact c) {
stdout.printf("[LOG] on_toxav_invite from %s\n", c.get_name_string());
}

private void on_av_start(Contact c) {

private void on_av_start(Contact c) {
stdout.printf("[LOG] on_toxav_start from %s\n", c.get_name_string());
}

private void on_av_cancel(Contact c) {

private void on_av_cancel(Contact c) {
stdout.printf("[LOG] on_toxav_cancel from %s\n", c.get_name_string());
}

private void on_av_reject(Contact c) {

private void on_av_reject(Contact c) {
stdout.printf("[LOG] on_toxav_reject from %s\n", c.get_name_string());
}

private void on_av_end(Contact c) {

private void on_av_end(Contact c) {
stdout.printf("[LOG] on_toxav_end from %s\n", c.get_name_string());
}

private void on_av_ringing(Contact c) {

private void on_av_ringing(Contact c) {
stdout.printf("[LOG] on_toxav_ringing from %s\n", c.get_name_string());
}

private void on_av_starting(Contact c) {

private void on_av_starting(Contact c) {
stdout.printf("[LOG] on_toxav_starting from %s\n", c.get_name_string());
}

private void on_av_ending(Contact c) {

private void on_av_ending(Contact c) {
stdout.printf("[LOG] on_toxav_ending from %s\n", c.get_name_string());
}

private void on_av_error(Contact c) {

private void on_av_error(Contact c) {
stdout.printf("[LOG] on_toxav_error from %s\n", c.get_name_string());
}

private void on_av_request_timeout(Contact c) {

private void on_av_request_timeout(Contact c) {
stdout.printf("[LOG] on_toxav_request_timeout from %s\n", c.get_name_string());
}

private void on_av_peer_timeout(Contact c) {

private void on_av_peer_timeout(Contact c) {
stdout.printf("[LOG] on_toxav_peer_timeout from %s\n", c.get_name_string());
}

private void on_start_audio_call(Contact c) {
Expand Down Expand Up @@ -878,29 +878,7 @@ namespace Venom {

private void send_file(int friendnumber, uint8 filenumber) {
int chunk_size = session.get_recommended_data_size(friendnumber);
FileTransfer f://github.com/irungentoo/ProjectTox-Core/blob/master/toxav/toxav.h#L48-62 /*
===NOT SURE IF NEEDED LATER, COMMENTING OUT INSTEAD OF DELETING===

//av call type
session.on_av_type_audio.connect(this.on_av_type_audio);
session.on_av_type_video.connect(this.on_av_type_video);

//av error indicators
session.on_av_error_none.connect(this.on_av_error_none);
session.on_av_error_internal.connect(this.on_av_error_internal);
session.on_av_error_already_in_call.connect(this.on_av_error_already_in_call);
session.on_av_error_no_call.connect(this.on_av_error_no_call);
session.on_av_error_invalid_state.connect(this.on_av_error_invalid_state);
session.on_av_error_no_rtp_session.connect(this.on_av_error_no_rtp_session);
session.on_av_error_audio_packet_lost.connect(this.on_av_error_audio_packet_lost);
session.on_av_error_starting_audio_rtp.connect(this.on_av_error_starting_audio_rtp);
session.on_av_error_starting_video_rtp.connect(this.on_av_error_starting_video_rtp);
session.on_av_error_terminating_audio_rtp.connect(this.on_av_error_terminating_audio_rtp);
session.on_av_error_terminating_video_rtp.connect(this.on_av_error_terminating_video_rtp);
session.on_av_error_packet_too_large.connect(this.on_av_error_packet_too_large);
*/

t = session.get_contact_list()[friendnumber].get_filetransfers()[filenumber];
FileTransfer ft = session.get_contact_list()[friendnumber].get_filetransfers()[filenumber];
ft.status = FileTransferStatus.IN_PROGRESS;
if(ft == null) {
stderr.printf("Trying to send unknown file");
Expand Down

0 comments on commit 1082381

Please sign in to comment.