summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeronimo <geronimo013@gmx.de>2012-07-30 15:51:05 (GMT)
committergeronimo <geronimo013@gmx.de>2012-07-30 15:51:05 (GMT)
commitad667186c0c45cfca9d3f153faec7ce35545b238 (patch)
treedb5ab8a2bb22c418bc8a233db3c4955ed16957c5
parent41922cdaf9c8db57c6b51f090eefe95b0008a0fb (diff)
downloadcmp-ad667186c0c45cfca9d3f153faec7ce35545b238.tar.gz
cmp-ad667186c0c45cfca9d3f153faec7ce35545b238.tar.bz2
created more readers
-rw-r--r--cmps/nbproject/Makefile-Debug.mk26
-rw-r--r--cmps/nbproject/configurations.xml22
-rw-r--r--cmps/nbproject/project.xml2
-rw-r--r--cmps/server.cbp4
-rw-r--r--cmps/server.layout4
-rw-r--r--cmps/serverlib/nbproject/Makefile-Debug.mk16
-rw-r--r--cmps/serverlib/nbproject/configurations.xml10
-rw-r--r--cmps/serverlib/nbproject/project.xml2
-rw-r--r--cmps/serverlib/serverlib.cbp2
-rw-r--r--cmps/serverlib/serverlib.layout12
-rw-r--r--cmps/tests/MetaScanTest.cc31
-rw-r--r--libs/IO/IO.layout37
-rw-r--r--libs/IO/include/ConfigReader.h14
-rw-r--r--libs/IO/src/ConfigReader.cc14
-rw-r--r--libs/mediaScan/include/MediainfoReader.h34
-rw-r--r--libs/mediaScan/mediaScan.cbp2
-rw-r--r--libs/mediaScan/mediaScan.layout28
-rw-r--r--libs/mediaScan/nbproject/Makefile-Debug.mk18
-rw-r--r--libs/mediaScan/nbproject/Makefile-Release.mk18
-rw-r--r--libs/mediaScan/nbproject/Makefile-impl.mk2
-rw-r--r--libs/mediaScan/nbproject/Makefile-variables.mk16
-rw-r--r--libs/mediaScan/nbproject/Package-Debug.bash12
-rw-r--r--libs/mediaScan/nbproject/Package-Release.bash12
-rw-r--r--libs/mediaScan/nbproject/configurations.xml2
-rw-r--r--libs/mediaScan/nbproject/project.xml2
-rw-r--r--libs/mediaScan/src/MediainfoReader.cc69
-rw-r--r--libs/networking/networking.layout28
-rw-r--r--libs/networking/src/ServerConfig.cc14
-rw-r--r--libs/util/util.layout34
-rw-r--r--libs/vdr/vdr.layout16
-rw-r--r--tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp13
-rw-r--r--tests/ConnectionHandlerTest/ConnectionHandlerTest.layout2
-rw-r--r--tests/CredentialPersistence/CredentialPersistence.cbp8
-rw-r--r--tests/FilesystemTest/FilesystemTest.cbp5
-rw-r--r--tests/FilesystemTest/FilesystemTest.layout2
-rw-r--r--tests/JSonTest/JSonTest.cbp11
-rw-r--r--tests/MetaScanTest/MetaScanTest.cbp4
-rw-r--r--tests/MetaScanTest/MetaScanTest.depend27
-rw-r--r--tests/MetaScanTest/MetaScanTest.layout2
-rw-r--r--tests/MetaScanTest/main.cpp76
-rw-r--r--tests/StringBuilderTest/StringBuilderTest.cbp5
41 files changed, 429 insertions, 229 deletions
diff --git a/cmps/nbproject/Makefile-Debug.mk b/cmps/nbproject/Makefile-Debug.mk
index fc3eebf..612b14e 100644
--- a/cmps/nbproject/Makefile-Debug.mk
+++ b/cmps/nbproject/Makefile-Debug.mk
@@ -63,7 +63,7 @@ FFLAGS=
ASFLAGS=
# Link Libraries and Options
-LDLIBSOPTIONS=serverlib/dist/Debug/GNU-Linux-x86/libserverlib.a ../libs/fsScan/dist/Debug/GNU-Linux-x86/libfsscan.a ../libs/networking/dist/Debug/GNU-Linux-x86/libnetworking.a ../libs/IO/dist/Debug/GNU-Linux-x86/libio.a ../libs/util/dist/Debug/GNU-Linux-x86/libutil.a ../libs/vdr/dist/Debug/GNU-Linux-x86/libvdr.a -lpthread -lrt -lssl -lpcrecpp
+LDLIBSOPTIONS=serverlib/dist/Debug/GNU-Linux-x86/libserverlib.a ../libs/mediaScan/dist/Debug/GNU-Linux-x86/libmediascan.a ../libs/networking/dist/Debug/GNU-Linux-x86/libnetworking.a ../libs/IO/dist/Debug/GNU-Linux-x86/libio.a ../libs/util/dist/Debug/GNU-Linux-x86/libutil.a ../libs/vdr/dist/Debug/GNU-Linux-x86/libvdr.a -lpthread -lrt -lssl -lpcrecpp
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
@@ -71,7 +71,7 @@ LDLIBSOPTIONS=serverlib/dist/Debug/GNU-Linux-x86/libserverlib.a ../libs/fsScan/d
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/cmps: serverlib/dist/Debug/GNU-Linux-x86/libserverlib.a
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/cmps: ../libs/fsScan/dist/Debug/GNU-Linux-x86/libfsscan.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/cmps: ../libs/mediaScan/dist/Debug/GNU-Linux-x86/libmediascan.a
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/cmps: ../libs/networking/dist/Debug/GNU-Linux-x86/libnetworking.a
@@ -88,12 +88,12 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/cmps: ${OBJECTFILES}
${OBJECTDIR}/main.o: main.cc
${MKDIR} -p ${OBJECTDIR}
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.cc
# Subprojects
.build-subprojects:
cd serverlib && ${MAKE} -f Makefile CONF=Debug
- cd ../libs/fsScan && ${MAKE} -f Makefile CONF=Debug
+ cd ../libs/mediaScan && ${MAKE} -f Makefile CONF=Debug
cd ../libs/networking && ${MAKE} -f Makefile CONF=Debug
cd ../libs/IO && ${MAKE} -f Makefile CONF=Debug
cd ../libs/util && ${MAKE} -f Makefile CONF=Debug
@@ -102,7 +102,6 @@ ${OBJECTDIR}/main.o: main.cc
cd ../libs/util && ${MAKE} -f Makefile CONF=Debug
cd ../libs/networking && ${MAKE} -f Makefile CONF=Debug
cd ../libs/IO && ${MAKE} -f Makefile CONF=Debug
- cd ../libs/fsScan && ${MAKE} -f Makefile CONF=Debug
cd serverlib && ${MAKE} -f Makefile CONF=Debug
# Build Test Targets
@@ -135,37 +134,37 @@ ${TESTDIR}/TestFiles/f6: ${TESTDIR}/tests/MetaScanTest.o ${OBJECTFILES:%.o=%_nom
${TESTDIR}/tests/CodecTest.o: tests/CodecTest.cc
${MKDIR} -p ${TESTDIR}/tests
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/CodecTest.o tests/CodecTest.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/CodecTest.o tests/CodecTest.cc
${TESTDIR}/tests/ConnectionHandlerTest.o: tests/ConnectionHandlerTest.cc
${MKDIR} -p ${TESTDIR}/tests
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/ConnectionHandlerTest.o tests/ConnectionHandlerTest.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/ConnectionHandlerTest.o tests/ConnectionHandlerTest.cc
${TESTDIR}/tests/FileSystemTest.o: tests/FileSystemTest.cc
${MKDIR} -p ${TESTDIR}/tests
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/FileSystemTest.o tests/FileSystemTest.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/FileSystemTest.o tests/FileSystemTest.cc
${TESTDIR}/tests/FScanTest.o: tests/FScanTest.cc
${MKDIR} -p ${TESTDIR}/tests
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/FScanTest.o tests/FScanTest.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/FScanTest.o tests/FScanTest.cc
${TESTDIR}/tests/JSonTest.o: tests/JSonTest.cc
${MKDIR} -p ${TESTDIR}/tests
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/JSonTest.o tests/JSonTest.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/JSonTest.o tests/JSonTest.cc
${TESTDIR}/tests/MetaScanTest.o: tests/MetaScanTest.cc
${MKDIR} -p ${TESTDIR}/tests
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/MetaScanTest.o tests/MetaScanTest.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -I. -MMD -MP -MF $@.d -o ${TESTDIR}/tests/MetaScanTest.o tests/MetaScanTest.cc
${OBJECTDIR}/main_nomain.o: ${OBJECTDIR}/main.o main.cc
@@ -176,7 +175,7 @@ ${OBJECTDIR}/main_nomain.o: ${OBJECTDIR}/main.o main.cc
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \
${RM} $@.d;\
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/fsScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/main_nomain.o main.cc;\
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -Iserverlib/include -I../libs/mediaScan/include -I../libs/networking/include -I../libs/IO/include -I../libs/util/include -I../libs/vdr/include -Dmain=__nomain -MMD -MP -MF $@.d -o ${OBJECTDIR}/main_nomain.o main.cc;\
else \
${CP} ${OBJECTDIR}/main.o ${OBJECTDIR}/main_nomain.o;\
fi
@@ -203,7 +202,7 @@ ${OBJECTDIR}/main_nomain.o: ${OBJECTDIR}/main.o main.cc
# Subprojects
.clean-subprojects:
cd serverlib && ${MAKE} -f Makefile CONF=Debug clean
- cd ../libs/fsScan && ${MAKE} -f Makefile CONF=Debug clean
+ cd ../libs/mediaScan && ${MAKE} -f Makefile CONF=Debug clean
cd ../libs/networking && ${MAKE} -f Makefile CONF=Debug clean
cd ../libs/IO && ${MAKE} -f Makefile CONF=Debug clean
cd ../libs/util && ${MAKE} -f Makefile CONF=Debug clean
@@ -212,7 +211,6 @@ ${OBJECTDIR}/main_nomain.o: ${OBJECTDIR}/main.o main.cc
cd ../libs/util && ${MAKE} -f Makefile CONF=Debug clean
cd ../libs/networking && ${MAKE} -f Makefile CONF=Debug clean
cd ../libs/IO && ${MAKE} -f Makefile CONF=Debug clean
- cd ../libs/fsScan && ${MAKE} -f Makefile CONF=Debug clean
cd serverlib && ${MAKE} -f Makefile CONF=Debug clean
# Enable dependency checking
diff --git a/cmps/nbproject/configurations.xml b/cmps/nbproject/configurations.xml
index e9180ff..ba892d1 100644
--- a/cmps/nbproject/configurations.xml
+++ b/cmps/nbproject/configurations.xml
@@ -73,7 +73,7 @@
<incDir>
<pElem>include</pElem>
<pElem>serverlib/include</pElem>
- <pElem>../libs/fsScan/include</pElem>
+ <pElem>../libs/mediaScan/include</pElem>
<pElem>../libs/networking/include</pElem>
<pElem>../libs/IO/include</pElem>
<pElem>../libs/util/include</pElem>
@@ -101,15 +101,15 @@
</makeArtifact>
</linkerLibProjectItem>
<linkerLibProjectItem>
- <makeArtifact PL="../libs/fsScan"
+ <makeArtifact PL="../libs/mediaScan"
CT="3"
CN="Debug"
AC="true"
BL="true"
- WD="../libs/fsScan"
+ WD="../libs/mediaScan"
BC="${MAKE} -f Makefile CONF=Debug"
CC="${MAKE} -f Makefile CONF=Debug clean"
- OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a">
+ OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a">
</makeArtifact>
</linkerLibProjectItem>
<linkerLibProjectItem>
@@ -207,25 +207,25 @@
CC="${MAKE} -f Makefile CONF=Debug clean"
OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libio.a">
</makeArtifact>
- <makeArtifact PL="../libs/fsScan"
+ <makeArtifact PL="serverlib"
CT="3"
CN="Debug"
AC="true"
BL="true"
- WD="../libs/fsScan"
+ WD="serverlib"
BC="${MAKE} -f Makefile CONF=Debug"
CC="${MAKE} -f Makefile CONF=Debug clean"
- OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a">
+ OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libserverlib.a">
</makeArtifact>
- <makeArtifact PL="serverlib"
+ <makeArtifact PL="../libs/mediaScan"
CT="3"
CN="Debug"
AC="true"
- BL="true"
- WD="serverlib"
+ BL="false"
+ WD="../libs/mediaScan"
BC="${MAKE} -f Makefile CONF=Debug"
CC="${MAKE} -f Makefile CONF=Debug clean"
- OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libserverlib.a">
+ OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a">
</makeArtifact>
</requiredProjects>
</compileType>
diff --git a/cmps/nbproject/project.xml b/cmps/nbproject/project.xml
index ddc8162..2b3b606 100644
--- a/cmps/nbproject/project.xml
+++ b/cmps/nbproject/project.xml
@@ -12,9 +12,9 @@
<make-dep-project>../libs/util</make-dep-project>
<make-dep-project>../libs/vdr</make-dep-project>
<make-dep-project>../libs/IO</make-dep-project>
- <make-dep-project>../libs/fsScan</make-dep-project>
<make-dep-project>serverlib</make-dep-project>
<make-dep-project>../libs/networking</make-dep-project>
+ <make-dep-project>../libs/mediaScan</make-dep-project>
</make-dep-projects>
<sourceRootList/>
<confList>
diff --git a/cmps/server.cbp b/cmps/server.cbp
index f33bde6..35aa29c 100644
--- a/cmps/server.cbp
+++ b/cmps/server.cbp
@@ -37,13 +37,13 @@
<Add directory="../libs/util/include" />
<Add directory="../libs/networking/include" />
<Add directory="../libs/IO/include" />
- <Add directory="../libs/fsScan/include" />
+ <Add directory="../libs/mediaScan/include" />
<Add directory="serverlib/include" />
<Add directory="include" />
</Compiler>
<Linker>
<Add library="serverlib/libserverlib.a" />
- <Add library="../libs/fsScan/libfsScan.a" />
+ <Add library="../libs/mediaScan/libmediaScan.a" />
<Add library="../libs/networking/libnetworking.a" />
<Add library="../libs/IO/libIO.a" />
<Add library="../libs/util/libutil.a" />
diff --git a/cmps/server.layout b/cmps/server.layout
index e7bfe14..5876f25 100644
--- a/cmps/server.layout
+++ b/cmps/server.layout
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="main.cc" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="main.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="3431" topLine="0" />
+ <Cursor1 position="1038" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/cmps/serverlib/nbproject/Makefile-Debug.mk b/cmps/serverlib/nbproject/Makefile-Debug.mk
index 62660d5..9b947b0 100644
--- a/cmps/serverlib/nbproject/Makefile-Debug.mk
+++ b/cmps/serverlib/nbproject/Makefile-Debug.mk
@@ -73,37 +73,37 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libserverlib.a: ${OBJECTFILES}
${OBJECTDIR}/src/JSonListAssembler.o: src/JSonListAssembler.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/JSonListAssembler.o src/JSonListAssembler.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/JSonListAssembler.o src/JSonListAssembler.cc
${OBJECTDIR}/src/CommandHandler.o: src/CommandHandler.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/CommandHandler.o src/CommandHandler.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/CommandHandler.o src/CommandHandler.cc
${OBJECTDIR}/src/HTMLListAssembler.o: src/HTMLListAssembler.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HTMLListAssembler.o src/HTMLListAssembler.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HTMLListAssembler.o src/HTMLListAssembler.cc
${OBJECTDIR}/src/AbstractMediaRequestHandler.o: src/AbstractMediaRequestHandler.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/AbstractMediaRequestHandler.o src/AbstractMediaRequestHandler.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/AbstractMediaRequestHandler.o src/AbstractMediaRequestHandler.cc
${OBJECTDIR}/src/HTTPMediaResponse.o: src/HTTPMediaResponse.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HTTPMediaResponse.o src/HTTPMediaResponse.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HTTPMediaResponse.o src/HTTPMediaResponse.cc
${OBJECTDIR}/src/MediaListHandler.o: src/MediaListHandler.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/MediaListHandler.o src/MediaListHandler.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/MediaListHandler.o src/MediaListHandler.cc
${OBJECTDIR}/src/MediaFileHandler.o: src/MediaFileHandler.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
- $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/fsScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/MediaFileHandler.o src/MediaFileHandler.cc
+ $(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../../libs/mediaScan/include -I../../libs/networking/include -I../../libs/IO/include -I../../libs/util/include -I../../libs/vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/MediaFileHandler.o src/MediaFileHandler.cc
# Subprojects
.build-subprojects:
@@ -111,7 +111,6 @@ ${OBJECTDIR}/src/MediaFileHandler.o: src/MediaFileHandler.cc
cd ../../libs/util && ${MAKE} -f Makefile CONF=Debug
cd ../../libs/networking && ${MAKE} -f Makefile CONF=Debug
cd ../../libs/IO && ${MAKE} -f Makefile CONF=Debug
- cd ../../libs/fsScan && ${MAKE} -f Makefile CONF=Debug
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
@@ -124,7 +123,6 @@ ${OBJECTDIR}/src/MediaFileHandler.o: src/MediaFileHandler.cc
cd ../../libs/util && ${MAKE} -f Makefile CONF=Debug clean
cd ../../libs/networking && ${MAKE} -f Makefile CONF=Debug clean
cd ../../libs/IO && ${MAKE} -f Makefile CONF=Debug clean
- cd ../../libs/fsScan && ${MAKE} -f Makefile CONF=Debug clean
# Enable dependency checking
.dep.inc: .depcheck-impl
diff --git a/cmps/serverlib/nbproject/configurations.xml b/cmps/serverlib/nbproject/configurations.xml
index b0c9ad3..b37dc04 100644
--- a/cmps/serverlib/nbproject/configurations.xml
+++ b/cmps/serverlib/nbproject/configurations.xml
@@ -51,7 +51,7 @@
<ccTool>
<incDir>
<pElem>include</pElem>
- <pElem>../../libs/fsScan/include</pElem>
+ <pElem>../../libs/mediaScan/include</pElem>
<pElem>../../libs/networking/include</pElem>
<pElem>../../libs/IO/include</pElem>
<pElem>../../libs/util/include</pElem>
@@ -107,15 +107,15 @@
CC="${MAKE} -f Makefile CONF=Debug clean"
OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libio.a">
</makeArtifact>
- <makeArtifact PL="../../libs/fsScan"
+ <makeArtifact PL="../../cmpc/mediaplay"
CT="3"
CN="Debug"
AC="true"
- BL="true"
- WD="../../libs/fsScan"
+ BL="false"
+ WD="../../cmpc/mediaplay"
BC="${MAKE} -f Makefile CONF=Debug"
CC="${MAKE} -f Makefile CONF=Debug clean"
- OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a">
+ OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediaplay.a">
</makeArtifact>
</requiredProjects>
</compileType>
diff --git a/cmps/serverlib/nbproject/project.xml b/cmps/serverlib/nbproject/project.xml
index fee9c5d..ba8869d 100644
--- a/cmps/serverlib/nbproject/project.xml
+++ b/cmps/serverlib/nbproject/project.xml
@@ -9,11 +9,11 @@
<header-extensions>h</header-extensions>
<sourceEncoding>UTF-8</sourceEncoding>
<make-dep-projects>
+ <make-dep-project>../../cmpc/mediaplay</make-dep-project>
<make-dep-project>../../libs/util</make-dep-project>
<make-dep-project>../../libs/vdr</make-dep-project>
<make-dep-project>../../libs/networking</make-dep-project>
<make-dep-project>../../libs/IO</make-dep-project>
- <make-dep-project>../../libs/fsScan</make-dep-project>
</make-dep-projects>
<sourceRootList/>
<confList>
diff --git a/cmps/serverlib/serverlib.cbp b/cmps/serverlib/serverlib.cbp
index f81f760..106bb33 100644
--- a/cmps/serverlib/serverlib.cbp
+++ b/cmps/serverlib/serverlib.cbp
@@ -39,7 +39,7 @@
<Add option="-D_REENTRANT" />
<Add option="-D_GNU_SOURCE=1" />
<Add directory="include" />
- <Add directory="../../libs/fsScan/include" />
+ <Add directory="../../libs/mediaScan/include" />
<Add directory="../../libs/networking/include" />
<Add directory="../../libs/IO/include" />
<Add directory="../../libs/util/include" />
diff --git a/cmps/serverlib/serverlib.layout b/cmps/serverlib/serverlib.layout
index 43baef8..f494bcc 100644
--- a/cmps/serverlib/serverlib.layout
+++ b/cmps/serverlib/serverlib.layout
@@ -6,19 +6,19 @@
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/JSonListAssembler.cc" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/HTMLListAssembler.cc" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1183" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/MediaListHandler.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/JSonListAssembler.cc" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="1183" topLine="0" />
</Cursor>
</File>
- <File name="src/HTMLListAssembler.cc" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/MediaListHandler.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="1040" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/cmps/tests/MetaScanTest.cc b/cmps/tests/MetaScanTest.cc
index bdd51ae..f53c2ca 100644
--- a/cmps/tests/MetaScanTest.cc
+++ b/cmps/tests/MetaScanTest.cc
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: MetaScanTest.cc
* Created: 27.07.2012, 10:03
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: cmps - the backend (server) part of compound media player
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#include <File.h>
@@ -44,7 +44,7 @@ static void parseConfig(const char *FileName)
cConfigReader *cr = new cConfigReader(new cLineReader(new cFileReader(new cFile(FileName))));
cConfigReader::ConfigEntry *ce;
- while ((ce = cr->ReadValue())) {
+ while ((ce = cr->ReadEntry())) {
std::cout << "config entry [" << std::get<0>(*ce) << "] => " << std::get<1>(*ce) << std::endl;
delete ce;
}
@@ -52,14 +52,27 @@ static void parseConfig(const char *FileName)
delete cr;
}
+static void testMediaInfo(const char *FileName)
+{
+ cMediainfoReader *mir = new cMediainfoReader(new cLineReader(new cCommandReader("/usr/bin/mediainfo")));
+ cMediainfoReader::InfoEntry *ie;
+
+ while ((ie = mir->ReadEntry())) {
+ std::cout << "media info - [" << std::get<0>(*ie) << "] ==> " << std::get<1>(*ie) << std::endl;
+ delete ie;
+ }
+ mir->Close();
+ delete mir;
+}
+
static void testMediaFiles(const char *FileName)
{
cLineReader *lr = new cLineReader(new cFileReader(new cFile(FileName)));
const char *line;
while ((line = lr->ReadLine())) {
- std::cout << "media-test-file: " << line << std::endl;
- testPipe(line);
+ std::cout << std::endl << "media-test-file: " << line << std::endl;
+ testMediaInfo(line);
}
lr->Close();
delete lr;
diff --git a/libs/IO/IO.layout b/libs/IO/IO.layout
index 4af9097..05f76d8 100644
--- a/libs/IO/IO.layout
+++ b/libs/IO/IO.layout
@@ -1,9 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="src/FileReader.cc" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/CommandReader.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="737" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="src/LineReader.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="854" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="src/FileRepresentation.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1846" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="src/CommandReader.cc" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="3381" topLine="0" />
</Cursor>
</File>
<File name="src/ConfigReader.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -11,29 +26,29 @@
<Cursor1 position="459" topLine="0" />
</Cursor>
</File>
- <File name="src/File.cc" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/File.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1130" topLine="0" />
</Cursor>
</File>
- <File name="include/ConfigReader.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/FileReader.cc" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="475" topLine="0" />
+ <Cursor1 position="737" topLine="0" />
</Cursor>
</File>
- <File name="src/FileRepresentation.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/Reader.cc" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1846" topLine="0" />
+ <Cursor1 position="1176" topLine="0" />
</Cursor>
</File>
- <File name="src/LineReader.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/File.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="854" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="include/File.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/ConfigReader.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="475" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/libs/IO/include/ConfigReader.h b/libs/IO/include/ConfigReader.h
index 6d0cd30..909d6a8 100644
--- a/libs/IO/include/ConfigReader.h
+++ b/libs/IO/include/ConfigReader.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: ConfigReader.h
* Created: 28. Juli 2012, 18:41
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libIO: classes for files, filesystem and input/output
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef CONFIGREADER_H
@@ -37,7 +37,7 @@ public:
virtual ~cConfigReader();
void Close(void);
- ConfigEntry *ReadValue(void);
+ ConfigEntry *ReadEntry(void);
private:
cLineReader *reader;
diff --git a/libs/IO/src/ConfigReader.cc b/libs/IO/src/ConfigReader.cc
index 152c908..2b31343 100644
--- a/libs/IO/src/ConfigReader.cc
+++ b/libs/IO/src/ConfigReader.cc
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: ConfigReader.cc
* Created: 28. Juli 2012, 18:41
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libIO: classes for files, filesystem and input/output
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#include <ConfigReader.h>
@@ -45,7 +45,7 @@ void cConfigReader::Close(void)
}
}
-cConfigReader::ConfigEntry *cConfigReader::ReadValue()
+cConfigReader::ConfigEntry *cConfigReader::ReadEntry()
{
if (!reader) return NULL;
const char *line = reader->ReadLine();
diff --git a/libs/mediaScan/include/MediainfoReader.h b/libs/mediaScan/include/MediainfoReader.h
new file mode 100644
index 0000000..f45b5e7
--- /dev/null
+++ b/libs/mediaScan/include/MediainfoReader.h
@@ -0,0 +1,34 @@
+/*
+ * File: MediainfoReader.h
+ * Author: django
+ *
+ * Created on 30. Juli 2012, 15:03
+ */
+
+#ifndef MEDIAINFOREADER_H
+#define MEDIAINFOREADER_H
+
+#include <tuple>
+#include <string>
+#include <vector>
+
+class cLineReader;
+class cMediainfoReader {
+public:
+ typedef std::tuple <std::string, std::string> InfoEntry;
+
+ cMediainfoReader(cLineReader *LineReader);
+ virtual ~cMediainfoReader();
+
+ void AddValuableKey(const char *Key);
+ void Close(void);
+ bool IsValuable(std::string &key);
+ InfoEntry *ReadEntry(void);
+
+private:
+ cLineReader *reader;
+ std::vector<std::string> valuableKeys;
+ };
+
+#endif /* MEDIAINFOREADER_H */
+
diff --git a/libs/mediaScan/mediaScan.cbp b/libs/mediaScan/mediaScan.cbp
index 6d4d7ec..3ee2b08 100644
--- a/libs/mediaScan/mediaScan.cbp
+++ b/libs/mediaScan/mediaScan.cbp
@@ -51,6 +51,7 @@
<Unit filename="include/FSMediaScanner.h" />
<Unit filename="include/LegacyVdrRecording.h" />
<Unit filename="include/MediaFactory.h" />
+ <Unit filename="include/MediainfoReader.h" />
<Unit filename="include/Movie.h" />
<Unit filename="include/Picture.h" />
<Unit filename="include/VdrRecording.h" />
@@ -61,6 +62,7 @@
<Unit filename="src/FSMediaScanner.cc" />
<Unit filename="src/LegacyVdrRecording.cc" />
<Unit filename="src/MediaFactory.cc" />
+ <Unit filename="src/MediainfoReader.cc" />
<Unit filename="src/Movie.cc" />
<Unit filename="src/Picture.cc" />
<Unit filename="src/VdrRecording.cc" />
diff --git a/libs/mediaScan/mediaScan.layout b/libs/mediaScan/mediaScan.layout
index 4398ab3..e7fed61 100644
--- a/libs/mediaScan/mediaScan.layout
+++ b/libs/mediaScan/mediaScan.layout
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="src/VdrRecording.cc" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/MediainfoReader.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1404" topLine="0" />
+ <Cursor1 position="459" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="include/AbstractMedia.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1008" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="src/MediainfoReader.cc" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1061" topLine="0" />
</Cursor>
</File>
<File name="src/LegacyVdrRecording.cc" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -11,14 +21,19 @@
<Cursor1 position="1450" topLine="0" />
</Cursor>
</File>
+ <File name="include/MediaFactory.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1670" topLine="0" />
+ </Cursor>
+ </File>
<File name="src/AbstractMedia.cc" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1453" topLine="0" />
</Cursor>
</File>
- <File name="include/MediaFactory.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/VdrRecording.cc" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1670" topLine="0" />
+ <Cursor1 position="1404" topLine="0" />
</Cursor>
</File>
<File name="src/MediaFactory.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -26,9 +41,4 @@
<Cursor1 position="1317" topLine="18" />
</Cursor>
</File>
- <File name="include/AbstractMedia.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor>
- <Cursor1 position="1008" topLine="0" />
- </Cursor>
- </File>
</CodeBlocks_layout_file>
diff --git a/libs/mediaScan/nbproject/Makefile-Debug.mk b/libs/mediaScan/nbproject/Makefile-Debug.mk
index 1e0062b..57923a8 100644
--- a/libs/mediaScan/nbproject/Makefile-Debug.mk
+++ b/libs/mediaScan/nbproject/Makefile-Debug.mk
@@ -41,6 +41,7 @@ OBJECTFILES= \
${OBJECTDIR}/src/VdrRecording.o \
${OBJECTDIR}/src/MediaFactory.o \
${OBJECTDIR}/src/LegacyVdrRecording.o \
+ ${OBJECTDIR}/src/MediainfoReader.o \
${OBJECTDIR}/src/FSMediaScanner.o \
${OBJECTDIR}/src/AbstractMultiFileMovie.o \
${OBJECTDIR}/src/AbstractMedia.o \
@@ -65,13 +66,13 @@ LDLIBSOPTIONS=
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
- "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
- ${AR} -rv ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a ${OBJECTFILES}
- $(RANLIB) ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
+ ${AR} -rv ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a ${OBJECTFILES}
+ $(RANLIB) ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
${OBJECTDIR}/src/Picture.o: src/Picture.cc
${MKDIR} -p ${OBJECTDIR}/src
@@ -103,6 +104,11 @@ ${OBJECTDIR}/src/LegacyVdrRecording.o: src/LegacyVdrRecording.cc
${RM} $@.d
$(COMPILE.cc) -g -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_REENTRANT -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Iinclude -I../networking/include -I../IO/include -I../util/include -I../vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/LegacyVdrRecording.o src/LegacyVdrRecording.cc
+${OBJECTDIR}/src/MediainfoReader.o: src/MediainfoReader.cc
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.cc) -g -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_REENTRANT -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Iinclude -I../networking/include -I../IO/include -I../util/include -I../vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/MediainfoReader.o src/MediainfoReader.cc
+
${OBJECTDIR}/src/FSMediaScanner.o: src/FSMediaScanner.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
@@ -133,7 +139,7 @@ ${OBJECTDIR}/src/Movie.o: src/Movie.cc
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
${RM} -r ${CND_BUILDDIR}/${CND_CONF}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
# Subprojects
.clean-subprojects:
diff --git a/libs/mediaScan/nbproject/Makefile-Release.mk b/libs/mediaScan/nbproject/Makefile-Release.mk
index bc8c6a9..2b0a333 100644
--- a/libs/mediaScan/nbproject/Makefile-Release.mk
+++ b/libs/mediaScan/nbproject/Makefile-Release.mk
@@ -41,6 +41,7 @@ OBJECTFILES= \
${OBJECTDIR}/src/VdrRecording.o \
${OBJECTDIR}/src/MediaFactory.o \
${OBJECTDIR}/src/LegacyVdrRecording.o \
+ ${OBJECTDIR}/src/MediainfoReader.o \
${OBJECTDIR}/src/FSMediaScanner.o \
${OBJECTDIR}/src/AbstractMultiFileMovie.o \
${OBJECTDIR}/src/AbstractMedia.o \
@@ -65,13 +66,13 @@ LDLIBSOPTIONS=
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
- "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
- ${AR} -rv ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a ${OBJECTFILES}
- $(RANLIB) ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
+ ${AR} -rv ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a ${OBJECTFILES}
+ $(RANLIB) ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
${OBJECTDIR}/src/Picture.o: src/Picture.cc
${MKDIR} -p ${OBJECTDIR}/src
@@ -103,6 +104,11 @@ ${OBJECTDIR}/src/LegacyVdrRecording.o: src/LegacyVdrRecording.cc
${RM} $@.d
$(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/LegacyVdrRecording.o src/LegacyVdrRecording.cc
+${OBJECTDIR}/src/MediainfoReader.o: src/MediainfoReader.cc
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/MediainfoReader.o src/MediainfoReader.cc
+
${OBJECTDIR}/src/FSMediaScanner.o: src/FSMediaScanner.cc
${MKDIR} -p ${OBJECTDIR}/src
${RM} $@.d
@@ -129,7 +135,7 @@ ${OBJECTDIR}/src/Movie.o: src/Movie.cc
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
${RM} -r ${CND_BUILDDIR}/${CND_CONF}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
# Subprojects
.clean-subprojects:
diff --git a/libs/mediaScan/nbproject/Makefile-impl.mk b/libs/mediaScan/nbproject/Makefile-impl.mk
index 1d398f7..84fe472 100644
--- a/libs/mediaScan/nbproject/Makefile-impl.mk
+++ b/libs/mediaScan/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
# Project Name
-PROJECTNAME=fsScan
+PROJECTNAME=mediaScan
# Active Configuration
DEFAULTCONF=Debug
diff --git a/libs/mediaScan/nbproject/Makefile-variables.mk b/libs/mediaScan/nbproject/Makefile-variables.mk
index e22487e..0b0bf57 100644
--- a/libs/mediaScan/nbproject/Makefile-variables.mk
+++ b/libs/mediaScan/nbproject/Makefile-variables.mk
@@ -9,19 +9,19 @@ CND_DISTDIR=dist
# Debug configuration
CND_PLATFORM_Debug=GNU-Linux-x86
CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux-x86
-CND_ARTIFACT_NAME_Debug=libfsscan.a
-CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux-x86/libfsscan.a
+CND_ARTIFACT_NAME_Debug=libmediascan.a
+CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux-x86/libmediascan.a
CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux-x86/package
-CND_PACKAGE_NAME_Debug=fsScan.tar
-CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux-x86/package/fsScan.tar
+CND_PACKAGE_NAME_Debug=mediaScan.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux-x86/package/mediaScan.tar
# Release configuration
CND_PLATFORM_Release=GNU-Linux-x86
CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux-x86
-CND_ARTIFACT_NAME_Release=libfsscan.a
-CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux-x86/libfsscan.a
+CND_ARTIFACT_NAME_Release=libmediascan.a
+CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux-x86/libmediascan.a
CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux-x86/package
-CND_PACKAGE_NAME_Release=fsScan.tar
-CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux-x86/package/fsScan.tar
+CND_PACKAGE_NAME_Release=mediaScan.tar
+CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux-x86/package/mediaScan.tar
#
# include compiler specific variables
#
diff --git a/libs/mediaScan/nbproject/Package-Debug.bash b/libs/mediaScan/nbproject/Package-Debug.bash
index 2a9c453..a76f06a 100644
--- a/libs/mediaScan/nbproject/Package-Debug.bash
+++ b/libs/mediaScan/nbproject/Package-Debug.bash
@@ -12,9 +12,9 @@ CND_DISTDIR=dist
CND_BUILDDIR=build
NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
-OUTPUT_BASENAME=libfsscan.a
-PACKAGE_TOP_DIR=fsScan/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
+OUTPUT_BASENAME=libmediascan.a
+PACKAGE_TOP_DIR=mediaScan/
# Functions
function checkReturnCode
@@ -59,15 +59,15 @@ mkdir -p ${NBTMPDIR}
# Copy files and create directories and links
cd "${TOP}"
-makeDirectory "${NBTMPDIR}/fsScan/lib"
+makeDirectory "${NBTMPDIR}/mediaScan/lib"
copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
# Generate tar file
cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fsScan.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/mediaScan.tar
cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fsScan.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/mediaScan.tar *
checkReturnCode
# Cleanup
diff --git a/libs/mediaScan/nbproject/Package-Release.bash b/libs/mediaScan/nbproject/Package-Release.bash
index d996196..bcbe0fc 100644
--- a/libs/mediaScan/nbproject/Package-Release.bash
+++ b/libs/mediaScan/nbproject/Package-Release.bash
@@ -12,9 +12,9 @@ CND_DISTDIR=dist
CND_BUILDDIR=build
NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libfsscan.a
-OUTPUT_BASENAME=libfsscan.a
-PACKAGE_TOP_DIR=fsScan/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a
+OUTPUT_BASENAME=libmediascan.a
+PACKAGE_TOP_DIR=mediaScan/
# Functions
function checkReturnCode
@@ -59,15 +59,15 @@ mkdir -p ${NBTMPDIR}
# Copy files and create directories and links
cd "${TOP}"
-makeDirectory "${NBTMPDIR}/fsScan/lib"
+makeDirectory "${NBTMPDIR}/mediaScan/lib"
copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
# Generate tar file
cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fsScan.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/mediaScan.tar
cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fsScan.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/mediaScan.tar *
checkReturnCode
# Cleanup
diff --git a/libs/mediaScan/nbproject/configurations.xml b/libs/mediaScan/nbproject/configurations.xml
index 9984a4c..733c5d2 100644
--- a/libs/mediaScan/nbproject/configurations.xml
+++ b/libs/mediaScan/nbproject/configurations.xml
@@ -11,6 +11,7 @@
<itemPath>include/FSMediaScanner.h</itemPath>
<itemPath>include/LegacyVdrRecording.h</itemPath>
<itemPath>include/MediaFactory.h</itemPath>
+ <itemPath>include/MediainfoReader.h</itemPath>
<itemPath>include/Movie.h</itemPath>
<itemPath>include/Picture.h</itemPath>
<itemPath>include/VdrRecording.h</itemPath>
@@ -29,6 +30,7 @@
<itemPath>src/FSMediaScanner.cc</itemPath>
<itemPath>src/LegacyVdrRecording.cc</itemPath>
<itemPath>src/MediaFactory.cc</itemPath>
+ <itemPath>src/MediainfoReader.cc</itemPath>
<itemPath>src/Movie.cc</itemPath>
<itemPath>src/Picture.cc</itemPath>
<itemPath>src/VdrRecording.cc</itemPath>
diff --git a/libs/mediaScan/nbproject/project.xml b/libs/mediaScan/nbproject/project.xml
index f749866..f0742a0 100644
--- a/libs/mediaScan/nbproject/project.xml
+++ b/libs/mediaScan/nbproject/project.xml
@@ -3,7 +3,7 @@
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
- <name>fsScan</name>
+ <name>mediaScan</name>
<c-extensions/>
<cpp-extensions>cc</cpp-extensions>
<header-extensions>h</header-extensions>
diff --git a/libs/mediaScan/src/MediainfoReader.cc b/libs/mediaScan/src/MediainfoReader.cc
new file mode 100644
index 0000000..cd1f3f6
--- /dev/null
+++ b/libs/mediaScan/src/MediainfoReader.cc
@@ -0,0 +1,69 @@
+/*
+ * File: MediainfoReader.cc
+ * Author: django
+ *
+ * Created on 30. Juli 2012, 15:03
+ */
+#include <MediainfoReader.h>
+#include <LineReader.h>
+#include <stddef.h>
+#include <pcrecpp.h>
+#include <vector>
+
+cMediainfoReader::cMediainfoReader(cLineReader *LineReader)
+ : reader(LineReader)
+{
+}
+
+cMediainfoReader::~cMediainfoReader()
+{
+ Close();
+}
+
+void cMediainfoReader::AddValuableKey(const char* Key)
+{
+ valuableKeys.push_back(Key);
+}
+
+void cMediainfoReader::Close(void)
+{
+ if (reader) {
+ delete reader;
+ reader = NULL;
+ }
+}
+
+bool cMediainfoReader::IsValuable(std::string &key)
+{
+ for (size_t i=0; i < valuableKeys.size(); ++i) {
+ if (!strcmp(key.c_str(), valuableKeys[i].c_str()))
+ return true;
+ }
+ return false;
+}
+
+cMediainfoReader::InfoEntry *cMediainfoReader::ReadEntry()
+{
+ if (!reader) return NULL;
+ const char *line = reader->ReadLine();
+ static pcrecpp::RE comment("^\\s*#.*$");
+ static pcrecpp::RE emptyLine("^\\s*$");
+ static pcrecpp::RE entry("^\\s*(.+?)\\s*:\\s*(.+?)\\s*$");
+ std::string name, value;
+ InfoEntry *rv = NULL;
+
+ while (line && (comment.FullMatch(line) || emptyLine.FullMatch(line)))
+ line = reader->ReadLine();
+ while (line && !entry.FullMatch(line, &name, &value))
+ line = reader->ReadLine();
+ while (line && entry.FullMatch(line, &name, &value)) {
+ if (!IsValuable(name)) {
+ line = reader->ReadLine();
+ continue;
+ }
+ rv = new InfoEntry(name, value);
+ break;
+ }
+ return rv;
+}
+
diff --git a/libs/networking/networking.layout b/libs/networking/networking.layout
index 9cd0301..e4e1faa 100644
--- a/libs/networking/networking.layout
+++ b/libs/networking/networking.layout
@@ -1,49 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="include/HTTPMessage.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/ServerConfig.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="1670" topLine="0" />
</Cursor>
</File>
- <File name="src/HTTPFileResponse.cc" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/HTTPResponse.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="include/ConnectionHandler.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/ConnectionHandler.cc" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="12222" topLine="271" />
</Cursor>
</File>
- <File name="include/ServerConfig.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/HTTPFileResponse.cc" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1684" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/HTTPMessage.cc" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/ConnectionPoint.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="include/ConnectionPoint.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/HTTPMessage.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/ConnectionHandler.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/HTTPMessage.cc" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1551" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="include/HTTPResponse.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/ConnectionHandler.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/ServerConfig.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/ServerConfig.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1670" topLine="0" />
+ <Cursor1 position="1684" topLine="0" />
</Cursor>
</File>
<File name="src/ConnectionPoint.cc" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
diff --git a/libs/networking/src/ServerConfig.cc b/libs/networking/src/ServerConfig.cc
index fec6107..8fb7f0f 100644
--- a/libs/networking/src/ServerConfig.cc
+++ b/libs/networking/src/ServerConfig.cc
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: ServerConfig.cc
* Created: 8. Juli 2012, 06
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libnetworking: classes for tcp/ip sockets and http-protocol handling
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#include <ServerConfig.h>
@@ -120,7 +120,7 @@ int cServerConfig::Load(const char* FileName)
cConfigReader::ConfigEntry *ce;
int numberOfEntries = 0;
- while ((ce = cr->ReadValue())) {
+ while ((ce = cr->ReadEntry())) {
std::string name = std::get<0>(*ce);
if (!strcmp("media-root", name.c_str())) {
diff --git a/libs/util/util.layout b/libs/util/util.layout
index c12bb95..c2c66a9 100644
--- a/libs/util/util.layout
+++ b/libs/util/util.layout
@@ -1,29 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="src/ManagedMap.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/AbstractListAssembler.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="include/ManagedMap.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/ManagedVector.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/StringBuilder.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor>
- <Cursor1 position="1953" topLine="59" />
- </Cursor>
- </File>
- <File name="include/Codec.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/StringBuilder.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1385" topLine="0" />
+ <Cursor1 position="1959" topLine="0" />
</Cursor>
</File>
- <File name="src/Codec.cc" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/ManagedMap.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1327" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="include/JSonWriter.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -31,19 +26,19 @@
<Cursor1 position="1532" topLine="0" />
</Cursor>
</File>
- <File name="src/AbstractListAssembler.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/Codec.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="1385" topLine="0" />
</Cursor>
</File>
- <File name="include/ManagedVector.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/Codec.cc" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="1327" topLine="0" />
</Cursor>
</File>
- <File name="include/StringBuilder.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/StringBuilder.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1959" topLine="0" />
+ <Cursor1 position="1953" topLine="59" />
</Cursor>
</File>
<File name="src/JSonWriter.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -51,4 +46,9 @@
<Cursor1 position="1655" topLine="3" />
</Cursor>
</File>
+ <File name="include/ManagedMap.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="0" topLine="0" />
+ </Cursor>
+ </File>
</CodeBlocks_layout_file>
diff --git a/libs/vdr/vdr.layout b/libs/vdr/vdr.layout
index 3827c1a..2e909c1 100644
--- a/libs/vdr/vdr.layout
+++ b/libs/vdr/vdr.layout
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="include/Thread.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/i18n.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
- <File name="src/i18n.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/Thread.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
@@ -21,14 +21,14 @@
<Cursor1 position="5244" topLine="0" />
</Cursor>
</File>
- <File name="src/CharsetConv.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="include/Logging.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="3680" topLine="57" />
+ <Cursor1 position="1690" topLine="0" />
</Cursor>
</File>
- <File name="include/Logging.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/Thread.cc" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1690" topLine="0" />
+ <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="src/TimeMs.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -36,9 +36,9 @@
<Cursor1 position="2160" topLine="0" />
</Cursor>
</File>
- <File name="src/Thread.cc" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="src/CharsetConv.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="0" />
+ <Cursor1 position="3680" topLine="57" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp b/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp
index 31d9050..346b0a3 100644
--- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp
+++ b/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp
@@ -14,14 +14,6 @@
<Compiler>
<Add option="-g" />
</Compiler>
- <Linker>
- <Add library="../../libs/fsScan/libfsScan.a" />
- <Add library="../../libs/networking/libnetworking.a" />
- <Add library="../../libs/util/libutil.a" />
- <Add library="../../libs/vdr/libvdr.a" />
- <Add library="ssl" />
- <Add library="crypt" />
- </Linker>
</Target>
<Target title="Release">
<Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" />
@@ -42,7 +34,7 @@
<Add option="-D_REENTRANT" />
<Add option="-D_GNU_SOURCE=1" />
<Add directory="../../cmps/serverlib/include" />
- <Add directory="../../libs/fsScan/include" />
+ <Add directory="../../libs/mediaScan/include" />
<Add directory="../../libs/networking/include" />
<Add directory="../../libs/IO/include" />
<Add directory="../../libs/util/include" />
@@ -50,13 +42,12 @@
</Compiler>
<Linker>
<Add library="../../cmps/serverlib/libserverlib.a" />
- <Add library="../../libs/fsScan/libfsScan.a" />
+ <Add library="../../libs/mediaScan/libmediaScan.a" />
<Add library="../../libs/networking/libnetworking.a" />
<Add library="../../libs/IO/libIO.a" />
<Add library="../../libs/util/libutil.a" />
<Add library="../../libs/vdr/libvdr.a" />
<Add library="ssl" />
- <Add library="crypt" />
<Add library="pthread" />
<Add library="rt" />
<Add library="pcrecpp" />
diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout b/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout
index 130e1dc..b559e7b 100644
--- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout
+++ b/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout
@@ -3,7 +3,7 @@
<ActiveTarget name="Debug" />
<File name="ConnectionHandlerTest.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="916" topLine="0" />
+ <Cursor1 position="156" topLine="15" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/tests/CredentialPersistence/CredentialPersistence.cbp b/tests/CredentialPersistence/CredentialPersistence.cbp
index 6bb20e4..0d81a73 100644
--- a/tests/CredentialPersistence/CredentialPersistence.cbp
+++ b/tests/CredentialPersistence/CredentialPersistence.cbp
@@ -41,20 +41,14 @@
</Compiler>
<Linker>
<Add library="../../cmps/serverlib/libserverlib.a" />
- <Add library="../../libs/fsScan/libfsScan.a" />
+ <Add library="../../libs/mediaScan/libmediaScan.a" />
<Add library="../../libs/networking/libnetworking.a" />
<Add library="../../libs/util/libutil.a" />
<Add library="../../libs/vdr/libvdr.a" />
- <Add library="jpeg" />
<Add library="pthread" />
<Add library="dl" />
- <Add library="cap" />
<Add library="rt" />
- <Add library="fribidi" />
- <Add library="freetype" />
- <Add library="yajl" />
<Add library="ssl" />
- <Add library="crypt" />
</Linker>
<Unit filename="CredentialPersistence.cc" />
<Extensions>
diff --git a/tests/FilesystemTest/FilesystemTest.cbp b/tests/FilesystemTest/FilesystemTest.cbp
index 43f5b5c..a9b8f84 100644
--- a/tests/FilesystemTest/FilesystemTest.cbp
+++ b/tests/FilesystemTest/FilesystemTest.cbp
@@ -40,15 +40,14 @@
<Add directory="../../libs/util/include" />
<Add directory="../../libs/networking/include" />
<Add directory="../../libs/IO/include" />
- <Add directory="../../libs/fsScan/include" />
+ <Add directory="../../libs/mediaScan/include" />
<Add directory="include" />
</Compiler>
<Linker>
<Add library="pthread" />
<Add library="rt" />
<Add library="ssl" />
- <Add library="crypt" />
- <Add library="../../libs/fsScan/libfsScan.a" />
+ <Add library="../../libs/mediaScan/libmediaScan.a" />
<Add library="../../libs/networking/libnetworking.a" />
<Add library="../../libs/IO/libIO.a" />
<Add library="../../libs/util/libutil.a" />
diff --git a/tests/FilesystemTest/FilesystemTest.layout b/tests/FilesystemTest/FilesystemTest.layout
index d39418a..369877a 100644
--- a/tests/FilesystemTest/FilesystemTest.layout
+++ b/tests/FilesystemTest/FilesystemTest.layout
@@ -3,7 +3,7 @@
<ActiveTarget name="Debug" />
<File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="438" topLine="0" />
+ <Cursor1 position="202" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/tests/JSonTest/JSonTest.cbp b/tests/JSonTest/JSonTest.cbp
index 3ce250a..cfbb238 100644
--- a/tests/JSonTest/JSonTest.cbp
+++ b/tests/JSonTest/JSonTest.cbp
@@ -33,27 +33,20 @@
<Add option="-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration" />
<Add option="-D_REENTRANT" />
<Add option="-D_GNU_SOURCE=1" />
- <Add directory="../../libs/fsScan/include" />
+ <Add directory="../../libs/mediaScan/include" />
<Add directory="../../libs/networking/include" />
<Add directory="../../libs/util/include" />
<Add directory="../../libs/vdr/include" />
</Compiler>
<Linker>
- <Add library="../../libs/fsScan/libfsScan.a" />
+ <Add library="../../libs/mediaScan/libmediaScan.a" />
<Add library="../../libs/networking/libnetworking.a" />
<Add library="../../libs/util/libutil.a" />
<Add library="../../libs/vdr/libvdr.a" />
- <Add library="jpeg" />
<Add library="pthread" />
<Add library="dl" />
- <Add library="cap" />
<Add library="rt" />
- <Add library="fribidi" />
- <Add library="freetype" />
- <Add library="fontconfig" />
- <Add library="yajl" />
<Add library="ssl" />
- <Add library="crypt" />
</Linker>
<Unit filename="JSonTest.cc" />
<Extensions>
diff --git a/tests/MetaScanTest/MetaScanTest.cbp b/tests/MetaScanTest/MetaScanTest.cbp
index 832ce4a..31b7674 100644
--- a/tests/MetaScanTest/MetaScanTest.cbp
+++ b/tests/MetaScanTest/MetaScanTest.cbp
@@ -39,14 +39,14 @@
<Add option="-D__STDC_CONSTANT_MACROS" />
<Add option="-D__STDC_FORMAT_MACROS" />
<Add option="-D__STDC_LIMIT_MACROS" />
- <Add directory="../../libs/fsScan/include" />
+ <Add directory="../../libs/mediaScan/include" />
<Add directory="../../libs/networking/include" />
<Add directory="../../libs/IO/include" />
<Add directory="../../libs/util/include" />
<Add directory="../../libs/vdr/include" />
</Compiler>
<Linker>
- <Add library="../../libs/fsScan/libfsScan.a" />
+ <Add library="../../libs/mediaScan/libmediaScan.a" />
<Add library="../../libs/networking/libnetworking.a" />
<Add library="../../libs/IO/libIO.a" />
<Add library="../../libs/util/libutil.a" />
diff --git a/tests/MetaScanTest/MetaScanTest.depend b/tests/MetaScanTest/MetaScanTest.depend
index aa86b49..4a9fb68 100644
--- a/tests/MetaScanTest/MetaScanTest.depend
+++ b/tests/MetaScanTest/MetaScanTest.depend
@@ -1,9 +1,11 @@
# depslib dependency file v1.0
-1343547065 source:/d/linux/CMP/tests/MetaScanTest/main.cpp
+1343662973 source:/d/linux/CMP/tests/MetaScanTest/main.cpp
<File.h>
<FileReader.h>
<LineReader.h>
<ConfigReader.h>
+ <CommandReader.h>
+ <MediainfoReader.h>
<iostream>
<stdlib.h>
<string.h>
@@ -13,16 +15,33 @@
<unistd.h>
<wait.h>
<tr1/tuple>
+ <util.h>
1343485153 /d/linux/CMP/libs/IO/include/File.h
<stddef.h>
<sys/types.h>
-1343485153 /d/linux/CMP/libs/IO/include/FileReader.h
+1343628880 /d/linux/CMP/libs/IO/include/FileReader.h
+ <Reader.h>
-1343485153 /d/linux/CMP/libs/IO/include/LineReader.h
+1343629066 /d/linux/CMP/libs/IO/include/LineReader.h
-1343538490 /d/linux/CMP/libs/IO/include/ConfigReader.h
+1343653800 /d/linux/CMP/libs/IO/include/ConfigReader.h
<tuple>
<string>
+1343628826 /d/linux/CMP/libs/IO/include/Reader.h
+
+1343629103 /d/linux/CMP/libs/IO/include/CommandReader.h
+ <Reader.h>
+ <vector>
+ <string>
+
+1343655505 /d/linux/CMP/libs/mediaScan/include/MediainfoReader.h
+ <tuple>
+ <string>
+ <vector>
+
+1343622277 /d/linux/CMP/libs/util/include/util.h
+ <stdlib.h>
+
diff --git a/tests/MetaScanTest/MetaScanTest.layout b/tests/MetaScanTest/MetaScanTest.layout
index d189d61..0daa8b2 100644
--- a/tests/MetaScanTest/MetaScanTest.layout
+++ b/tests/MetaScanTest/MetaScanTest.layout
@@ -3,7 +3,7 @@
<ActiveTarget name="Debug" />
<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1575" topLine="9" />
+ <Cursor1 position="2038" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/tests/MetaScanTest/main.cpp b/tests/MetaScanTest/main.cpp
index 751186e..dcca444 100644
--- a/tests/MetaScanTest/main.cpp
+++ b/tests/MetaScanTest/main.cpp
@@ -1,14 +1,33 @@
-/*
- * File: MetaScanTest.cc
- * Author: django
+/**
+ * ======================== legal notice ======================
*
- * Created on 27.07.2012, 10:03
+ * File: MetaScanTest.cc
+ * Created: 27.07.2012, 10:03
+ * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
+ * Project: cmps - the backend (server) part of compound media player
+ *
+ * CMP - compound media player
+ *
+ * is a client/server mediaplayer intended to play any media from any workstation
+ * without the need to export or mount shares. cmps is an easy to use backend
+ * with a (ready to use) HTML-interface. Additionally the backend supports
+ * authentication via HTTP-digest authorization.
+ * cmpc is a client with vdr-like osd-menues.
+ *
+ * Copyright (c) 2012 Reinhard Mantey, some rights reserved!
+ * published under Creative Commons by-sa
+ * For details see http://creativecommons.org/licenses/by-sa/3.0/
+ *
+ * The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
+ *
+ * --------------------------------------------------------------
*/
#include <File.h>
#include <FileReader.h>
#include <LineReader.h>
#include <ConfigReader.h>
#include <CommandReader.h>
+#include <MediainfoReader.h>
#include <iostream>
#include <stdlib.h>
#include <string.h>
@@ -20,14 +39,14 @@
#include <tr1/tuple>
#include <util.h>
-static void testPipe(const char *chk = NULL);
+void testPipe(const char *chk = NULL);
static void parseConfig(const char *FileName)
{
cConfigReader *cr = new cConfigReader(new cLineReader(new cFileReader(new cFile(FileName))));
cConfigReader::ConfigEntry *ce;
- while ((ce = cr->ReadValue())) {
+ while ((ce = cr->ReadEntry())) {
std::cout << "config entry [" << std::get<0>(*ce) << "] => " << std::get<1>(*ce) << std::endl;
delete ce;
}
@@ -35,14 +54,47 @@ static void parseConfig(const char *FileName)
delete cr;
}
-static void testMediaFiles(const char *FileName)
+static void setupMediainfoReader(cMediainfoReader *mir)
+{
+ mir->AddValuableKey("Format");
+ //Audio
+ mir->AddValuableKey("Duration");
+ mir->AddValuableKey("Album");
+ mir->AddValuableKey("Track name");
+ mir->AddValuableKey("Performer");
+ mir->AddValuableKey("Bit rate");
+ //Image
+ mir->AddValuableKey("Width");
+ mir->AddValuableKey("Height");
+ //Video
+ mir->AddValuableKey("Display aspect ratio");
+ mir->AddValuableKey("Scan type");
+}
+
+static void testMediaInfo(const char *FileName)
+{
+ cCommandReader *cr = new cCommandReader("/usr/bin/mediainfo");
+ cMediainfoReader *mir = new cMediainfoReader(new cLineReader(cr));
+ cMediainfoReader::InfoEntry *ie;
+
+ cr->AddCommandParameter(FileName);
+ setupMediainfoReader(mir);
+ while ((ie = mir->ReadEntry())) {
+ std::cout << "media info - [" << std::get<0>(*ie) << "] ==> " << std::get<1>(*ie) << std::endl;
+// delete ie;
+ }
+ mir->Close();
+ delete mir;
+}
+
+void testMediaFiles(const char *FileName)
{
cLineReader *lr = new cLineReader(new cFileReader(new cFile(FileName)));
const char *line;
while ((line = lr->ReadLine())) {
- std::cout << "media-test-file: " << line << std::endl;
- testPipe(line);
+ std::cout << std::endl << "media-test-file: " << line << std::endl;
+ testMediaInfo(line);
}
lr->Close();
delete lr;
@@ -69,7 +121,7 @@ static void testCommandReader()
delete lr;
};
-static void testPipe(const char *chk)
+void testPipe(const char *chk)
{
int parent2Child[2];
int child2Parent[2];
@@ -153,8 +205,8 @@ int main()
std::cout << std::endl << "===========================================" << std::endl << std::endl;
testCommandReader();
-// std::cout << std::endl << "===========================================" << std::endl << std::endl;
-// testMediaFiles("testMedia.files");
+ std::cout << std::endl << "===========================================" << std::endl << std::endl;
+ testMediaFiles("testMedia.files");
cFile::Cleanup();
return 0;
diff --git a/tests/StringBuilderTest/StringBuilderTest.cbp b/tests/StringBuilderTest/StringBuilderTest.cbp
index bc86f1b..b58f2b3 100644
--- a/tests/StringBuilderTest/StringBuilderTest.cbp
+++ b/tests/StringBuilderTest/StringBuilderTest.cbp
@@ -43,14 +43,13 @@
<Add directory="../../libs/util/include" />
<Add directory="../../libs/IO/include" />
<Add directory="../../libs/networking/include" />
- <Add directory="../../libs/fsScan/include" />
+ <Add directory="../../libs/mediaScan/include" />
</Compiler>
<Linker>
<Add library="pthread" />
<Add library="rt" />
<Add library="ssl" />
- <Add library="crypt" />
- <Add library="../../libs/fsScan/libfsScan.a" />
+ <Add library="../../libs/mediaScan/libmediaScan.a" />
<Add library="../../libs/networking/libnetworking.a" />
<Add library="../../libs/IO/libIO.a" />
<Add library="../../libs/util/libutil.a" />