1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 12:16:44 +02:00

Implemented OpenCV demo to demonstrate video device listing and set up code structure for video

This commit is contained in:
cnhenry
2015-05-25 16:59:06 -05:00
parent ca1fca5aa5
commit 6e90072fb8
21 changed files with 783 additions and 15 deletions

View File

@ -54,7 +54,8 @@
#include "settings.h"
#include "log.h"
#include "notify.h"
#include "device.h"
#include "audio_device.h"
#include "video_device.h"
#include "message_queue.h"
#include "execute.h"
#include "term_mplex.h"
@ -65,6 +66,9 @@
#ifdef AUDIO
#include "audio_call.h"
#ifdef VIDEO
#include "video_call.h"
#endif /* VIDEO */
ToxAv *av;
#endif /* AUDIO */
@ -131,6 +135,10 @@ 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);
@ -1131,6 +1139,11 @@ 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)