diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/markad.cpp | 4 | ||||
| -rw-r--r-- | plugin/po/de_DE.po | 11 | ||||
| -rw-r--r-- | plugin/po/it_IT.po | 5 | ||||
| -rw-r--r-- | plugin/setup.cpp | 4 | ||||
| -rw-r--r-- | plugin/setup.h | 2 | ||||
| -rw-r--r-- | plugin/status.cpp | 10 |
6 files changed, 26 insertions, 10 deletions
diff --git a/plugin/markad.cpp b/plugin/markad.cpp index caca23f..718f756 100644 --- a/plugin/markad.cpp +++ b/plugin/markad.cpp @@ -25,6 +25,7 @@ cPluginMarkAd::cPluginMarkAd(void) setup.OSDMessage=false; setup.BackupMarks=false; setup.Verbose=false; + setup.NoMargins=false; } cPluginMarkAd::~cPluginMarkAd() @@ -115,7 +116,7 @@ bool cPluginMarkAd::Start(void) { // Start any background activities the plugin shall perform. statusMonitor = new cStatusMarkAd(bindir,logodir,&setup); - return true; + return (statusMonitor!=NULL); } void cPluginMarkAd::Stop(void) @@ -169,6 +170,7 @@ bool cPluginMarkAd::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name,"OSDMessage")) setup.OSDMessage=atoi(Value); else if (!strcasecmp(Name,"BackupMarks")) setup.BackupMarks=atoi(Value); else if (!strcasecmp(Name,"Verbose")) setup.Verbose=atoi(Value); + else if (!strcasecmp(Name,"IgnoreMargins")) setup.NoMargins=atoi(Value); else return false; return true; } diff --git a/plugin/po/de_DE.po b/plugin/po/de_DE.po index ae1ec98..ca20a0f 100644 --- a/plugin/po/de_DE.po +++ b/plugin/po/de_DE.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2010-04-18 15:58+0200\n" +"POT-Creation-Date: 2010-04-26 13:57+0200\n" "PO-Revision-Date: 2009-08-27 14:18+0200\n" "Last-Translator: Jochen Dolze <vdr@dolze.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" msgid "markad still running" -msgstr "MarkAd läuft noch" +msgstr "markad läuft noch" msgid "running" msgstr "aktiv" @@ -34,13 +34,13 @@ msgid "unknown" msgstr "unbekannt" msgid "markad status" -msgstr "MarkAd Status" +msgstr "markad Status" msgid "Recording\t Status" msgstr "Aufnahme\t Status" msgid "no running markad found" -msgstr "Kein aktives MarkAd gefunden" +msgstr "Kein aktives markad gefunden" msgid "Pause" msgstr "Pause" @@ -66,6 +66,9 @@ msgstr " während einer Wiedergabe" msgid "repair index, if broken" msgstr "Kaputte Indexdatei reparieren" +msgid "ignore timer margins" +msgstr "Timer Vor-/Nachlauf ignorieren" + msgid "OSD message" msgstr "OSD Meldung" diff --git a/plugin/po/it_IT.po b/plugin/po/it_IT.po index a592cd8..84ee7c0 100644 --- a/plugin/po/it_IT.po +++ b/plugin/po/it_IT.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2010-04-18 15:58+0200\n" +"POT-Creation-Date: 2010-04-26 13:57+0200\n" "PO-Revision-Date: 2009-11-14 18:06+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -69,6 +69,9 @@ msgstr "" msgid "repair index, if broken" msgstr "" +msgid "ignore timer margins" +msgstr "" + msgid "OSD message" msgstr "" diff --git a/plugin/setup.cpp b/plugin/setup.cpp index 1798239..5a23414 100644 --- a/plugin/setup.cpp +++ b/plugin/setup.cpp @@ -18,6 +18,7 @@ cSetupMarkAd::cSetupMarkAd(struct setup *Setup) backupmarks=setup->BackupMarks; verbose=setup->Verbose; genindex=setup->GenIndex; + nomargins=setup->NoMargins; processTexts[0]=tr("after"); processTexts[1]=tr("during"); @@ -37,6 +38,7 @@ void cSetupMarkAd::write(void) } Add(new cMenuEditBoolItem(tr("repair index, if broken"),&genindex)); + Add(new cMenuEditBoolItem(tr("ignore timer margins"),&nomargins)); Add(new cMenuEditBoolItem(tr("OSD message"),&osdmsg)); Add(new cMenuEditBoolItem(tr("backup marks"),&backupmarks)); @@ -72,6 +74,7 @@ void cSetupMarkAd::Store(void) SetupStore("Execution",processduring); SetupStore("whileRecording",whilerecording); SetupStore("whileReplaying",whilereplaying); + SetupStore("IgnoreMargins",nomargins); SetupStore("BackupMarks",backupmarks); SetupStore("GenIndex",genindex); SetupStore("OSDMessage",osdmsg); @@ -84,4 +87,5 @@ void cSetupMarkAd::Store(void) setup->GenIndex=(bool) genindex; setup->BackupMarks=(bool) backupmarks; setup->Verbose=(bool) verbose; + setup->NoMargins=(bool) nomargins; } diff --git a/plugin/setup.h b/plugin/setup.h index dab1501..9eb8119 100644 --- a/plugin/setup.h +++ b/plugin/setup.h @@ -19,6 +19,7 @@ struct setup bool BackupMarks; bool Verbose; bool GenIndex; + bool NoMargins; }; class cSetupMarkAd : public cMenuSetupPage @@ -33,6 +34,7 @@ private: int backupmarks; int verbose; int genindex; + int nomargins; void write(void); protected: virtual void Store(void); diff --git a/plugin/status.cpp b/plugin/status.cpp index 91a4d56..1068b34 100644 --- a/plugin/status.cpp +++ b/plugin/status.cpp @@ -69,10 +69,12 @@ bool cStatusMarkAd::Start(const char *FileName, const char *Name, bool Direct) { if ((Direct) && (Get(FileName)!=-1)) return false; - cString cmd = cString::sprintf("\"%s\"/markad %s %s %s %s -l \"%s\" %s \"%s\"",bindir, - setup->Verbose ? "-v" : "", setup->BackupMarks ? "-B" : "", - setup->GenIndex ? "-G" : "", - setup->OSDMessage ? "-O" : "", + cString cmd = cString::sprintf("\"%s\"/markad %s%s%s%s%s -l \"%s\" %s \"%s\"",bindir, + setup->Verbose ? " -v " : "", + setup->BackupMarks ? " -B " : "", + setup->GenIndex ? " -G " : "", + setup->OSDMessage ? " -O " : "", + setup->NoMargins ? " -i 4 " : "", logodir,Direct ? "-O after" : "--online=2 before", FileName); dsyslog("markad: executing %s",*cmd); if (SystemExec(cmd)!=-1) |