Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 10:03:01 +01:00
Code Issues Projects Releases Wiki Activity

Updated to latest core

Browse Source
This commit is contained in:
mannol 2014-03-11 00:34:18 +01:00
parent 1fd07837ea
commit da924f07a9
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/audio_call.c
View File

@ -140,25 +140,25 @@ ToxAv* init_audio(ToxWindow* window, Tox* tox)
/* Streaming stuff from core */ /* Streaming stuff from core */
ASettins.av = toxav_new(tox, window, 0, 0); ASettins.av = toxav_new(tox, 0, 0);
if ( !ASettins.av ) { if ( !ASettins.av ) {
ASettins.errors |= ErrorStartingCoreAudio; ASettins.errors |= ErrorStartingCoreAudio;
return NULL; return NULL;
} }
toxav_register_callstate_callback(callback_call_started, av_OnStart); toxav_register_callstate_callback(callback_call_started, av_OnStart, window);
toxav_register_callstate_callback(callback_call_canceled, av_OnCancel); toxav_register_callstate_callback(callback_call_canceled, av_OnCancel, window);
toxav_register_callstate_callback(callback_call_rejected, av_OnReject); toxav_register_callstate_callback(callback_call_rejected, av_OnReject, window);
toxav_register_callstate_callback(callback_call_ended, av_OnEnd); toxav_register_callstate_callback(callback_call_ended, av_OnEnd, window);
toxav_register_callstate_callback(callback_recv_invite, av_OnInvite); toxav_register_callstate_callback(callback_recv_invite, av_OnInvite, window);
toxav_register_callstate_callback(callback_recv_ringing, av_OnRinging); toxav_register_callstate_callback(callback_recv_ringing, av_OnRinging, window);
toxav_register_callstate_callback(callback_recv_starting, av_OnStarting); toxav_register_callstate_callback(callback_recv_starting, av_OnStarting, window);
toxav_register_callstate_callback(callback_recv_ending, av_OnEnding); toxav_register_callstate_callback(callback_recv_ending, av_OnEnding, window);
toxav_register_callstate_callback(callback_recv_error, av_OnError); toxav_register_callstate_callback(callback_recv_error, av_OnError, window);
toxav_register_callstate_callback(callback_requ_timeout, av_OnRequestTimeout); toxav_register_callstate_callback(callback_requ_timeout, av_OnRequestTimeout, window);
return ASettins.av; return ASettins.av;
} }
@ -295,8 +295,8 @@ cleanup:
int start_transmission() int start_transmission()
{ {
if ( !toxav_audio_decoding(ASettins.av) || if ( !toxav_capability_supported(ASettins.av, AudioDecoding) ||
!toxav_audio_encoding(ASettins.av) ) !toxav_capability_supported(ASettins.av, AudioEncoding) )
return -1; return -1;
/* Don't provide support for video */ /* Don't provide support for video */
@ -324,8 +324,8 @@ int stop_transmission()
* Callbacks * Callbacks
*/ */
#define CB_BODY(Arg, onFunc) do { ToxWindow* windows = toxav_get_agent_handler(Arg); int i;\ #define CB_BODY(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], Arg); } while (0) for (i = 0; i < MAX_WINDOWS_NUM; ++i) if (windows[i].onFunc != NULL) windows[i].onFunc(&windows[i], ASettins.av); } while (0)
void *callback_recv_invite ( void* arg ) void *callback_recv_invite ( void* arg )
{ {

4
src/file_senders.c
View File

@ -20,6 +20,10 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>

4
src/log.c
View File

@ -20,6 +20,10 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>

4
src/misc_tools.c
View File

@ -20,6 +20,10 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>

4
src/toxic_strings.c
View File

@ -20,6 +20,10 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>