Refactoring and fix related to invite callback not being fired

src/toxic.c

@@ -55,7 +55,6 @@
 #include "log.h"
 #include "notify.h"
 #include "audio_device.h"
-#include "video_device.h"
 #include "message_queue.h"
 #include "execute.h"
 #include "term_mplex.h"
@@ -66,9 +65,6 @@
 
 #ifdef AUDIO
 #include "audio_call.h"
-#ifdef VIDEO
-#include "video_call.h"
-#endif /* VIDEO */
 ToxAV *av;
 #endif /* AUDIO */
 
@@ -135,10 +131,6 @@ void exit_toxic_success(Tox *m)
     terminate_audio();
 #endif /* AUDIO */
 
-#ifdef VIDEO
-    terminate_video();
-#endif /* VIDEO */
-
     free(DATA_FILE);
     free(BLOCK_FILE);
     free(user_settings);
@@ -848,7 +840,7 @@ void *thread_audio(void *data)
         toxav_iterate(av);
         pthread_mutex_unlock(&Winthread.lock);
 
-        usleep(2 * 1000);
+        usleep(toxav_iteration_interval(av) * 1000);
     }
 }
 #endif  /* AUDIO */
@@ -1139,11 +1131,6 @@ int main(int argc, char *argv[])
 #ifdef AUDIO
 
     av = init_audio(prompt, m);
-    
-//#ifdef VIDEO
-//   av = init_video(prompt, m, av);
-//
-//#endif /* VIDEO*/
 
     /* audio thread */
     if (pthread_create(&audio_thread.tid, NULL, thread_audio, (void *) av) != 0)