From ad667186c0c45cfca9d3f153faec7ce35545b238 Mon Sep 17 00:00:00 2001 From: geronimo Date: Mon, 30 Jul 2012 17:51:05 +0200 Subject: created more readers --- cmps/nbproject/Makefile-Debug.mk | 26 +++++++++++------------- cmps/nbproject/configurations.xml | 22 ++++++++++---------- cmps/nbproject/project.xml | 2 +- cmps/server.cbp | 4 ++-- cmps/server.layout | 4 ++-- cmps/serverlib/nbproject/Makefile-Debug.mk | 16 +++++++-------- cmps/serverlib/nbproject/configurations.xml | 10 +++++----- cmps/serverlib/nbproject/project.xml | 2 +- cmps/serverlib/serverlib.cbp | 2 +- cmps/serverlib/serverlib.layout | 12 +++++------ cmps/tests/MetaScanTest.cc | 31 ++++++++++++++++++++--------- 11 files changed, 70 insertions(+), 61 deletions(-) (limited to 'cmps') 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 @@ include serverlib/include - ../libs/fsScan/include + ../libs/mediaScan/include ../libs/networking/include ../libs/IO/include ../libs/util/include @@ -101,15 +101,15 @@ - + OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a"> @@ -207,25 +207,25 @@ CC="${MAKE} -f Makefile CONF=Debug clean" OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libio.a"> - + OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libserverlib.a"> - + OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediascan.a"> 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 @@ ../libs/util ../libs/vdr ../libs/IO - ../libs/fsScan serverlib ../libs/networking + ../libs/mediaScan 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 @@ - + - + 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 @@ - + - + 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 @@ include - ../../libs/fsScan/include + ../../libs/mediaScan/include ../../libs/networking/include ../../libs/IO/include ../../libs/util/include @@ -107,15 +107,15 @@ CC="${MAKE} -f Makefile CONF=Debug clean" OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libio.a"> - + OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libmediaplay.a"> 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 @@ h UTF-8 + ../../cmpc/mediaplay ../../libs/util ../../libs/vdr ../../libs/networking ../../libs/IO - ../../libs/fsScan 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 @@ - + 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 @@ - + - + - + - + - + - + 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: Geronimo * 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 @@ -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; -- cgit v1.2.3