diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/markad.cpp | 2 | ||||
| -rw-r--r-- | plugin/po/de_DE.po | 5 | ||||
| -rw-r--r-- | plugin/po/it_IT.po | 5 | ||||
| -rw-r--r-- | plugin/setup.cpp | 8 | ||||
| -rw-r--r-- | plugin/setup.h | 2 | ||||
| -rw-r--r-- | plugin/status.cpp | 3 |
6 files changed, 20 insertions, 5 deletions
diff --git a/plugin/markad.cpp b/plugin/markad.cpp index bd1e335..75d77ee 100644 --- a/plugin/markad.cpp +++ b/plugin/markad.cpp @@ -36,6 +36,7 @@ cPluginMarkAd::cPluginMarkAd(void) setup.Verbose=false; setup.NoMargins=false; setup.HideMainMenuEntry=false; + setup.SecondPass=true; } cPluginMarkAd::~cPluginMarkAd() @@ -183,6 +184,7 @@ bool cPluginMarkAd::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name,"Verbose")) setup.Verbose=atoi(Value); else if (!strcasecmp(Name,"IgnoreMargins")) setup.NoMargins=atoi(Value); else if (!strcasecmp(Name,"HideMainMenuEntry")) setup.HideMainMenuEntry=atoi(Value)?true:false; + else if (!strcasecmp(Name,"SecondPass")) setup.SecondPass=atoi(Value); else return false; return true; } diff --git a/plugin/po/de_DE.po b/plugin/po/de_DE.po index 5515cc4..b46b33f 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-09-17 18:00+0200\n" +"POT-Creation-Date: 2010-10-06 14:53+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" @@ -69,6 +69,9 @@ msgstr "Kaputte Indexdatei reparieren" msgid "ignore timer margins" msgstr "Timer Vor-/Nachlauf ignorieren" +msgid "detect overlaps" +msgstr "erkenne Überlappungen" + msgid "OSD message" msgstr "OSD Meldung" diff --git a/plugin/po/it_IT.po b/plugin/po/it_IT.po index c7fe1da..c63dedd 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-09-17 18:09+0200\n" +"POT-Creation-Date: 2010-10-06 14:53+0200\n" "PO-Revision-Date: 2010-08-09 20:05+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -72,6 +72,9 @@ msgstr "Ripara indice, se errato" msgid "ignore timer margins" msgstr "Ignora margini timer" +msgid "detect overlaps" +msgstr "" + msgid "OSD message" msgstr "Messaggio OSD" diff --git a/plugin/setup.cpp b/plugin/setup.cpp index 86d7cd1..3f60c72 100644 --- a/plugin/setup.cpp +++ b/plugin/setup.cpp @@ -19,7 +19,8 @@ cSetupMarkAd::cSetupMarkAd(struct setup *Setup) verbose=setup->Verbose; genindex=setup->GenIndex; nomargins=setup->NoMargins; -hidemainmenuentry=setup->HideMainMenuEntry; + hidemainmenuentry=setup->HideMainMenuEntry; + secondpass=setup->SecondPass; processTexts[0]=tr("after"); processTexts[1]=tr("during"); @@ -40,11 +41,12 @@ 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("detect overlaps"),&secondpass)); Add(new cMenuEditBoolItem(tr("OSD message"),&osdmsg)); Add(new cMenuEditBoolItem(tr("backup marks"),&backupmarks)); Add(new cMenuEditBoolItem(tr("verbose logging"),&verbose)); - Add(new cMenuEditBoolItem(tr("Hide Mainmenu entry"),&hidemainmenuentry)); + Add(new cMenuEditBoolItem(tr("Hide Mainmenu entry"),&hidemainmenuentry)); Display(); } @@ -80,6 +82,7 @@ void cSetupMarkAd::Store(void) SetupStore("IgnoreMargins",nomargins); SetupStore("BackupMarks",backupmarks); SetupStore("GenIndex",genindex); + SetupStore("SecondPass",secondpass); SetupStore("OSDMessage",osdmsg); SetupStore("Verbose",verbose); SetupStore("HideMainMenuEntry",hidemainmenuentry); @@ -89,6 +92,7 @@ void cSetupMarkAd::Store(void) setup->whileReplaying=(bool) whilereplaying; setup->OSDMessage=(bool) osdmsg; setup->GenIndex=(bool) genindex; + setup->SecondPass=(bool) secondpass; setup->BackupMarks=(bool) backupmarks; setup->Verbose=(bool) verbose; setup->NoMargins=(bool) nomargins; diff --git a/plugin/setup.h b/plugin/setup.h index ab156af..446778f 100644 --- a/plugin/setup.h +++ b/plugin/setup.h @@ -19,6 +19,7 @@ struct setup bool Verbose; bool GenIndex; bool NoMargins; + bool SecondPass; bool HideMainMenuEntry; }; @@ -35,6 +36,7 @@ private: int verbose; int genindex; int nomargins; + int secondpass; int hidemainmenuentry; void write(void); protected: diff --git a/plugin/status.cpp b/plugin/status.cpp index 9fd800e..01a1dc5 100644 --- a/plugin/status.cpp +++ b/plugin/status.cpp @@ -71,12 +71,13 @@ bool cStatusMarkAd::Start(const char *FileName, const char *Name, const bool Dir { if ((Direct) && (Get(FileName)!=-1)) return false; - cString cmd = cString::sprintf("\"%s\"/markad %s%s%s%s%s -l \"%s\" %s \"%s\"",bindir, + cString cmd = cString::sprintf("\"%s\"/markad %s%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 " : "", + setup->SecondPass ? "" : " --pass1only ", logodir,Direct ? "-O after" : "--online=2 before", FileName); dsyslog("markad: executing %s",*cmd); if (SystemExec(cmd)!=-1) |