diff options
76 files changed, 103 insertions, 1470 deletions
diff --git a/cmps/.dep.inc b/cmps/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/cmps/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/cmps/server.cbp b/cmps/server.cbp deleted file mode 100644 index 35aa29c..0000000 --- a/cmps/server.cbp +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.server" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/cmps" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/cmps" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <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/vdr/include" /> - <Add directory="../libs/util/include" /> - <Add directory="../libs/networking/include" /> - <Add directory="../libs/IO/include" /> - <Add directory="../libs/mediaScan/include" /> - <Add directory="serverlib/include" /> - <Add directory="include" /> - </Compiler> - <Linker> - <Add library="serverlib/libserverlib.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="pthread" /> - <Add library="ssl" /> - <Add library="crypt" /> - <Add library="rt" /> - <Add library="pcrecpp" /> - </Linker> - <Unit filename="main.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/cmps/server.depend b/cmps/server.depend deleted file mode 100644 index c4ac310..0000000 --- a/cmps/server.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/cmps/server.layout b/cmps/server.layout deleted file mode 100644 index 5876f25..0000000 --- a/cmps/server.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <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="1038" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/cmps/serverlib/.dep.inc b/cmps/serverlib/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/cmps/serverlib/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/cmps/serverlib/serverlib.cbp b/cmps/serverlib/serverlib.cbp deleted file mode 100644 index 106bb33..0000000 --- a/cmps/serverlib/serverlib.cbp +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.server.lib" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="serverlib" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Debug/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="serverlib" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Release/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <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="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> - <Unit filename="include/AbstractMediaRequestHandler.h" /> - <Unit filename="include/CommandHandler.h" /> - <Unit filename="include/HTMLListAssembler.h" /> - <Unit filename="include/HTTPMediaResponse.h" /> - <Unit filename="include/JSonListAssembler.h" /> - <Unit filename="include/MediaFileHandler.h" /> - <Unit filename="include/MediaListHandler.h" /> - <Unit filename="src/AbstractMediaRequestHandler.cc" /> - <Unit filename="src/CommandHandler.cc" /> - <Unit filename="src/HTMLListAssembler.cc" /> - <Unit filename="src/HTTPMediaResponse.cc" /> - <Unit filename="src/JSonListAssembler.cc" /> - <Unit filename="src/MediaFileHandler.cc" /> - <Unit filename="src/MediaListHandler.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/cmps/serverlib/serverlib.depend b/cmps/serverlib/serverlib.depend deleted file mode 100644 index c4ac310..0000000 --- a/cmps/serverlib/serverlib.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/cmps/serverlib/serverlib.layout b/cmps/serverlib/serverlib.layout deleted file mode 100644 index f494bcc..0000000 --- a/cmps/serverlib/serverlib.layout +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <File name="src/AbstractMediaRequestHandler.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/HTMLListAssembler.cc" 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> - </File> - <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="1183" 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"> - <Cursor> - <Cursor1 position="1040" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/cmps/tests/MetaScanTest.cc b/cmps/tests/MetaScanTest.cc index f53c2ca..8b293f9 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> diff --git a/libs/IO/.dep.inc b/libs/IO/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/libs/IO/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/libs/IO/IO.cbp b/libs/IO/IO.cbp deleted file mode 100644 index e1377fc..0000000 --- a/libs/IO/IO.cbp +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.libs.IO" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="IO" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Debug/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="IO" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Release/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <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 option="-D_FILE_OFFSET_BITS=64" /> - <Add option="-D_LARGEFILE_SOURCE" /> - <Add option="-D_LARGEFILE64_SOURCE" /> - <Add option="-D__STDC_CONSTANT_MACROS" /> - <Add option="-D__STDC_FORMAT_MACROS" /> - <Add option="-D__STDC_LIMIT_MACROS" /> - <Add directory="include" /> - <Add directory="../util/include" /> - <Add directory="../vdr/include" /> - </Compiler> - <Unit filename="include/CommandReader.h" /> - <Unit filename="include/ConfigReader.h" /> - <Unit filename="include/File.h" /> - <Unit filename="include/FileReader.h" /> - <Unit filename="include/FileRepresentation.h" /> - <Unit filename="include/FileSystem.h" /> - <Unit filename="include/LineReader.h" /> - <Unit filename="include/Reader.h" /> - <Unit filename="src/CommandReader.cc" /> - <Unit filename="src/ConfigReader.cc" /> - <Unit filename="src/File.cc" /> - <Unit filename="src/FileReader.cc" /> - <Unit filename="src/FileRepresentation.cc" /> - <Unit filename="src/FileSystem.cc" /> - <Unit filename="src/LineReader.cc" /> - <Unit filename="src/Reader.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/libs/IO/IO.depend b/libs/IO/IO.depend deleted file mode 100644 index c4ac310..0000000 --- a/libs/IO/IO.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/libs/IO/IO.layout b/libs/IO/IO.layout deleted file mode 100644 index 05f76d8..0000000 --- a/libs/IO/IO.layout +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <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="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"> - <Cursor> - <Cursor1 position="459" topLine="0" /> - </Cursor> - </File> - <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="src/FileReader.cc" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="737" topLine="0" /> - </Cursor> - </File> - <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="1176" topLine="0" /> - </Cursor> - </File> - <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="0" 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"> - <Cursor> - <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 909d6a8..9906ff1 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 diff --git a/libs/IO/src/ConfigReader.cc b/libs/IO/src/ConfigReader.cc index 2b31343..7fa7b7b 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> diff --git a/libs/mediaScan/.dep.inc b/libs/mediaScan/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/libs/mediaScan/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/libs/mediaScan/include/AbstractMedia.h b/libs/mediaScan/include/AbstractMedia.h index 8c87dd5..b20f9cb 100644 --- a/libs/mediaScan/include/AbstractMedia.h +++ b/libs/mediaScan/include/AbstractMedia.h @@ -4,7 +4,7 @@ * File: AbstractMedia.h * Created: 2. Juli 2012, 14 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/AbstractMultiFileMovie.h b/libs/mediaScan/include/AbstractMultiFileMovie.h index 6913a74..f933b75 100644 --- a/libs/mediaScan/include/AbstractMultiFileMovie.h +++ b/libs/mediaScan/include/AbstractMultiFileMovie.h @@ -4,7 +4,7 @@ * File: AbstractMultiFileMovie.h * Created: 3. Juli 2012, 07 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/Audio.h b/libs/mediaScan/include/Audio.h index 42611c2..fb13f49 100644 --- a/libs/mediaScan/include/Audio.h +++ b/libs/mediaScan/include/Audio.h @@ -4,7 +4,7 @@ * File: Audio.h * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/DVDImage.h b/libs/mediaScan/include/DVDImage.h index 5845d77..ce48c79 100644 --- a/libs/mediaScan/include/DVDImage.h +++ b/libs/mediaScan/include/DVDImage.h @@ -4,7 +4,7 @@ * File: DVDImage.h * Created: 3. Juli 2012, 08 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/FSMediaScanner.h b/libs/mediaScan/include/FSMediaScanner.h index 1c85b46..a40bfb7 100644 --- a/libs/mediaScan/include/FSMediaScanner.h +++ b/libs/mediaScan/include/FSMediaScanner.h @@ -4,7 +4,7 @@ * File: FSMediaScanner.h * Created: 2. Juli 2012, 13 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/LegacyVdrRecording.h b/libs/mediaScan/include/LegacyVdrRecording.h index cc46348..1f73acb 100644 --- a/libs/mediaScan/include/LegacyVdrRecording.h +++ b/libs/mediaScan/include/LegacyVdrRecording.h @@ -4,7 +4,7 @@ * File: LegacyVdrRecording.h * Created: 3. Juli 2012, 08 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/MediaFactory.h b/libs/mediaScan/include/MediaFactory.h index 2ddcaa5..da7e113 100644 --- a/libs/mediaScan/include/MediaFactory.h +++ b/libs/mediaScan/include/MediaFactory.h @@ -4,7 +4,7 @@ * File: MediaFactory.h * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/MediainfoReader.h b/libs/mediaScan/include/MediainfoReader.h index f45b5e7..5e94785 100644 --- a/libs/mediaScan/include/MediainfoReader.h +++ b/libs/mediaScan/include/MediainfoReader.h @@ -1,10 +1,27 @@ -/* - * File: MediainfoReader.h - * Author: django - * - * Created on 30. Juli 2012, 15:03 +/** + * ======================== legal notice ====================== + * + * File: MediainfoReader.h + * Created: 30. Juli 2012, 15:03 + * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> + * Project: libMediaScan: mediatypes and media scanning + * + * 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 MEDIAINFOREADER_H #define MEDIAINFOREADER_H diff --git a/libs/mediaScan/include/Movie.h b/libs/mediaScan/include/Movie.h index 5a4f60d..e01903d 100644 --- a/libs/mediaScan/include/Movie.h +++ b/libs/mediaScan/include/Movie.h @@ -4,7 +4,7 @@ * File: Movie.h * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/Picture.h b/libs/mediaScan/include/Picture.h index 669509b..0ef37bb 100644 --- a/libs/mediaScan/include/Picture.h +++ b/libs/mediaScan/include/Picture.h @@ -4,7 +4,7 @@ * File: Picture.h * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/include/VdrRecording.h b/libs/mediaScan/include/VdrRecording.h index a8ec292..8e0789b 100644 --- a/libs/mediaScan/include/VdrRecording.h +++ b/libs/mediaScan/include/VdrRecording.h @@ -4,7 +4,7 @@ * File: VdrRecording.h * Created: 3. Juli 2012, 08 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/mediaScan.cbp b/libs/mediaScan/mediaScan.cbp deleted file mode 100644 index 3ee2b08..0000000 --- a/libs/mediaScan/mediaScan.cbp +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.libs.mediaScan" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="mediaScan" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Debug/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="mediaScan" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Release/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <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="../vdr/include" /> - <Add directory="../util/include" /> - <Add directory="../IO/include" /> - <Add directory="../networking/include" /> - <Add directory="include" /> - </Compiler> - <Unit filename="include/AbstractMedia.h" /> - <Unit filename="include/AbstractMultiFileMovie.h" /> - <Unit filename="include/Audio.h" /> - <Unit filename="include/DVDImage.h" /> - <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" /> - <Unit filename="src/AbstractMedia.cc" /> - <Unit filename="src/AbstractMultiFileMovie.cc" /> - <Unit filename="src/Audio.cc" /> - <Unit filename="src/DVDImage.cc" /> - <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" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/libs/mediaScan/mediaScan.depend b/libs/mediaScan/mediaScan.depend deleted file mode 100644 index c4ac310..0000000 --- a/libs/mediaScan/mediaScan.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/libs/mediaScan/mediaScan.layout b/libs/mediaScan/mediaScan.layout deleted file mode 100644 index e7fed61..0000000 --- a/libs/mediaScan/mediaScan.layout +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <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="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"> - <Cursor> - <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="src/VdrRecording.cc" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <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"> - <Cursor> - <Cursor1 position="1317" topLine="18" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/libs/mediaScan/src/AbstractMedia.cc b/libs/mediaScan/src/AbstractMedia.cc index 924f01a..98c72bb 100644 --- a/libs/mediaScan/src/AbstractMedia.cc +++ b/libs/mediaScan/src/AbstractMedia.cc @@ -4,7 +4,7 @@ * File: AbstractMedia.cc * Created: 2. Juli 2012, 14 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/AbstractMultiFileMovie.cc b/libs/mediaScan/src/AbstractMultiFileMovie.cc index f679511..7ff8b10 100644 --- a/libs/mediaScan/src/AbstractMultiFileMovie.cc +++ b/libs/mediaScan/src/AbstractMultiFileMovie.cc @@ -4,7 +4,7 @@ * File: AbstractMultiFileMovie.cc * Created: 3. Juli 2012, 07 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/Audio.cc b/libs/mediaScan/src/Audio.cc index 6c90fbc..a17517f 100644 --- a/libs/mediaScan/src/Audio.cc +++ b/libs/mediaScan/src/Audio.cc @@ -4,7 +4,7 @@ * File: Audio.cc * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/DVDImage.cc b/libs/mediaScan/src/DVDImage.cc index 0d23ae1..1df6d1e 100644 --- a/libs/mediaScan/src/DVDImage.cc +++ b/libs/mediaScan/src/DVDImage.cc @@ -4,7 +4,7 @@ * File: DVDImage.cc * Created: 3. Juli 2012, 08 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/FSMediaScanner.cc b/libs/mediaScan/src/FSMediaScanner.cc index f4ac14e..2df5907 100644 --- a/libs/mediaScan/src/FSMediaScanner.cc +++ b/libs/mediaScan/src/FSMediaScanner.cc @@ -4,7 +4,7 @@ * File: FSMediaScanner.cc * Created: 2. Juli 2012, 13 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/LegacyVdrRecording.cc b/libs/mediaScan/src/LegacyVdrRecording.cc index 5ee635c..3c74b6e 100644 --- a/libs/mediaScan/src/LegacyVdrRecording.cc +++ b/libs/mediaScan/src/LegacyVdrRecording.cc @@ -4,7 +4,7 @@ * File: LegacyVdrRecording.cc * Created: 3. Juli 2012, 08 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/MediaFactory.cc b/libs/mediaScan/src/MediaFactory.cc index 4dec763..0af2fae 100644 --- a/libs/mediaScan/src/MediaFactory.cc +++ b/libs/mediaScan/src/MediaFactory.cc @@ -4,7 +4,7 @@ * File: MediaFactory.cc * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/MediainfoReader.cc b/libs/mediaScan/src/MediainfoReader.cc index cd1f3f6..e55b8d9 100644 --- a/libs/mediaScan/src/MediainfoReader.cc +++ b/libs/mediaScan/src/MediainfoReader.cc @@ -1,8 +1,26 @@ -/* - * File: MediainfoReader.cc - * Author: django - * - * Created on 30. Juli 2012, 15:03 +/** + * ======================== legal notice ====================== + * + * File: MediainfoReader.cc + * Created: 30. Juli 2012, 15:03 + * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> + * Project: libMediaScan: mediatypes and media scanning + * + * 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 <MediainfoReader.h> #include <LineReader.h> @@ -10,6 +28,10 @@ #include <pcrecpp.h> #include <vector> +static pcrecpp::RE comment("^\\s*#.*$"); +static pcrecpp::RE emptyLine("^\\s*$"); +static pcrecpp::RE entry("^\\s*(.+?)\\s*:\\s*(.+?)\\s*$"); + cMediainfoReader::cMediainfoReader(cLineReader *LineReader) : reader(LineReader) { @@ -46,24 +68,18 @@ 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; + do { + if (line && entry.FullMatch(line, &name, &value)) { + if (IsValuable(name)) { + rv = new InfoEntry(name, value); + break; } - rv = new InfoEntry(name, value); - break; } + line = reader->ReadLine(); + } while (line && !rv); return rv; } diff --git a/libs/mediaScan/src/Movie.cc b/libs/mediaScan/src/Movie.cc index a63ff19..042b397 100644 --- a/libs/mediaScan/src/Movie.cc +++ b/libs/mediaScan/src/Movie.cc @@ -4,7 +4,7 @@ * File: Movie.cc * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/Picture.cc b/libs/mediaScan/src/Picture.cc index 19a02a1..5253a78 100644 --- a/libs/mediaScan/src/Picture.cc +++ b/libs/mediaScan/src/Picture.cc @@ -4,7 +4,7 @@ * File: Picture.cc * Created: 2. Juli 2012, 15 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/mediaScan/src/VdrRecording.cc b/libs/mediaScan/src/VdrRecording.cc index 03abccf..10b6476 100644 --- a/libs/mediaScan/src/VdrRecording.cc +++ b/libs/mediaScan/src/VdrRecording.cc @@ -4,7 +4,7 @@ * File: VdrRecording.cc * Created: 3. Juli 2012, 08 * Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a> - * Project: libfsScan: mediatypes and filesystem scanning + * Project: libMediaScan: mediatypes and media scanning * * CMP - compound media player * diff --git a/libs/networking/.dep.inc b/libs/networking/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/libs/networking/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/libs/networking/networking.cbp b/libs/networking/networking.cbp deleted file mode 100644 index 9fbdf1b..0000000 --- a/libs/networking/networking.cbp +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.libs.networking" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="networking" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Debug/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="networking" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Release/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <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="../vdr/include" /> - <Add directory="../util/include" /> - <Add directory="../IO/include" /> - <Add directory="include" /> - </Compiler> - <Unit filename="include/AbstractSocket.h" /> - <Unit filename="include/Authorization.h" /> - <Unit filename="include/ClientSocket.h" /> - <Unit filename="include/ConnectionHandler.h" /> - <Unit filename="include/ConnectionPoint.h" /> - <Unit filename="include/Credentials.h" /> - <Unit filename="include/HTTPAuthorizationRequest.h" /> - <Unit filename="include/HTTPFileResponse.h" /> - <Unit filename="include/HTTPMessage.h" /> - <Unit filename="include/HTTPRequest.h" /> - <Unit filename="include/HTTPRequestHandler.h" /> - <Unit filename="include/HTTPResponse.h" /> - <Unit filename="include/HTTPServer.h" /> - <Unit filename="include/HTTPStatus.h" /> - <Unit filename="include/Principal.h" /> - <Unit filename="include/ServerConfig.h" /> - <Unit filename="include/ServerSocket.h" /> - <Unit filename="src/AbstractSocket.cc" /> - <Unit filename="src/Authorization.cc" /> - <Unit filename="src/ClientSocket.cc" /> - <Unit filename="src/ConnectionHandler.cc" /> - <Unit filename="src/ConnectionPoint.cc" /> - <Unit filename="src/Credentials.cc" /> - <Unit filename="src/HTTPAuthorizationRequest.cc" /> - <Unit filename="src/HTTPFileResponse.cc" /> - <Unit filename="src/HTTPMessage.cc" /> - <Unit filename="src/HTTPRequest.cc" /> - <Unit filename="src/HTTPRequestHandler.cc" /> - <Unit filename="src/HTTPResponse.cc" /> - <Unit filename="src/HTTPServer.cc" /> - <Unit filename="src/HTTPStatus.cc" /> - <Unit filename="src/Principal.cc" /> - <Unit filename="src/ServerConfig.cc" /> - <Unit filename="src/ServerSocket.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/libs/networking/networking.depend b/libs/networking/networking.depend deleted file mode 100644 index c4ac310..0000000 --- a/libs/networking/networking.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/libs/networking/networking.layout b/libs/networking/networking.layout deleted file mode 100644 index e4e1faa..0000000 --- a/libs/networking/networking.layout +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <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="1670" 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"> - <Cursor> - <Cursor1 position="0" topLine="0" /> - </Cursor> - </File> - <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="12222" topLine="271" /> - </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"> - <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"> - <Cursor> - <Cursor1 position="0" topLine="0" /> - </Cursor> - </File> - <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/HTTPMessage.cc" open="0" top="0" tabpos="8" 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"> - <Cursor> - <Cursor1 position="0" topLine="0" /> - </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"> - <Cursor> - <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"> - <Cursor> - <Cursor1 position="0" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/libs/networking/poll.sample b/libs/networking/poll.sample deleted file mode 100644 index a252b7d..0000000 --- a/libs/networking/poll.sample +++ /dev/null @@ -1,53 +0,0 @@ -EXAMPLES - - Checking for Events on a Stream - - The following example opens a pair of STREAMS devices and then waits for either one to become writable. This example proceeds as follows: - - 1. Sets the timeout parameter to 500 milliseconds. - 2. Opens the STREAMS devices /dev/dev0 and /dev/dev1, and then polls them, specifying POLLOUT and POLLWRBAND as the events of interest. - The STREAMS device names /dev/dev0 and /dev/dev1 are only examples of how STREAMS devices can be named; STREAMS naming conventions may vary among systems conforming to the IEEE Std 1003.1-2001. - 3. Uses the ret variable to determine whether an event has occurred on either of the two STREAMS. The poll() function is given 500 milliseconds to wait for an event to occur (if it has not occurred prior to the poll() call). - 4. Checks the returned value of ret. If a positive value is returned, one of the following can be done: - 1. Priority data can be written to the open STREAM on priority bands greater than 0, because the POLLWRBAND event occurred on the open STREAM ( fds[0] or fds[1]). - 2. Data can be written to the open STREAM on priority-band 0, because the POLLOUT event occurred on the open STREAM ( fds[0] or fds[1]). - 5. If the returned value is not a positive value, permission to write data to the open STREAM (on any priority band) is denied. - 6. If the POLLHUP event occurs on the open STREAM ( fds[0] or fds[1]), the device on the open STREAM has disconnected. - - #include <stropts.h> - #include <poll.h> - ... - struct pollfd fds[2]; - int timeout_msecs = 500; - int ret; - int i; - - - /* Open STREAMS device. */ - fds[0].fd = open("/dev/dev0", ...); - fds[1].fd = open("/dev/dev1", ...); - fds[0].events = POLLOUT | POLLWRBAND; - fds[1].events = POLLOUT | POLLWRBAND; - - - ret = poll(fds, 2, timeout_msecs); - - - if (ret > 0) { - /* An event on one of the fds has occurred. */ - for (i=0; i<2; i++) { - if (fds[i].revents & POLLWRBAND) { - /* Priority data may be written on device number i. */ - ... - } - if (fds[i].revents & POLLOUT) { - /* Data may be written on device number i. */ - ... - } - if (fds[i].revents & POLLHUP) { - /* A hangup has occurred on device number i. */ - ... - } - } - } - diff --git a/libs/networking/src/ServerConfig.cc b/libs/networking/src/ServerConfig.cc index 8fb7f0f..29e12d9 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> diff --git a/libs/util/.dep.inc b/libs/util/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/libs/util/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/libs/util/util.cbp b/libs/util/util.cbp deleted file mode 100644 index ae72cf4..0000000 --- a/libs/util/util.cbp +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.libs.util" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="util" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Debug/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="util" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Release/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Wall" /> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <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="../vdr/include" /> - <Add directory="include" /> - </Compiler> - <Unit filename="include/AbstractListAssembler.h" /> - <Unit filename="include/Codec.h" /> - <Unit filename="include/JSonWriter.h" /> - <Unit filename="include/MD5Calculator.h" /> - <Unit filename="include/ManagedMap.h" /> - <Unit filename="include/ManagedVector.h" /> - <Unit filename="include/NamedValue.h" /> - <Unit filename="include/StringBuilder.h" /> - <Unit filename="include/Url.h" /> - <Unit filename="include/util.h" /> - <Unit filename="src/AbstractListAssembler.cc" /> - <Unit filename="src/Codec.cc" /> - <Unit filename="src/JSonWriter.cc" /> - <Unit filename="src/MD5Calculator.cc" /> - <Unit filename="src/ManagedMap.cc" /> - <Unit filename="src/ManagedVector.cc" /> - <Unit filename="src/NamedValue.cc" /> - <Unit filename="src/StringBuilder.cc" /> - <Unit filename="src/Url.cc" /> - <Unit filename="src/util.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/libs/util/util.depend b/libs/util/util.depend deleted file mode 100644 index c4ac310..0000000 --- a/libs/util/util.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/libs/util/util.layout b/libs/util/util.layout deleted file mode 100644 index c2c66a9..0000000 --- a/libs/util/util.layout +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <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/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="include/StringBuilder.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="1959" topLine="0" /> - </Cursor> - </File> - <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="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"> - <Cursor> - <Cursor1 position="1532" topLine="0" /> - </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"> - <Cursor> - <Cursor1 position="1385" 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"> - <Cursor> - <Cursor1 position="1327" 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="src/JSonWriter.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <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/.dep.inc b/libs/vdr/.dep.inc deleted file mode 100644 index 4560e55..0000000 --- a/libs/vdr/.dep.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/libs/vdr/vdr.cbp b/libs/vdr/vdr.cbp deleted file mode 100644 index 7c05ab5..0000000 --- a/libs/vdr/vdr.cbp +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="CMP.libs.vdr" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="vdr" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Debug/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-fomit-frame-pointer" /> - <Add option="-Winit-self" /> - <Add option="-Wredundant-decls" /> - <Add option="-std=c++0x" /> - <Add option="-Wall" /> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="vdr" prefix_auto="1" extension_auto="1" /> - <Option working_dir="" /> - <Option object_output="obj/Release/" /> - <Option type="2" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-Winit-self" /> - <Add option="-Wredundant-decls" /> - <Add option="-Wmissing-declarations" /> - <Add option="-Wmissing-include-dirs" /> - <Add option="-std=c++0x" /> - <Add option="-Wextra" /> - <Add option="-Wall" /> - </Compiler> - </Target> - </Build> - <Compiler> - <Add option="-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 option="-DLOCDIR=/usr/share/locale" /> - <Add directory="include" /> - <Add directory="/usr/include/freetype2" /> - <Add directory="/usr/include/fribidi" /> - </Compiler> - <Unit filename="include/CharsetConv.h" /> - <Unit filename="include/CondWait.h" /> - <Unit filename="include/FileNameList.h" /> - <Unit filename="include/Logging.h" /> - <Unit filename="include/Mutex.h" /> - <Unit filename="include/ReadDir.h" /> - <Unit filename="include/String.h" /> - <Unit filename="include/StringList.h" /> - <Unit filename="include/Thread.h" /> - <Unit filename="include/TimeMs.h" /> - <Unit filename="include/Vector.h" /> - <Unit filename="include/i18n.h" /> - <Unit filename="include/tools.h" /> - <Unit filename="src/CharsetConv.cc" /> - <Unit filename="src/CondWait.cc" /> - <Unit filename="src/FileNameList.cc" /> - <Unit filename="src/Logging.cc" /> - <Unit filename="src/Mutex.cc" /> - <Unit filename="src/ReadDir.cc" /> - <Unit filename="src/String.cc" /> - <Unit filename="src/StringList.cc" /> - <Unit filename="src/Thread.cc" /> - <Unit filename="src/TimeMs.cc" /> - <Unit filename="src/i18n.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/libs/vdr/vdr.depend b/libs/vdr/vdr.depend deleted file mode 100644 index c4ac310..0000000 --- a/libs/vdr/vdr.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/libs/vdr/vdr.layout b/libs/vdr/vdr.layout deleted file mode 100644 index 2e909c1..0000000 --- a/libs/vdr/vdr.layout +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <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="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> - </File> - <File name="src/Logging.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="1283" topLine="0" /> - </Cursor> - </File> - <File name="include/CharsetConv.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="5244" 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"> - <Cursor> - <Cursor1 position="1690" 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"> - <Cursor> - <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"> - <Cursor> - <Cursor1 position="2160" 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"> - <Cursor> - <Cursor1 position="3680" topLine="57" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp b/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp deleted file mode 100644 index 346b0a3..0000000 --- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="Tests.ConnectionHandlerTest" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <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="../../cmps/serverlib/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="../../cmps/serverlib/libserverlib.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="pthread" /> - <Add library="rt" /> - <Add library="pcrecpp" /> - </Linker> - <Unit filename="ConnectionHandlerTest.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.depend b/tests/ConnectionHandlerTest/ConnectionHandlerTest.depend deleted file mode 100644 index c4ac310..0000000 --- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout b/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout deleted file mode 100644 index b559e7b..0000000 --- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <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="156" topLine="15" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/CredentialPersistence/CredentialPersistence.cbp b/tests/CredentialPersistence/CredentialPersistence.cbp deleted file mode 100644 index 0d81a73..0000000 --- a/tests/CredentialPersistence/CredentialPersistence.cbp +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="Tests.CredentialPersistence" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <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="../../cmps/serverlib/include" /> - <Add directory="../../libs/fsScan/include" /> - <Add directory="../../libs/networking/include" /> - <Add directory="../../libs/util/include" /> - <Add directory="../../libs/vdr/include" /> - </Compiler> - <Linker> - <Add library="../../cmps/serverlib/libserverlib.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="pthread" /> - <Add library="dl" /> - <Add library="rt" /> - <Add library="ssl" /> - </Linker> - <Unit filename="CredentialPersistence.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/tests/CredentialPersistence/CredentialPersistence.depend b/tests/CredentialPersistence/CredentialPersistence.depend deleted file mode 100644 index c4ac310..0000000 --- a/tests/CredentialPersistence/CredentialPersistence.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/tests/CredentialPersistence/CredentialPersistence.layout b/tests/CredentialPersistence/CredentialPersistence.layout deleted file mode 100644 index f0df7b3..0000000 --- a/tests/CredentialPersistence/CredentialPersistence.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <File name="CredentialPersistence.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="98" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/FilesystemTest/FilesystemTest.cbp b/tests/FilesystemTest/FilesystemTest.cbp deleted file mode 100644 index a9b8f84..0000000 --- a/tests/FilesystemTest/FilesystemTest.cbp +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="Tests.FilesystemTest" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <Add option="-fexceptions -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 option="-D__STDC_CONSTANT_MACROS" /> - <Add option="-D__STDC_FORMAT_MACROS" /> - <Add option="-D__STDC_LIMIT_MACROS" /> - <Add directory="../../libs/vdr/include" /> - <Add directory="../../libs/util/include" /> - <Add directory="../../libs/networking/include" /> - <Add directory="../../libs/IO/include" /> - <Add directory="../../libs/mediaScan/include" /> - <Add directory="include" /> - </Compiler> - <Linker> - <Add library="pthread" /> - <Add library="rt" /> - <Add library="ssl" /> - <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" /> - </Linker> - <Unit filename="main.cpp" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - <DoxyBlocks> - <comment_style block="0" line="0" /> - <doxyfile_project /> - <doxyfile_build /> - <doxyfile_warnings /> - <doxyfile_output /> - <doxyfile_dot /> - <general /> - </DoxyBlocks> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/tests/FilesystemTest/FilesystemTest.cscope_file_list b/tests/FilesystemTest/FilesystemTest.cscope_file_list deleted file mode 100644 index 7ac8741..0000000 --- a/tests/FilesystemTest/FilesystemTest.cscope_file_list +++ /dev/null @@ -1 +0,0 @@ -"/d/linux/CMP/tests/FilesystemTest/main.cpp" diff --git a/tests/FilesystemTest/FilesystemTest.depend b/tests/FilesystemTest/FilesystemTest.depend deleted file mode 100644 index c4ac310..0000000 --- a/tests/FilesystemTest/FilesystemTest.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/tests/FilesystemTest/FilesystemTest.layout b/tests/FilesystemTest/FilesystemTest.layout deleted file mode 100644 index 369877a..0000000 --- a/tests/FilesystemTest/FilesystemTest.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <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="202" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/JSonTest/JSonTest.cbp b/tests/JSonTest/JSonTest.cbp deleted file mode 100644 index cfbb238..0000000 --- a/tests/JSonTest/JSonTest.cbp +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="Tests.JSonTest" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <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/mediaScan/include" /> - <Add directory="../../libs/networking/include" /> - <Add directory="../../libs/util/include" /> - <Add directory="../../libs/vdr/include" /> - </Compiler> - <Linker> - <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="pthread" /> - <Add library="dl" /> - <Add library="rt" /> - <Add library="ssl" /> - </Linker> - <Unit filename="JSonTest.cc" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/tests/JSonTest/JSonTest.depend b/tests/JSonTest/JSonTest.depend deleted file mode 100644 index c4ac310..0000000 --- a/tests/JSonTest/JSonTest.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/tests/JSonTest/JSonTest.layout b/tests/JSonTest/JSonTest.layout deleted file mode 100644 index ec843ab..0000000 --- a/tests/JSonTest/JSonTest.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <File name="JSonTest.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="1541" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/MetaScanTest/MetaScanTest.cbp b/tests/MetaScanTest/MetaScanTest.cbp deleted file mode 100644 index 31b7674..0000000 --- a/tests/MetaScanTest/MetaScanTest.cbp +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="Tests.MetaScanTest" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <Add option="-fexceptions -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 option="-D_FILE_OFFSET_BITS=64" /> - <Add option="-D_LARGEFILE_SOURCE" /> - <Add option="-D_LARGEFILE64_SOURCE" /> - <Add option="-D__STDC_CONSTANT_MACROS" /> - <Add option="-D__STDC_FORMAT_MACROS" /> - <Add option="-D__STDC_LIMIT_MACROS" /> - <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/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="rt" /> - <Add library="pthread" /> - <Add library="ssl" /> - <Add library="crypt" /> - <Add library="pcrecpp" /> - <Add directory="/usr/lib" /> - </Linker> - <Unit filename="main.cpp" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/tests/MetaScanTest/MetaScanTest.depend b/tests/MetaScanTest/MetaScanTest.depend deleted file mode 100644 index 4a9fb68..0000000 --- a/tests/MetaScanTest/MetaScanTest.depend +++ /dev/null @@ -1,47 +0,0 @@ -# depslib dependency file v1.0 -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> - <errno.h> - <fcntl.h> - <stdio.h> - <unistd.h> - <wait.h> - <tr1/tuple> - <util.h> - -1343485153 /d/linux/CMP/libs/IO/include/File.h - <stddef.h> - <sys/types.h> - -1343628880 /d/linux/CMP/libs/IO/include/FileReader.h - <Reader.h> - -1343629066 /d/linux/CMP/libs/IO/include/LineReader.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 deleted file mode 100644 index 0daa8b2..0000000 --- a/tests/MetaScanTest/MetaScanTest.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <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="2038" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/MetaScanTest/main.cpp b/tests/MetaScanTest/main.cpp index 0236865..99eec78 100644 --- a/tests/MetaScanTest/main.cpp +++ b/tests/MetaScanTest/main.cpp @@ -79,6 +79,7 @@ static void setupMediainfoReader(cMediainfoReader *mir) static void testMediaInfo(const char *FileName) { cCommandReader *cr = new cCommandReader("/usr/bin/mediainfo"); +// cFileReader *fr = new cFileReader(new cFile("mi.output")); cMediainfoReader *mir = new cMediainfoReader(new cLineReader(cr)); cMediainfoReader::InfoEntry *ie; @@ -128,6 +129,7 @@ static void testCommandReader() int main() { +// testMediaInfo("blah"); dumpTextfile("srclient.conf"); std::cout << std::endl << "===========================================" << std::endl << std::endl; diff --git a/tests/StringBuilderTest/StringBuilderTest.cbp b/tests/StringBuilderTest/StringBuilderTest.cbp deleted file mode 100644 index b58f2b3..0000000 --- a/tests/StringBuilderTest/StringBuilderTest.cbp +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="Tests.StringBuilderTest" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="bin/Debug/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Debug/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - </Compiler> - </Target> - <Target title="Release"> - <Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj/Release/" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - <Add option="-fexceptions -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 option="-D_FILE_OFFSET_BITS=64" /> - <Add option="-D_LARGEFILE_SOURCE" /> - <Add option="-D_LARGEFILE64_SOURCE" /> - <Add option="-D__STDC_CONSTANT_MACROS" /> - <Add option="-D__STDC_FORMAT_MACROS" /> - <Add option="-D__STDC_LIMIT_MACROS" /> - <Add directory="../../libs/vdr/include" /> - <Add directory="../../libs/util/include" /> - <Add directory="../../libs/IO/include" /> - <Add directory="../../libs/networking/include" /> - <Add directory="../../libs/mediaScan/include" /> - </Compiler> - <Linker> - <Add library="pthread" /> - <Add library="rt" /> - <Add library="ssl" /> - <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" /> - </Linker> - <Unit filename="main.cpp" /> - <Extensions> - <code_completion /> - <envvars /> - <lib_finder disable_auto="1" /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/tests/StringBuilderTest/StringBuilderTest.depend b/tests/StringBuilderTest/StringBuilderTest.depend deleted file mode 100644 index c4ac310..0000000 --- a/tests/StringBuilderTest/StringBuilderTest.depend +++ /dev/null @@ -1 +0,0 @@ -# depslib dependency file v1.0 diff --git a/tests/StringBuilderTest/StringBuilderTest.layout b/tests/StringBuilderTest/StringBuilderTest.layout deleted file mode 100644 index a2754af..0000000 --- a/tests/StringBuilderTest/StringBuilderTest.layout +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <File name="main.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> - <Cursor> - <Cursor1 position="1759" topLine="0" /> - </Cursor> - </File> -</CodeBlocks_layout_file> diff --git a/tests/StringBuilderTest/srclient.conf b/tests/StringBuilderTest/srclient.conf deleted file mode 120000 index a159926..0000000 --- a/tests/StringBuilderTest/srclient.conf +++ /dev/null @@ -1 +0,0 @@ -/home/django/.cmp/srclient.conf
\ No newline at end of file |