summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroskwon <kos@dev3>2014-06-18 06:40:31 (GMT)
committeroskwon <kos@dev3>2014-06-18 06:40:31 (GMT)
commit48a6d1332dc7f6791854511133bac81161db9a4d (patch)
treed26f37232ee6bb19e2bfa91fff25ec603ad70dde
parentcdddeb93b8a0f475e8e451188f6f04dc94355770 (diff)
Rename openpli-streamproxy to external.
-rw-r--r--src/Makefile2
-rw-r--r--src/external/mpegts.cpp (renamed from src/openpli-streamproxy/mpegts.cpp)3
-rw-r--r--src/external/mpegts.h (renamed from src/openpli-streamproxy/mpegts.h)4
-rw-r--r--src/external/trap.cpp (renamed from src/openpli-streamproxy/trap.cpp)0
-rw-r--r--src/external/trap.h (renamed from src/openpli-streamproxy/trap.h)0
5 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 9369206..a5a32d8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,7 +31,7 @@ LD=$(CROSS)ld
STRIP=$(CROSS)strip
RM=rm -f
-CFLAGS += -I. -I./openpli-streamproxy -I$(SYSROOT)/usr/include
+CFLAGS += -I. -I./external -I$(SYSROOT)/usr/include
LDFLAGS += -L$(SYSROOT)/usr/lib -lpthread -lrt
OBJS=$(SRCS:.cpp=.o)
diff --git a/src/openpli-streamproxy/mpegts.cpp b/src/external/mpegts.cpp
index c6ab15f..c70b92f 100644
--- a/src/openpli-streamproxy/mpegts.cpp
+++ b/src/external/mpegts.cpp
@@ -3,7 +3,7 @@
#include "mpegts.h"
//#include "util.h" // oskwon
-#include "Utils.h" // oskwon
+#include "Util.h" // oskwon
#include <unistd.h>
#include <stddef.h>
@@ -29,6 +29,7 @@ MpegTS::MpegTS(string filename, bool request_time_seek_in) throw(trap)
: private_fd(true),
request_time_seek(request_time_seek_in)
{
+ // oskwon : add option O_LARGEFILE.
if((fd = open(filename.c_str(), O_RDONLY | O_LARGEFILE, 0)) < 0)
throw(trap("MpegTS::MpegTS: cannot open file"));
diff --git a/src/openpli-streamproxy/mpegts.h b/src/external/mpegts.h
index 8bbf17e..9eaec7c 100644
--- a/src/openpli-streamproxy/mpegts.h
+++ b/src/external/mpegts.h
@@ -3,7 +3,6 @@
//#include "config.h" // oskwon
#include "trap.h"
-#include "Source.h" // oskwon
#include <map>
#include <string>
@@ -11,7 +10,8 @@
#include <stdint.h>
#include <sys/types.h>
-class MpegTS : public Source // oskwon
+#include "Source.h" // oskwon
+class MpegTS : public Source // oskwon : inherit Source class.
{
private:
diff --git a/src/openpli-streamproxy/trap.cpp b/src/external/trap.cpp
index b57b23e..b57b23e 100644
--- a/src/openpli-streamproxy/trap.cpp
+++ b/src/external/trap.cpp
diff --git a/src/openpli-streamproxy/trap.h b/src/external/trap.h
index ed33328..ed33328 100644
--- a/src/openpli-streamproxy/trap.h
+++ b/src/external/trap.h