StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Changed msi callbacks

Browse Source
This commit is contained in:
mannol 2014-03-11 22:59:20 +01:00
parent 6858d6387d
commit 54b1dafb0b
4 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
toxav/msi.c
View File

@ -36,6 +36,8 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#define inline__ inline __attribute__((always_inline))
#define same(x, y) strcmp((const char*) x, (const char*) y) == 0 #define same(x, y) strcmp((const char*) x, (const char*) y) == 0
#define MSI_MAXMSG_SIZE 1024 #define MSI_MAXMSG_SIZE 1024
@ -117,6 +119,12 @@ static struct _Callbacks {
void* data; void* data;
} callbacks[10] = {0}; } callbacks[10] = {0};
inline__ void invoke_callback(MSICallbackID id)
{
/*if ( callbacks[id].function ) event.rise ( callbacks[id].function, callbacks[id].data );*/
if ( callbacks[id].function ) callbacks[id].function ( callbacks[id].data );
}
/*static MSICallback callbacks[10] = {0};*/ /*static MSICallback callbacks[10] = {0};*/
@ -153,7 +161,7 @@ typedef enum {
* @param request The request. * @param request The request.
* @return const uint8_t* The string * @return const uint8_t* The string
*/ */
static inline const uint8_t *stringify_request ( MSIRequest request ) static inline__ const uint8_t *stringify_request ( MSIRequest request )
{ {
static const uint8_t *strings[] = { static const uint8_t *strings[] = {
( uint8_t * ) "INVITE", ( uint8_t * ) "INVITE",
@ -182,7 +190,7 @@ typedef enum {
* @param response The response. * @param response The response.
* @return const uint8_t* The string * @return const uint8_t* The string
*/ */
static inline const uint8_t *stringify_response ( MSIResponse response ) static inline__ const uint8_t *stringify_response ( MSIResponse response )
{ {
static const uint8_t *strings[] = { static const uint8_t *strings[] = {
( uint8_t * ) "ringing", ( uint8_t * ) "ringing",
@ -550,7 +558,7 @@ typedef enum {
* @param error_code The code. * @param error_code The code.
* @return const uint8_t* The string. * @return const uint8_t* The string.
*/ */
static inline const uint8_t *stringify_error ( MSICallError error_code ) static inline__ const uint8_t *stringify_error ( MSICallError error_code )
{ {
static const uint8_t *strings[] = { static const uint8_t *strings[] = {
( uint8_t * ) "", ( uint8_t * ) "",
@ -572,7 +580,7 @@ static inline const uint8_t *stringify_error ( MSICallError error_code )
* @param error_code The code. * @param error_code The code.
* @return const uint8_t* The string. * @return const uint8_t* The string.
*/ */
static inline const uint8_t *stringify_error_code ( MSICallError error_code ) static inline__ const uint8_t *stringify_error_code ( MSICallError error_code )
{ {
static const uint8_t *strings[] = { static const uint8_t *strings[] = {
( uint8_t * ) "", ( uint8_t * ) "",
@ -679,7 +687,7 @@ int handle_error ( MSISession *session, MSICallError errid, uint32_t to )
session->last_error_id = errid; session->last_error_id = errid;
session->last_error_str = stringify_error ( errid ); session->last_error_str = stringify_error ( errid );
if ( callbacks[MSI_OnError].function ) event.rise ( callbacks[MSI_OnError].function, callbacks[MSI_OnError].data ); invoke_callback(MSI_OnError);
return 0; return 0;
} }
@ -873,7 +881,7 @@ int handle_recv_invite ( MSISession *session, MSIMessage *msg )
send_message ( session, _msg_ringing, msg->friend_id ); send_message ( session, _msg_ringing, msg->friend_id );
free_message ( _msg_ringing ); free_message ( _msg_ringing );
if ( callbacks[MSI_OnInvite].function ) event.rise ( callbacks[MSI_OnInvite].function, callbacks[MSI_OnInvite].data ); invoke_callback(MSI_OnInvite);
return 1; return 1;
} }
@ -897,7 +905,7 @@ int handle_recv_start ( MSISession *session, MSIMessage *msg )
flush_peer_type ( session, msg, 0 ); flush_peer_type ( session, msg, 0 );
if ( callbacks[MSI_OnStart].function ) event.rise ( callbacks[MSI_OnStart].function, callbacks[MSI_OnStart].data ); invoke_callback(MSI_OnStart);
return 1; return 1;
} }
@ -914,7 +922,9 @@ int handle_recv_reject ( MSISession *session, MSIMessage *msg )
free_message ( _msg_end ); free_message ( _msg_end );
event.timer_release ( session->call->request_timer_id ); event.timer_release ( session->call->request_timer_id );
if ( callbacks[MSI_OnReject].function ) event.rise ( callbacks[MSI_OnReject].function, callbacks[MSI_OnReject].data );
invoke_callback(MSI_OnReject);
session->call->request_timer_id = event.timer_alloc ( handle_timeout, session, m_deftout ); session->call->request_timer_id = event.timer_alloc ( handle_timeout, session, m_deftout );
return 1; return 1;
@ -926,11 +936,10 @@ int handle_recv_cancel ( MSISession *session, MSIMessage *msg )
if ( has_call_error ( session, msg ) == 0 ) if ( has_call_error ( session, msg ) == 0 )
return 0; return 0;
invoke_callback(MSI_OnCancel);
terminate_call ( session ); terminate_call ( session );
if ( callbacks[MSI_OnCancel].function ) event.rise ( callbacks[MSI_OnCancel].function, callbacks[MSI_OnCancel].data );
return 1; return 1;
} }
int handle_recv_end ( MSISession *session, MSIMessage *msg ) int handle_recv_end ( MSISession *session, MSIMessage *msg )
@ -945,10 +954,9 @@ int handle_recv_end ( MSISession *session, MSIMessage *msg )
send_message ( session, _msg_ending, msg->friend_id ); send_message ( session, _msg_ending, msg->friend_id );
free_message ( _msg_ending ); free_message ( _msg_ending );
invoke_callback(MSI_OnEnd);
terminate_call ( session ); terminate_call ( session );
if ( callbacks[MSI_OnEnd].function ) event.rise ( callbacks[MSI_OnEnd].function, callbacks[MSI_OnEnd].data );
return 1; return 1;
} }
@ -961,7 +969,8 @@ int handle_recv_ringing ( MSISession *session, MSIMessage *msg )
return 0; return 0;
session->call->ringing_timer_id = event.timer_alloc ( handle_timeout, session, session->call->ringing_tout_ms ); session->call->ringing_timer_id = event.timer_alloc ( handle_timeout, session, session->call->ringing_tout_ms );
if ( callbacks[MSI_OnRinging].function ) event.rise ( callbacks[MSI_OnRinging].function, callbacks[MSI_OnRinging].data );
invoke_callback(MSI_OnRinging);
return 1; return 1;
} }
@ -1000,7 +1009,8 @@ int handle_recv_starting ( MSISession *session, MSIMessage *msg )
flush_peer_type ( session, msg, 0 ); flush_peer_type ( session, msg, 0 );
if ( callbacks[MSI_OnStarting].function ) event.rise ( callbacks[MSI_OnStarting].function, callbacks[MSI_OnStarting].data ); invoke_callback(MSI_OnStarting);
event.timer_release ( session->call->ringing_timer_id ); event.timer_release ( session->call->ringing_timer_id );
return 1; return 1;
@ -1015,8 +1025,7 @@ int handle_recv_ending ( MSISession *session, MSIMessage *msg )
/* Stop timer */ /* Stop timer */
event.timer_release ( session->call->request_timer_id ); event.timer_release ( session->call->request_timer_id );
/* Call callback */ invoke_callback(MSI_OnEnding);
if ( callbacks[MSI_OnEnding].function ) callbacks[MSI_OnEnding].function (callbacks[MSI_OnEnding].data);
/* Terminate call */ /* Terminate call */
terminate_call ( session ); terminate_call ( session );
@ -1034,10 +1043,9 @@ int handle_recv_error ( MSISession *session, MSIMessage *msg )
session->last_error_str = stringify_error ( session->last_error_id ); session->last_error_str = stringify_error ( session->last_error_id );
} }
invoke_callback(MSI_OnEnding);
terminate_call ( session ); terminate_call ( session );
if ( callbacks[MSI_OnEnding].function ) event.rise ( callbacks[MSI_OnEnding].function, callbacks[MSI_OnEnding].data );
return 1; return 1;
} }

2
toxav/msi.h
View File

@ -33,7 +33,7 @@
#define CALL_ID_LEN 12 #define CALL_ID_LEN 12
typedef void *( *MSICallback ) ( void *arg ); typedef void ( *MSICallback ) ( void *arg );
/** /**

30
toxav/phone.c
View File

@ -912,7 +912,7 @@ int phone_startmedia_loop ( ToxAv *arg )
/* Some example callbacks */ /* Some example callbacks */
void *callback_recv_invite ( void *_arg ) void callback_recv_invite ( void *_arg )
{ {
assert(_arg); assert(_arg);
@ -926,14 +926,12 @@ void *callback_recv_invite ( void *_arg )
break; break;
} }
pthread_exit(NULL);
} }
void *callback_recv_ringing ( void *_arg ) void callback_recv_ringing ( void *_arg )
{ {
INFO ( "Ringing!" ); INFO ( "Ringing!" );
pthread_exit(NULL);
} }
void *callback_recv_starting ( void *_arg ) void callback_recv_starting ( void *_arg )
{ {
if ( 0 != phone_startmedia_loop(_arg) ) { if ( 0 != phone_startmedia_loop(_arg) ) {
INFO("Starting call failed!"); INFO("Starting call failed!");
@ -941,9 +939,8 @@ void *callback_recv_starting ( void *_arg )
INFO ("Call started! ( press h to hangup )"); INFO ("Call started! ( press h to hangup )");
} }
pthread_exit(NULL);
} }
void *callback_recv_ending ( void *_arg ) void callback_recv_ending ( void *_arg )
{ {
_phone->running_encaud = 0; _phone->running_encaud = 0;
_phone->running_decaud = 0; _phone->running_decaud = 0;
@ -960,18 +957,16 @@ void *callback_recv_ending ( void *_arg )
usleep(10000000); usleep(10000000);
INFO ( "Call ended!" ); INFO ( "Call ended!" );
pthread_exit(NULL);
} }
void *callback_recv_error ( void *_arg ) void callback_recv_error ( void *_arg )
{ {
/*MSISession* _session = _arg; /*MSISession* _session = _arg;
INFO( "Error: %s", _session->last_error_str ); */ INFO( "Error: %s", _session->last_error_str ); */
pthread_exit(NULL);
} }
void *callback_call_started ( void *_arg ) void callback_call_started ( void *_arg )
{ {
if ( 0 != phone_startmedia_loop(_arg) ) { if ( 0 != phone_startmedia_loop(_arg) ) {
INFO("Starting call failed!"); INFO("Starting call failed!");
@ -979,19 +974,16 @@ void *callback_call_started ( void *_arg )
INFO ("Call started! ( press h to hangup )"); INFO ("Call started! ( press h to hangup )");
} }
pthread_exit(NULL);
} }
void *callback_call_canceled ( void *_arg ) void callback_call_canceled ( void *_arg )
{ {
INFO ( "Call canceled!" ); INFO ( "Call canceled!" );
pthread_exit(NULL);
} }
void *callback_call_rejected ( void *_arg ) void callback_call_rejected ( void *_arg )
{ {
INFO ( "Call rejected!" ); INFO ( "Call rejected!" );
pthread_exit(NULL);
} }
void *callback_call_ended ( void *_arg ) void callback_call_ended ( void *_arg )
{ {
_phone->running_encaud = 0; _phone->running_encaud = 0;
_phone->running_decaud = 0; _phone->running_decaud = 0;
@ -1011,13 +1003,11 @@ void *callback_call_ended ( void *_arg )
toxav_kill_transmission(_phone->av); toxav_kill_transmission(_phone->av);
INFO ( "Call ended!" ); INFO ( "Call ended!" );
pthread_exit(NULL);
} }
void *callback_requ_timeout ( void *_arg ) void callback_requ_timeout ( void *_arg )
{ {
INFO( "No answer! " ); INFO( "No answer! " );
pthread_exit(NULL);
} }
av_session_t *av_init_session() av_session_t *av_init_session()

2
toxav/toxav.h
View File

@ -29,7 +29,7 @@
/* vpx_image_t */ /* vpx_image_t */
#include <vpx/vpx_image.h> #include <vpx/vpx_image.h>
typedef void *( *ToxAVCallback ) ( void *arg ); typedef void ( *ToxAVCallback ) ( void *arg );
typedef struct _ToxAv ToxAv; typedef struct _ToxAv ToxAv;
#ifndef __TOX_DEFINED__ #ifndef __TOX_DEFINED__