? .dependencies
Index: Makefile
===================================================================
RCS file: /var/cvsroot/streamdev/Makefile,v
retrieving revision 1.5
diff -U3 -r1.5 Makefile
--- Makefile	24 Apr 2005 16:19:14 -0000	1.5
+++ Makefile	15 Jun 2006 05:18:32 -0000
@@ -12,6 +12,11 @@
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }' | sed -e 's/[";]//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+
+ifeq ($(APIVERSION),)
+	APIVERSION = $(VDRVERSION)
+endif
 
 ### The C++ compiler and options:
 
@@ -64,7 +69,7 @@
 	server/livestreamer.o server/livefilter.o \
 	\
 	remux/tsremux.o remux/ts2ps.o remux/ts2es.o remux/extern.o
-	
+
 ifdef DEBUG
 	DEFINES += -DDEBUG
 	CXXFLAGS += -g
@@ -118,9 +123,9 @@
 libvdr-$(PLUGIN)-client.so: $(CLIENTOBJS) $(COMMONOBJS) libdvbmpeg/libdvbmpegtools.a
 libvdr-$(PLUGIN)-server.so: $(SERVEROBJS) $(COMMONOBJS) libdvbmpeg/libdvbmpegtools.a
 
-%.so: 
+%.so:
 	$(CXX) $(CXXFLAGS) -shared $^ -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
Index: common.h
===================================================================
RCS file: /var/cvsroot/streamdev/common.h,v
retrieving revision 1.7
diff -U3 -r1.7 common.h
--- common.h	6 Nov 2005 16:43:58 -0000	1.7
+++ common.h	15 Jun 2006 05:18:32 -0000
@@ -1,7 +1,7 @@
 /*
  *  $Id: common.h,v 1.7 2005/11/06 16:43:58 lordjaxom Exp $
  */
- 
+
 #ifndef VDR_STREAMDEV_COMMON_H
 #define VDR_STREAMDEV_COMMON_H
 
@@ -79,7 +79,7 @@
 	smNever,
 	sm_Count
 };
-	
+
 enum eSocketId {
 	siLive,
 	siReplay,
Index: streamdev-server.c
===================================================================
RCS file: /var/cvsroot/streamdev/streamdev-server.c,v
retrieving revision 1.2
diff -U3 -r1.2 streamdev-server.c
--- streamdev-server.c	9 May 2005 20:22:29 -0000	1.2
+++ streamdev-server.c	15 Jun 2006 05:18:33 -0000
@@ -14,20 +14,20 @@
 
 const char *cPluginStreamdevServer::DESCRIPTION = "VDR Streaming Server";
 
-cPluginStreamdevServer::cPluginStreamdevServer(void) 
+cPluginStreamdevServer::cPluginStreamdevServer(void)
 {
 }
 
-cPluginStreamdevServer::~cPluginStreamdevServer() 
+cPluginStreamdevServer::~cPluginStreamdevServer()
 {
 }
 
-const char *cPluginStreamdevServer::Description(void) 
+const char *cPluginStreamdevServer::Description(void)
 {
 	return tr(DESCRIPTION);
 }
 
-bool cPluginStreamdevServer::Start(void) 
+bool cPluginStreamdevServer::Start(void)
 {
 	i18n_name = Name();
 	RegisterI18n(Phrases);
@@ -37,7 +37,7 @@
 		fprintf(stderr, "streamdev-server: error while loading %s\n");
 		if (access(STREAMDEVHOSTSPATH, F_OK) != 0) {
 			fprintf(stderr, "  Please install streamdevhosts.conf into the path "
-			                "printed above. Without it\n" 
+			                "printed above. Without it\n"
 			                "  no client will be able to access your streaming-"
 			                "server. An example can be\n"
 			                "  found together with this plugin's sources.\n");
@@ -50,35 +50,42 @@
 	return true;
 }
 
-void cPluginStreamdevServer::Stop(void) 
+void cPluginStreamdevServer::Stop(void)
 {
 	cStreamdevServer::Destruct();
 }
 
-bool cPluginStreamdevServer::Active(void) 
+#if	VDRVERSNUM < 10347
+bool cPluginStreamdevServer::Active(void)
 {
 	return cStreamdevServer::Active();
 }
+#else
+cString cPluginStreamdevServer::Active(void)
+{
+  return (cStreamdevServer::Active()) ? tr("Streamdev-Server avtive") : NULL;
+}
+#endif
 
-const char *cPluginStreamdevServer::MainMenuEntry(void) 
+const char *cPluginStreamdevServer::MainMenuEntry(void)
 {
 	if (StreamdevServerSetup.SuspendMode == smOffer && !cSuspendCtl::IsActive())
 		return tr("Suspend Live TV");
 	return NULL;
 }
 
-cOsdObject *cPluginStreamdevServer::MainMenuAction(void) 
+cOsdObject *cPluginStreamdevServer::MainMenuAction(void)
 {
 	cControl::Launch(new cSuspendCtl);
 	return NULL;
 }
 
-cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) 
+cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void)
 {
 	return new cStreamdevServerMenuSetupPage;
 }
 
-bool cPluginStreamdevServer::SetupParse(const char *Name, const char *Value) 
+bool cPluginStreamdevServer::SetupParse(const char *Name, const char *Value)
 {
 	return StreamdevServerSetup.SetupParse(Name, Value);
 }
Index: streamdev-server.h
===================================================================
RCS file: /var/cvsroot/streamdev/streamdev-server.h,v
retrieving revision 1.2
diff -U3 -r1.2 streamdev-server.h
--- streamdev-server.h	9 May 2005 20:22:29 -0000	1.2
+++ streamdev-server.h	15 Jun 2006 05:18:33 -0000
@@ -1,7 +1,7 @@
 /*
  *  $Id: streamdev-server.h,v 1.2 2005/05/09 20:22:29 lordjaxom Exp $
  */
- 
+
 #ifndef VDR_STREAMDEVSERVER_H
 #define VDR_STREAMDEVSERVER_H
 
@@ -21,7 +21,11 @@
 	virtual const char *Description(void);
 	virtual bool Start(void);
 	virtual void Stop(void);
+#if	VDRVERSNUM < 10347
 	virtual bool Active(void);
+#else
+	virtual cString Active(void);
+#endif
 	virtual const char *MainMenuEntry(void);
 	virtual cOsdObject *MainMenuAction(void);
 	virtual cMenuSetupPage *SetupMenu(void);