From 830aa73e1a1398d947917a4212228a02c0ee7d74 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Tue, 1 May 2007 04:20:00 +0300 Subject: [PATCH] =?UTF-8?q?Fixed=20opening=20while=20replaying=20(Thanks?= =?UTF-8?q?=20to=20Antti=20Sepp=C3=A4l=C3=A4=20for=20reporting=20this=20on?= =?UTF-8?q?e).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HISTORY | 4 ++++ femon.c | 11 ++++++++++- femon.h | 2 +- femoni18n.c | 22 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 78e37cd..f66200c 100644 --- a/HISTORY +++ b/HISTORY @@ -244,3 +244,7 @@ VDR Plugin 'femon' Revision History 2007-01-08: Version 1.1.1 - Updated for vdr-1.5.0. + +2007-05-01: Version 1.1.2 + +- Fixed opening while replaying (Thanks to Antti Seppälä for reporting this one). diff --git a/femon.c b/femon.c index 811de5d..6f43afd 100644 --- a/femon.c +++ b/femon.c @@ -6,6 +6,7 @@ * $Id$ */ +#include #include #include "femoncfg.h" #include "femoni18n.h" @@ -72,7 +73,11 @@ cOsdObject *cPluginFemon::MainMenuAction(void) { // Perform the action when selected from the main VDR menu. Dprintf("%s()\n", __PRETTY_FUNCTION__); - return cFemonOsd::Instance(true); + if (cReplayControl::NowReplaying()) + Skins.Message(mtInfo, tr("Femon not available while replaying")); + else + return cFemonOsd::Instance(true); + return NULL; } bool cPluginFemon::SetupParse(const char *Name, const char *Value) @@ -160,6 +165,10 @@ const char **cPluginFemon::SVDRPHelpPages(void) cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode) { if (strcasecmp(Command, "OPEN") == 0) { + if (cReplayControl::NowReplaying()) { + ReplyCode = 550; // Requested action not taken + return cString("Cannot open femon plugin while replaying"); + } if (!cFemonOsd::Instance()) cRemote::CallPlugin("femon"); return cString("Opening femon plugin"); diff --git a/femon.h b/femon.h index b365036..4a07bc3 100644 --- a/femon.h +++ b/femon.h @@ -11,7 +11,7 @@ #include -static const char VERSION[] = "1.1.1"; +static const char VERSION[] = "1.1.2"; static const char DESCRIPTION[] = "DVB Signal Information Monitor (OSD)"; static const char MAINMENUENTRY[] = "Signal Information"; diff --git a/femoni18n.c b/femoni18n.c index 784403e..10e0017 100644 --- a/femoni18n.c +++ b/femoni18n.c @@ -2363,6 +2363,28 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", // Èesky (Czech) }, + { "Femon not available while replaying", // English + "", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "Signaalimittari ei ole käytettävissä toiston aikana", // suomi + "", // Polski + "", // Español + "", // ÅëëçíéêÜ (Greek) + "", // Svenska + "", // Romaneste + "", // Magyar + "", // Català + "", // ÀãááÚØÙ (Russian) + "", // Hrvatski (Croatian) + "", // Eesti + "", // Dansk + "", // Èesky (Czech) + }, { NULL } };