Fixed opening while replaying (Thanks to Antti Seppälä for reporting this one).

This commit is contained in:
Rolf Ahrenberg 2007-05-01 04:20:00 +03:00
parent 78048d8ea0
commit 830aa73e1a
4 changed files with 37 additions and 2 deletions

View File

@ -244,3 +244,7 @@ VDR Plugin 'femon' Revision History
2007-01-08: Version 1.1.1 2007-01-08: Version 1.1.1
- Updated for vdr-1.5.0. - 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).

11
femon.c
View File

@ -6,6 +6,7 @@
* $Id$ * $Id$
*/ */
#include <vdr/menu.h>
#include <vdr/remote.h> #include <vdr/remote.h>
#include "femoncfg.h" #include "femoncfg.h"
#include "femoni18n.h" #include "femoni18n.h"
@ -72,7 +73,11 @@ cOsdObject *cPluginFemon::MainMenuAction(void)
{ {
// Perform the action when selected from the main VDR menu. // Perform the action when selected from the main VDR menu.
Dprintf("%s()\n", __PRETTY_FUNCTION__); 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) 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) cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
{ {
if (strcasecmp(Command, "OPEN") == 0) { 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()) if (!cFemonOsd::Instance())
cRemote::CallPlugin("femon"); cRemote::CallPlugin("femon");
return cString("Opening femon plugin"); return cString("Opening femon plugin");

View File

@ -11,7 +11,7 @@
#include <vdr/plugin.h> #include <vdr/plugin.h>
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 DESCRIPTION[] = "DVB Signal Information Monitor (OSD)";
static const char MAINMENUENTRY[] = "Signal Information"; static const char MAINMENUENTRY[] = "Signal Information";

View File

@ -2363,6 +2363,28 @@ const tI18nPhrase Phrases[] = {
"", // Dansk "", // Dansk
"", // Česky (Czech) "", // Č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 } { NULL }
}; };