summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn <martijnvdc@gmail.com>2013-10-28 14:19:38 +0100
committerMartijn <martijnvdc@gmail.com>2013-10-28 14:19:38 +0100
commit5971d8f7957fc887fbdcffcbd90012637a4c359f (patch)
tree2a351cf4b838f4267ae6aa4ce292f297df2c5ac1
parent3d019fb115aafb5635c162a2cd0b61006bce9fc8 (diff)
renamed AV_codec to toxmedia
-rw-r--r--toxmsi/Makefile.inc5
-rw-r--r--toxmsi/phone.c2
-rw-r--r--toxmsi/phone.h2
-rw-r--r--toxmsi/toxmedia.c (renamed from toxmsi/AV_codec.c)2
-rw-r--r--toxmsi/toxmedia.h (renamed from toxmsi/AV_codec.h)0
5 files changed, 5 insertions, 6 deletions
diff --git a/toxmsi/Makefile.inc b/toxmsi/Makefile.inc
index af8c7eef..7d620e70 100644
--- a/toxmsi/Makefile.inc
+++ b/toxmsi/Makefile.inc
@@ -4,7 +4,7 @@ lib_LTLIBRARIES += libtoxmsi.la
4 4
5libtoxmsi_la_include_HEADERS = \ 5libtoxmsi_la_include_HEADERS = \
6 ../toxmsi/toxmsi.h \ 6 ../toxmsi/toxmsi.h \
7 ../toxmsi/AV_codec.h 7 ../toxmsi/toxmedia.h
8 8
9libtoxmsi_la_includedir = $(includedir)/tox 9libtoxmsi_la_includedir = $(includedir)/tox
10 10
@@ -36,8 +36,7 @@ libtoxmsi_la_LIBS = $(NACL_LIBS)
36noinst_PROGRAMS += phone 36noinst_PROGRAMS += phone
37 37
38phone_SOURCES = ../toxmsi/phone.c \ 38phone_SOURCES = ../toxmsi/phone.c \
39 ../toxmsi/AV_codec.h \ 39 ../toxmsi/toxmedia.c
40 ../toxmsi/AV_codec.c
41 40
42phone_CFLAGS = -I../toxcore \ 41phone_CFLAGS = -I../toxcore \
43 -I../toxrtp \ 42 -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 @@
16#include <stdlib.h> 16#include <stdlib.h>
17/* #include <termios.h> Can this be removed? */ 17/* #include <termios.h> Can this be removed? */
18#include <pthread.h> 18#include <pthread.h>
19#include "AV_codec.h" 19#include "toxmedia.h"
20 20
21 21
22 22
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 @@
8#include "../toxrtp/tests/test_helper.h" 8#include "../toxrtp/tests/test_helper.h"
9#include <assert.h> 9#include <assert.h>
10#include <pthread.h> 10#include <pthread.h>
11#include "AV_codec.h" 11#include "toxmedia.h"
12 12
13/* Define client version */ 13/* Define client version */
14#define _USERAGENT "tox_phone-v.0.2.1" 14#define _USERAGENT "tox_phone-v.0.2.1"
diff --git a/toxmsi/AV_codec.c b/toxmsi/toxmedia.c
index 8a50c894..4c9f5261 100644
--- a/toxmsi/AV_codec.c
+++ b/toxmsi/toxmedia.c
@@ -46,7 +46,7 @@
46#include "../toxrtp/toxrtp_message.h" 46#include "../toxrtp/toxrtp_message.h"
47#include "../toxrtp/tests/test_helper.h" 47#include "../toxrtp/tests/test_helper.h"
48#include "phone.h" 48#include "phone.h"
49#include "AV_codec.h" 49#include "toxmedia.h"
50 50
51SDL_Surface *screen; 51SDL_Surface *screen;
52 52
diff --git a/toxmsi/AV_codec.h b/toxmsi/toxmedia.h
index 7eea39ae..7eea39ae 100644
--- a/toxmsi/AV_codec.h
+++ b/toxmsi/toxmedia.h