migrated files from tools subdirectory in Main directory.

Corrected Handling of version-Number, now vdr -V shows it correct.

18 files changed, 23 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index d7497cc..794f981 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ OBJS = $(PLUGIN).o \
 	ffnetdevsetup.o osdworker.o tsworker.o clientcontrol.o netosd.o streamdevice.o \
 	pes2ts.o remote.o vncEncodeRRE.o vncEncodeCoRRE.o vncEncodeHexT.o \
 	vncEncoder.o translate.o \
+	tool_source.o tool_select.o tool_socket.o tools.o
 
 ### The main target:
 
diff --git a/clientcontrol.c b/clientcontrol.c
index 6cc545d..136531a 100644
--- a/clientcontrol.c
+++ b/clientcontrol.c
@@ -9,8 +9,8 @@
 
 #include <vdr/tools.h>
 
-#include "tools/socket.h"
-#include "tools/select.h"
+#include "tool_socket.h"
+#include "tool_select.h"
 
 #include "clientcontrol.h"
 #include "config.h"
diff --git a/clientcontrol.h b/clientcontrol.h
index 89a3969..99fd4e6 100644
--- a/clientcontrol.h
+++ b/clientcontrol.h
@@ -10,7 +10,7 @@
 
 #include <vdr/thread.h>
 
-#include "tools/socket.h"
+#include "tool_socket.h"
 #include "ffnetdev.h"
 
 enum CCPakType{ ptInfo=0, ptPlayState, ptPlayStateReq, ptStillPicture, ptFreeze };
diff --git a/ffnetdev.c b/ffnetdev.c
index 3aae115..03859ee 100644
--- a/ffnetdev.c
+++ b/ffnetdev.c
@@ -21,9 +21,8 @@
 #include "ffnetdevsetup.h"
 
 
-static const char *VERSION = "0.1.3";
-const char *cPluginFFNetDev::VERSION = VERSION;
-const char *cPluginFFNetDev::DESCRIPTION 		= trNOOP("Full Featured Network Device for Streaming");
+static const char *VERSION     = "0.1.3";
+static const char *DESCRIPTION = trNOOP("Full Featured Network Device for Streaming");
 //const char *cOSDWorker::MAINMENUENTRY 		= "FFNetDev";
  
 // --- cNetOSDProvider -----------------------------------------------
@@ -44,7 +43,7 @@ cOsd * cNetOSDProvider::CreateOsd(int Left, int Top, uint Level)
 // --- cPluginFFNetDev ----------------------------------------------------------
 
 const char *cPluginFFNetDev::Version(void) {
-		return tr(VERSION);
+		return VERSION;
 }
 
 const char *cPluginFFNetDev::Description(void) {
diff --git a/ffnetdev.h b/ffnetdev.h
index 8288ce6..36d8358 100644
--- a/ffnetdev.h
+++ b/ffnetdev.h
@@ -17,8 +17,8 @@
 
 class cPluginFFNetDev : public cPlugin {
 private:
-	static const char *DESCRIPTION;
-	static const char *VERSION;
+//	static const char *DESCRIPTION;
+//	static const char *VERSION;
 	//static const char *MAINMENUENTRY;
 	cStreamDevice *m_StreamDevice;
 	cMyRemote *m_Remote;
diff --git a/netosd.h b/netosd.h
index 857087b..237d903 100644
--- a/netosd.h
+++ b/netosd.h
@@ -9,7 +9,7 @@
 #define _NETOSD__H
 
 #include <vdr/osd.h>
-#include "tools/socket.h"
+#include "tool_socket.h"
 
 // --- cNetOSD -----------------------------------------------
 class cNetOSD : public cOsd {
diff --git a/osdworker.c b/osdworker.c
index 601f208..c928f03 100644
--- a/osdworker.c
+++ b/osdworker.c
@@ -8,8 +8,8 @@
 #include <vdr/tools.h>
 #include <sys/time.h>
 
-#include "tools/socket.h"
-#include "tools/select.h"
+#include "tool_socket.h"
+#include "tool_select.h"
 
 #include "osdworker.h"
 
diff --git a/osdworker.h b/osdworker.h
index 753f4b5..a74fed0 100644
--- a/osdworker.h
+++ b/osdworker.h
@@ -10,8 +10,8 @@
 
 #include <vdr/thread.h>
 
-#include "tools/socket.h"
-#include "tools/select.h"
+#include "tool_socket.h"
+#include "tool_select.h"
 #include "streamdevice.h"
 #include "remote.h"
 #include "netosd.h"
diff --git a/tools/select.c b/tool_select.c
index 0ab5f9b..dfcdb8d 100644
--- a/tools/select.c
+++ b/tool_select.c
@@ -1,4 +1,4 @@
-#include "tools/select.h"
+#include "tool_select.h"
 
 #include <vdr/tools.h>
 #include <sys/time.h>
diff --git a/tools/select.h b/tool_select.h
index 7071718..7071718 100644
--- a/tools/select.h
+++ b/tool_select.h
diff --git a/tools/socket.c b/tool_socket.c
index 92c0e07..ef20561 100644
--- a/tools/socket.c
+++ b/tool_socket.c
@@ -1,4 +1,4 @@
-#include "tools/socket.h"
+#include "tool_socket.h"
 
 #include <vdr/tools.h>
 
diff --git a/tools/socket.h b/tool_socket.h
index ceaad78..ad9b38e 100644
--- a/tools/socket.h
+++ b/tool_socket.h
@@ -2,7 +2,7 @@
 #define TOOLBOX_SOCKET_H
 
 #include "tools.h"
-#include "source.h"
+#include "tool_source.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/tools/source.c b/tool_source.c
index f8751b6..cbba76c 100644
--- a/tools/source.c
+++ b/tool_source.c
@@ -1,5 +1,5 @@
-#include "tools/source.h"
-#include "tools/select.h"
+#include "tool_source.h"
+#include "tool_select.h"
 
 #include <vdr/tools.h>
 #include <string.h>
diff --git a/tools/source.h b/tool_source.h
index 0e001b7..0e001b7 100644
--- a/tools/source.h
+++ b/tool_source.h
diff --git a/tools/tools.c b/tools.c
index fa813fa..cb46614 100644
--- a/tools/tools.c
+++ b/tools.c
@@ -1,4 +1,4 @@
-#include "tools/tools.h"
+#include "tools.h"
 
 #include <sys/time.h>
 #include <time.h>
diff --git a/tools/tools.h b/tools.h
index ab00c60..ab00c60 100644
--- a/tools/tools.h
+++ b/tools.h
diff --git a/tsworker.c b/tsworker.c
index 830b3a4..97fff90 100644
--- a/tsworker.c
+++ b/tsworker.c
@@ -9,8 +9,8 @@
 
 #include <vdr/tools.h>
 
-#include "tools/socket.h"
-#include "tools/select.h"
+#include "tool_socket.h"
+#include "tool_select.h"
 
 #include "tsworker.h"
 #include "config.h"
diff --git a/tsworker.h b/tsworker.h
index 22536e7..77daaf9 100644
--- a/tsworker.h
+++ b/tsworker.h
@@ -10,7 +10,7 @@
 
 #include <vdr/thread.h>
 
-#include "tools/socket.h"
+#include "tool_socket.h"
 #include "streamdevice.h"
 #include "remote.h"
 #include "netosd.h"