Merge branch 'master' into harden

Also removed some old, useless loading code.

6 files changed, 15 insertions, 13 deletions

diff --git a/toxmsi/Makefile.inc b/toxmsi/Makefile.inc
index 27678bc0..7d620e70 100644
--- a/toxmsi/Makefile.inc
+++ b/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 \
diff --git a/toxmsi/phone.c b/toxmsi/phone.c
index f14d0323..432be94c 100644
--- a/toxmsi/phone.c
+++ b/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"
 
 
 
diff --git a/toxmsi/phone.h b/toxmsi/phone.h
index d661dcfd..f96aac73 100644
--- a/toxmsi/phone.h
+++ b/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"
diff --git a/toxmsi/AV_codec.c b/toxmsi/toxmedia.c
index 82e6a320..4c9f5261 100644
--- a/toxmsi/AV_codec.c
+++ b/toxmsi/toxmedia.c
@@ -36,8 +36,8 @@
 #include <libavutil/opt.h>
 #include <AL/al.h>
 #include <AL/alc.h>
-#include <SDL.h>
-#include <SDL_thread.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
 #include <pthread.h>
 #include <opus/opus.h>
 
@@ -46,7 +46,9 @@
 #include "../toxrtp/toxrtp_message.h"
 #include "../toxrtp/tests/test_helper.h"
 #include "phone.h"
-#include "AV_codec.h"
+#include "toxmedia.h"
+
+SDL_Surface *screen;
 
 int display_received_frame(codec_state *cs, AVFrame *r_video_frame)
 {
diff --git a/toxmsi/AV_codec.h b/toxmsi/toxmedia.h
index 641cf486..7eea39ae 100644
--- a/toxmsi/AV_codec.h
+++ b/toxmsi/toxmedia.h
@@ -35,10 +35,10 @@
 #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.h>
+#include <SDL/SDL.h>
 #include <opus/opus.h>
 
 /* ffmpeg VP8 codec ID */
@@ -75,7 +75,7 @@
 #define DEFAULT_WEBCAM "0"
 #endif
 
-SDL_Surface     *screen;
+extern SDL_Surface *screen;
 
 typedef struct {
     SDL_Overlay *bmp;
diff --git a/toxmsi/toxmsi.h b/toxmsi/toxmsi.h
index 69d5144a..d8985c64 100644
--- a/toxmsi/toxmsi.h
+++ b/toxmsi/toxmsi.h
@@ -28,7 +28,7 @@
 #define _MSI_IMPL_H_
 
 #include <inttypes.h>
-#include "../toxcore/tox.h"
+#include "tox.h"
 #include <pthread.h>
 
 #define MCBTYPE void