summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib/input
diff options
context:
space:
mode:
Diffstat (limited to 'mpeglib/lib/input')
-rw-r--r--mpeglib/lib/input/CMakeLists.txt51
-rw-r--r--mpeglib/lib/input/cdromRawAccess.cpp2
-rw-r--r--mpeglib/lib/input/inputDetector.cpp4
3 files changed, 54 insertions, 3 deletions
diff --git a/mpeglib/lib/input/CMakeLists.txt b/mpeglib/lib/input/CMakeLists.txt
new file mode 100644
index 00000000..37e1f539
--- /dev/null
+++ b/mpeglib/lib/input/CMakeLists.txt
@@ -0,0 +1,51 @@
+#################################################
+#
+# (C) 2017 Slávek Banko
+# slavek (DOT) banko (AT) axis.cz
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### mpeg_input (library) ######################
+
+tde_add_library( mpeg_input STATIC_PIC
+ SOURCES
+ inputStream.cpp fileInputStream.cpp
+ inputPlugin.cpp
+ cdromToc.cpp cdromRawAccess.cpp
+ cdromInputStream.cpp
+ bufferInputStream.cpp
+ simpleRingBuffer.cpp
+ cdromAccess.cpp inputDetector.cpp
+ httpInputStream.cpp
+ threadSafeInputStream.cpp
+ cddaInputStream.cpp
+ fileAccessWrapper.cpp
+)
+
+
+##### other data ################################
+
+install(
+ FILES
+ inputStream.h fileInputStream.h
+ inputPlugin.h
+ cdromInputStream.h bufferInputStream.h
+ inputDetector.h httpInputStream.h
+ threadSafeInputStream.h cddaInputStream.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/mpeglib/input
+)
diff --git a/mpeglib/lib/input/cdromRawAccess.cpp b/mpeglib/lib/input/cdromRawAccess.cpp
index b0df4747..e23158f6 100644
--- a/mpeglib/lib/input/cdromRawAccess.cpp
+++ b/mpeglib/lib/input/cdromRawAccess.cpp
@@ -55,7 +55,7 @@ int CDRomRawAccess::open(const char* filename) {
if (strlen(filename) <= 1) {
filename="/dev/cdrom";
}
- char* openfile=strchr(filename,'/');
+ const char* openfile=strchr(filename,'/');
cout << "openfile:"<<openfile<<endl;
cdfile=fopen(openfile, "rb");
lOpen=false;
diff --git a/mpeglib/lib/input/inputDetector.cpp b/mpeglib/lib/input/inputDetector.cpp
index 28bcad5c..56fae0e2 100644
--- a/mpeglib/lib/input/inputDetector.cpp
+++ b/mpeglib/lib/input/inputDetector.cpp
@@ -119,7 +119,7 @@ char* InputDetector::getExtension(const char* url) {
return NULL;
}
char* back=NULL;
- char* extStart=strrchr(url,'.');
+ const char* extStart=strrchr(url,'.');
if (extStart != NULL) {
cout << "extStart:"<<extStart<<endl;
back=strdup(extStart);
@@ -172,7 +172,7 @@ char* InputDetector::getFilename(const char* url) {
if (url == NULL) {
return NULL;
}
- char* startSlash=strrchr(url,'/');
+ const char* startSlash=strrchr(url,'/');
if (startSlash == NULL) {
return NULL;
}