Merge pull request #635 from Martijnvdc/master

added AV_codec.h to public headers

toxmsi/Makefile.inc

@@ -3,7 +3,8 @@ if BUILD_AV
 lib_LTLIBRARIES += libtoxmsi.la
 
 libtoxmsi_la_include_HEADERS = \
-                        ../toxmsi/toxmsi.h
+                        ../toxmsi/toxmsi.h \
+                        ../toxmsi/toxmedia.h
 
 libtoxmsi_la_includedir = $(includedir)/tox
 
@@ -35,8 +36,7 @@ libtoxmsi_la_LIBS    = $(NACL_LIBS)
 noinst_PROGRAMS += phone
 
 phone_SOURCES = ../toxmsi/phone.c \
-                ../toxmsi/AV_codec.h \
-                ../toxmsi/AV_codec.c
+                ../toxmsi/toxmedia.c
 
 phone_CFLAGS =  -I../toxcore \
                 -I../toxrtp \

toxmsi/phone.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 /* #include <termios.h> Can this be removed? */
 #include <pthread.h>
-#include "AV_codec.h"
+#include "toxmedia.h"
 
 
 

toxmsi/phone.h

@@ -8,7 +8,7 @@
 #include "../toxrtp/tests/test_helper.h"
 #include <assert.h>
 #include <pthread.h>
-#include "AV_codec.h"
+#include "toxmedia.h"
 
 /* Define client version */
 #define _USERAGENT "tox_phone-v.0.2.1"

toxmsi/toxmedia.c

@@ -46,7 +46,7 @@
 #include "../toxrtp/toxrtp_message.h"
 #include "../toxrtp/tests/test_helper.h"
 #include "phone.h"
-#include "AV_codec.h"
+#include "toxmedia.h"
 
 SDL_Surface *screen;
 

toxmsi/toxmedia.h

@@ -35,8 +35,8 @@
 #include <pthread.h>
 #include <AL/al.h>
 #include <AL/alc.h>
-#include "../toxrtp/toxrtp.h"
-#include "../toxcore/tox.h"
+#include "toxrtp.h"
+#include "tox.h"
 
 #include <SDL/SDL.h>
 #include <opus/opus.h>