3 files changed, 56 insertions, 20 deletions

diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 02f4af67..b33f1cef 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -1,7 +1,7 @@
 if BUILD_TESTS
 
-TESTS = messenger_autotest# crypto_test network_test assoc_test onion_test TCP_test tox_test
-check_PROGRAMS = messenger_autotest# crypto_test network_test assoc_test onion_test TCP_test tox_test
+TESTS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test
+check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test
 
 AUTOTEST_CFLAGS = \
                          $(LIBSODIUM_CFLAGS) \
@@ -20,8 +20,8 @@ AUTOTEST_LDADD = \
 
 
 if BUILD_AV
-TESTS += toxav_basic_test #toxav_many_test
-check_PROGRAMS += toxav_basic_test #toxav_many_test
+TESTS += toxav_basic_test toxav_many_test
+check_PROGRAMS += toxav_basic_test toxav_many_test
 AUTOTEST_LDADD += libtoxav.la
 endif
 
@@ -32,7 +32,46 @@ messenger_autotest_CFLAGS = $(AUTOTEST_CFLAGS)
 messenger_autotest_LDADD = $(AUTOTEST_LDADD)
 
 
+crypto_test_SOURCES = ../auto_tests/crypto_test.c
 
+crypto_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+crypto_test_LDADD = $(AUTOTEST_LDADD)
+
+
+network_test_SOURCES = ../auto_tests/network_test.c
+
+network_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+network_test_LDADD = $(AUTOTEST_LDADD)
+
+
+assoc_test_SOURCES = ../auto_tests/assoc_test.c
+
+assoc_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+assoc_test_LDADD = $(AUTOTEST_LDADD)
+
+
+onion_test_SOURCES = ../auto_tests/onion_test.c
+
+onion_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+onion_test_LDADD = $(AUTOTEST_LDADD)
+
+
+TCP_test_SOURCES = ../auto_tests/TCP_test.c
+
+TCP_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+TCP_test_LDADD = $(AUTOTEST_LDADD)
+
+
+tox_test_SOURCES = ../auto_tests/tox_test.c
+
+tox_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+tox_test_LDADD = $(AUTOTEST_LDADD)
 
 
 
@@ -44,14 +83,13 @@ toxav_basic_test_CFLAGS = $(AUTOTEST_CFLAGS)
 toxav_basic_test_LDADD = $(AUTOTEST_LDADD)
 
 
-#toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c
+toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c
 
-#toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS)
+toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS)
 
-#toxav_many_test_LDADD = $(AUTOTEST_LDADD)
+toxav_many_test_LDADD = $(AUTOTEST_LDADD)
 endif
 
 endif
 
-EXTRA_DIST +=           $(top_srcdir)/auto_tests/friends_test.c
-
+EXTRA_DIST += $(top_srcdir)/auto_tests/friends_test.c
\ No newline at end of file
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index 528b1f9d..5c292168 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -49,7 +49,7 @@ typedef struct _Status {
 } Status;
 
 /* My default settings */
-static ToxAvCodecSettings muhcaps;
+static ToxAvCSettings muhcaps;
 
 void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
 {
@@ -82,7 +82,7 @@ void callback_recv_starting ( void *av, int32_t call_index, void *_arg )
     /* Alice always sends invite */
     printf("Call started on Alice side...\n");
     cast->Alice.status = InCall;
-    toxav_prepare_transmission(av, call_index, 3, 0, 1);
+    toxav_prepare_transmission(av, call_index, av_jbufdc, av_VADd, 1);
 }
 void callback_recv_ending ( void *av, int32_t call_index, void *_arg )
 {
@@ -105,7 +105,7 @@ void callback_call_started ( void *av, int32_t call_index, void *_arg )
     /* Alice always sends invite */
     printf("Call started on Bob side...\n");
     cast->Bob.status = InCall;
-    toxav_prepare_transmission(av, call_index, 3, 0, 1);
+    toxav_prepare_transmission(av, call_index, av_jbufdc, av_VADd, 1);
 }
 void callback_call_canceled ( void *av, int32_t call_index, void *_arg )
 {
@@ -133,7 +133,7 @@ void callback_call_ended ( void *av, int32_t call_index, void *_arg )
 
 void callback_call_type_change ( void *av, int32_t call_index, void *_arg )
 {
-    ToxAvCodecSettings csettings;
+    ToxAvCSettings csettings;
     toxav_get_peer_csettings(av, call_index, 0, &csettings);
     
     printf("New settings: \n"
@@ -312,7 +312,7 @@ START_TEST(test_AV_flows)
             step++; /* This terminates the loop */
             toxav_kill_transmission(status_control.Alice.av, status_control.Alice.call_index);
             toxav_kill_transmission(status_control.Bob.av, status_control.Bob.call_index);
-
+            
             /* Call over Alice hangs up */
             toxav_hangup(status_control.Alice.av, status_control.Alice.call_index);
         }
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 18058c1f..6a70ff33 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -174,7 +174,7 @@ void *in_thread_call (void *arg)
 
         switch ( step ) {
             case 0: /* CALLER */
-                toxav_call(this_call->Caller.av, &call_idx, this_call->Callee.id, TypeVideo, 10);
+                toxav_call(this_call->Caller.av, &call_idx, this_call->Callee.id, &av_DefaultSettings, 10);
                 call_print(call_idx, "Calling ...");
                 step++;
                 break;
@@ -182,7 +182,7 @@ void *in_thread_call (void *arg)
             case 1: /* CALLEE */
                 if (this_call->Caller.status == Ringing) {
                     call_print(call_idx, "Callee answers ...");
-                    toxav_answer(this_call->Callee.av, 0, TypeVideo);
+                    toxav_answer(this_call->Callee.av, 0, &av_DefaultSettings);
                     step++;
                     start = time(NULL);
                 }
@@ -193,11 +193,9 @@ void *in_thread_call (void *arg)
                 if (this_call->Caller.status == InCall) { /* I think this is okay */
                     call_print(call_idx, "Sending rtp ...");
 
-                    ToxAvCodecSettings cast = av_DefaultSettings;
-
                     c_sleep(1000); /* We have race condition here */
-                    toxav_prepare_transmission(this_call->Callee.av, 0, &cast, 1);
-                    toxav_prepare_transmission(this_call->Caller.av, call_idx, &cast, 1);
+                    toxav_prepare_transmission(this_call->Callee.av, 0, 3, 0, 1);
+                    toxav_prepare_transmission(this_call->Caller.av, call_idx, 3, 0, 1);
 
                     int payload_size = toxav_prepare_audio_frame(this_call->Caller.av, call_idx, prepared_payload, RTP_PAYLOAD_SIZE,
                                        sample_payload, frame_size);