summaryrefslogtreecommitdiff
path: root/cmps
diff options
context:
space:
mode:
authorgeronimo <geronimo013@gmx.de>2012-07-31 04:55:28 (GMT)
committergeronimo <geronimo013@gmx.de>2012-07-31 04:55:28 (GMT)
commit1d4bb88ac1927be040d1900bb2e1b0788e648b44 (patch)
tree77ee9def3d30d9234ba5d9f1064e656dc2f30e00 /cmps
parentcedb1ef9230b87b7f92bbec39970a0fccb49bb56 (diff)
downloadcmp-1d4bb88ac1927be040d1900bb2e1b0788e648b44.tar.gz
cmp-1d4bb88ac1927be040d1900bb2e1b0788e648b44.tar.bz2
fixed error in mediainfo-scanner, removed all code::blocks stuff, as it resulted being not reliable
Diffstat (limited to 'cmps')
-rw-r--r--cmps/.dep.inc5
-rw-r--r--cmps/server.cbp65
-rw-r--r--cmps/server.depend1
-rw-r--r--cmps/server.layout9
-rw-r--r--cmps/serverlib/.dep.inc5
-rw-r--r--cmps/serverlib/serverlib.cbp69
-rw-r--r--cmps/serverlib/serverlib.depend1
-rw-r--r--cmps/serverlib/serverlib.layout24
-rw-r--r--cmps/tests/MetaScanTest.cc12
9 files changed, 6 insertions, 185 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>