StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #635 from Martijnvdc/master

Browse Source 
added AV_codec.h to public headers
This commit is contained in:
irungentoo 2013-10-28 12:00:11 -07:00
commit 2bdce93437
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toxmsi/Makefile.inc
View File

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

2
toxmsi/phone.c
View File

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

2
toxmsi/phone.h
View File

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

2
toxmsi/AV_codec.c → toxmsi/toxmedia.c
View File

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

4
toxmsi/AV_codec.h → toxmsi/toxmedia.h
View File

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