From caf42f7ace724876c908d4a77e2d007dad56f130 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Thu, 20 Apr 2006 04:20:00 +0300 Subject: [PATCH] Updated for vdr-1.3.47. --- HISTORY | 3 +++ Makefile | 13 ++++++------- femon.c | 4 ++-- femon.h | 8 +++++--- femonclient-0.0.1/Makefile | 17 ++++++++--------- femonclient-0.0.1/femonclient.c | 6 +++--- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/HISTORY b/HISTORY index 7528511..6ad27df 100644 --- a/HISTORY +++ b/HISTORY @@ -214,3 +214,6 @@ VDR Plugin 'femon' Revision History - Made all symbol data 'const'. - Added spanish translation (Thanks to Luis Palacios). +2006-04-20: Version 0.9.9 + +- Updated for vdr-1.3.47. diff --git a/Makefile b/Makefile index c4a9353..bd1a4a2 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ PLUGIN = femon ### The version number of this plugin (taken from the main source file): -VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g') +VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g') ### The C++ compiler and options: @@ -26,7 +26,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual ### The directory environment: -DVBDIR = ../../../../DVB VDRDIR = ../../.. LIBDIR = ../../lib TMPDIR = /tmp @@ -35,9 +34,9 @@ TMPDIR = /tmp -include $(VDRDIR)/Make.config -### The version number of VDR (taken from VDR's "config.h"): +### The version number of VDR's plugin API (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ### The name of the distribution archive: @@ -46,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include +INCLUDES += -I$(VDRDIR)/include DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' @@ -85,10 +84,10 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) ifndef FEMON_DEBUG - @strip $(LIBDIR)/$@.$(VDRVERSION) + @strip $@ endif + @cp $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/femon.c b/femon.c index 0123386..3040758 100644 --- a/femon.c +++ b/femon.c @@ -15,8 +15,8 @@ #include "femontools.h" #include "femon.h" -#if defined(VDRVERSNUM) && VDRVERSNUM < 10344 -#error "You don't exist! Go away! Upgrade yourself!" +#if defined(APIVERSNUM) && APIVERSNUM < 10347 +#error "VDR API version 10347 or greater is required!" #endif cPluginFemon::cPluginFemon() diff --git a/femon.h b/femon.h index 389779b..d81dec4 100644 --- a/femon.h +++ b/femon.h @@ -11,9 +11,9 @@ #include -static const char *VERSION = "0.9.8"; -static const char *DESCRIPTION = "DVB Signal Information Monitor (OSD)"; -static const char *MAINMENUENTRY = "Signal Information"; +static const char VERSION[] = "0.9.9"; +static const char DESCRIPTION[] = "DVB Signal Information Monitor (OSD)"; +static const char MAINMENUENTRY[] = "Signal Information"; class cPluginFemon : public cPlugin { public: @@ -27,6 +27,8 @@ public: virtual bool Start(void); virtual void Stop(void); virtual void Housekeeping(void); + virtual void MainThreadHook(void) {} + virtual cString Active(void) { return NULL; } virtual const char *MainMenuEntry(void) { return (femonConfig.hidemenu ? NULL : tr(MAINMENUENTRY)); } virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); diff --git a/femonclient-0.0.1/Makefile b/femonclient-0.0.1/Makefile index 75b691d..fe15918 100644 --- a/femonclient-0.0.1/Makefile +++ b/femonclient-0.0.1/Makefile @@ -11,7 +11,7 @@ PLUGIN = femonclient ### The version number of this plugin (taken from the main source file): -VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') +VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') ### The C++ compiler and options: @@ -20,27 +20,26 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual ### The directory environment: -DVBDIR = ../../../../DVB -VDRDIR = ../../.. -LIBDIR = ../../lib +VDRDIR = ../../../.. +LIBDIR = ../../../lib TMPDIR = /tmp ### Allow user defined options to overwrite defaults: -include $(VDRDIR)/Make.config -### The version number of VDR (taken from VDR's "config.h"): +### The version number of VDR's plugin API (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ### The name of the distribution archive: -ARCHIVE = svcintf-$(VERSION) +ARCHIVE = $(PLUGIN)-$(VERSION) PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/ +INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' @@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(PLUGIN).o $(CXX) $(CXXFLAGS) -shared $(PLUGIN).o -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + @cp $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/femonclient-0.0.1/femonclient.c b/femonclient-0.0.1/femonclient.c index 95d9048..d5a2020 100644 --- a/femonclient-0.0.1/femonclient.c +++ b/femonclient-0.0.1/femonclient.c @@ -11,9 +11,9 @@ #include #include "femonservice.h" -static const char *VERSION = "0.0.1"; -static const char *DESCRIPTION = "Femon client"; -static const char *MAINMENUENTRY = "Show frontend statistic on console"; +static const char VERSION[] = "0.0.1"; +static const char DESCRIPTION[] = "Femon client"; +static const char MAINMENUENTRY[] = "Show frontend statistic on console"; class cPluginFemonClient : public cPlugin { public: