Skip to content

Commit

Permalink
updated to work with latest toxcore changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@naxuroqa
naxuroqa committed Jul 22, 2014
1 parent 3e3f59f commit a36985a
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 49 deletions.
55 changes: 24 additions & 31 deletions src/core/ToxSession.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,17 @@ namespace Venom {
handle.callback_file_data(on_file_data_callback);

// ToxAV callbacks
ToxAV.register_callstate_callback(on_av_invite_callback , ToxAV.CallbackID.INVITE);
ToxAV.register_callstate_callback(on_av_start_callback , ToxAV.CallbackID.START);
ToxAV.register_callstate_callback(on_av_cancel_callback , ToxAV.CallbackID.CANCEL);
ToxAV.register_callstate_callback(on_av_reject_callback , ToxAV.CallbackID.REJECT);
ToxAV.register_callstate_callback(on_av_end_callback , ToxAV.CallbackID.END);
ToxAV.register_callstate_callback(on_av_ringing_callback , ToxAV.CallbackID.RINGING);
ToxAV.register_callstate_callback(on_av_starting_callback , ToxAV.CallbackID.STARTING);
ToxAV.register_callstate_callback(on_av_ending_callback , ToxAV.CallbackID.ENDING);
ToxAV.register_callstate_callback(on_av_error_callback , ToxAV.CallbackID.ERROR);
ToxAV.register_callstate_callback(on_av_request_timeout_callback, ToxAV.CallbackID.REQUEST_TIMEOUT);
ToxAV.register_callstate_callback(on_av_peer_timeout_callback , ToxAV.CallbackID.PEER_TIMEOUT);
_toxav_handle.register_callstate_callback(on_av_invite_callback , ToxAV.CallbackID.INVITE);
_toxav_handle.register_callstate_callback(on_av_start_callback , ToxAV.CallbackID.START);
_toxav_handle.register_callstate_callback(on_av_cancel_callback , ToxAV.CallbackID.CANCEL);
_toxav_handle.register_callstate_callback(on_av_reject_callback , ToxAV.CallbackID.REJECT);
_toxav_handle.register_callstate_callback(on_av_end_callback , ToxAV.CallbackID.END);
_toxav_handle.register_callstate_callback(on_av_ringing_callback , ToxAV.CallbackID.RINGING);
_toxav_handle.register_callstate_callback(on_av_starting_callback , ToxAV.CallbackID.STARTING);
_toxav_handle.register_callstate_callback(on_av_ending_callback , ToxAV.CallbackID.ENDING);
_toxav_handle.register_callstate_callback(on_av_request_timeout_callback, ToxAV.CallbackID.REQUEST_TIMEOUT);
_toxav_handle.register_callstate_callback(on_av_peer_timeout_callback , ToxAV.CallbackID.PEER_TIMEOUT);
_toxav_handle.register_callstate_callback(on_av_media_change , ToxAV.CallbackID.MEDIA_CHANGE);
}

private void init_contact_list() {
Expand Down Expand Up @@ -934,7 +934,7 @@ namespace Venom {
}

// TOXAV callbacks
private void on_av_invite_callback(int32 call_index) {
private void on_av_invite_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_invite_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -945,7 +945,7 @@ namespace Venom {
return false;
});
}
private void on_av_start_callback(int32 call_index) {
private void on_av_start_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_start_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -955,7 +955,7 @@ namespace Venom {
return false;
});
}
private void on_av_cancel_callback(int32 call_index) {
private void on_av_cancel_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_cancel_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -965,7 +965,7 @@ namespace Venom {
return false;
});
}
private void on_av_reject_callback(int32 call_index) {
private void on_av_reject_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_reject_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -975,7 +975,7 @@ namespace Venom {
return false;
});
}
private void on_av_end_callback(int32 call_index) {
private void on_av_end_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_end_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -985,7 +985,7 @@ namespace Venom {
return false;
});
}
private void on_av_ringing_callback(int32 call_index) {
private void on_av_ringing_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_ringing_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -996,7 +996,7 @@ namespace Venom {
return false;
});
}
private void on_av_starting_callback(int32 call_index) {
private void on_av_starting_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_starting_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -1006,7 +1006,7 @@ namespace Venom {
return false;
});
}
private void on_av_ending_callback(int32 call_index) {
private void on_av_ending_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_ending_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -1016,17 +1016,7 @@ namespace Venom {
return false;
});
}
private void on_av_error_callback(int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_error_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Contact c = _contacts.get(friend_id);
c.audio_call_state = AudioCallState.ENDED;
on_av_error(c);
return false;
});
}
private void on_av_request_timeout_callback(int32 call_index) {
private void on_av_request_timeout_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_request_timeout_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -1036,7 +1026,7 @@ namespace Venom {
return false;
});
}
private void on_av_peer_timeout_callback(int32 call_index) {
private void on_av_peer_timeout_callback(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_peer_timeout_callback %i".printf(call_index));
int friend_id = _toxav_handle.get_peer_id(call_index, 0);
Idle.add(() => {
Expand All @@ -1046,5 +1036,8 @@ namespace Venom {
return false;
});
}
private void on_av_media_change(ToxAV.ToxAV av, int32 call_index) {
Logger.log(LogLevel.DEBUG, "on_av_media_change_callback %i".printf(call_index));
}
}
}
35 changes: 17 additions & 18 deletions src/vapi/toxav-1.0.vapi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ namespace ToxAV {
ENDING,

/* Protocol */
[CCode (cname = "av_OnError")]
ERROR,
[CCode (cname = "av_OnRequestTimeout")]
REQUEST_TIMEOUT,
[CCode (cname = "av_OnPeerTimeout")]
PEER_TIMEOUT
PEER_TIMEOUT,
[CCode (cname = "av_OnMediaChange")]
MEDIA_CHANGE
}

/**
Expand Down Expand Up @@ -190,24 +190,23 @@ namespace ToxAV {
[CCode (cname = "av_DefaultSettings", has_type_id = false)]
public const CodecSettings DefaultCodecSettings;

/**
* @brief Register callback for call state.
*
* @param callback The callback
* @param id One of the ToxAvCallbackID values
* @return void
*/
//typedef void ( *ToxAVCallback ) ( void *arg );
[CCode (cname = "ToxAVCallback", has_type_id = false)]
public delegate void CallstateCallback(int32 call_index);

[CCode (cname = "toxav_register_callstate_callback", has_type_id = false)]
public static void register_callstate_callback ([CCode( delegate_target_pos = 3 )] CallstateCallback callback, CallbackID id);


[CCode (cname = "ToxAv", free_function = "toxav_kill", cprefix = "toxav_", has_type_id = false)]
[Compact]
public class ToxAV {
/**
* @brief Register callback for call state.
*
* @param callback The callback
* @param id One of the ToxAvCallbackID values
* @return void
*/
//typedef void ( *ToxAVCallback ) ( void *arg );
[CCode (cname = "ToxAVCallback", has_type_id = false)]
public delegate void CallstateCallback(ToxAV av, int32 call_index);

[CCode (cname = "toxav_register_callstate_callback", has_type_id = false)]
public void register_callstate_callback ([CCode( delegate_target_pos = 3 )] CallstateCallback callback, CallbackID id);

/**
* @brief Start new A/V session. There can only be one session at the time. If you register more
* it will result in undefined behaviour.
Expand Down

0 comments on commit a36985a

Please sign in to comment.