added -G and --bstart/--bstop options

6 files changed, 32 insertions, 5 deletions

diff --git a/plugin/markad.cpp b/plugin/markad.cpp
index 5fc04bb..caca23f 100644
--- a/plugin/markad.cpp
+++ b/plugin/markad.cpp
@@ -21,6 +21,7 @@ cPluginMarkAd::cPluginMarkAd(void)
     setup.ProcessDuring=true;
     setup.whileRecording=true;
     setup.whileReplaying=true;
+    setup.GenIndex=true;
     setup.OSDMessage=false;
     setup.BackupMarks=false;
     setup.Verbose=false;
@@ -96,6 +97,17 @@ bool cPluginMarkAd::ProcessArgs(int argc, char *argv[])
 bool cPluginMarkAd::Initialize(void)
 {
     // Initialize any background activities the plugin shall perform.
+    char *path;
+    if (asprintf(&path,"%s/markad",bindir)==-1) return false;
+    struct stat statbuf;
+    if (stat(path,&statbuf)==-1)
+    {
+        esyslog("markad: cannot find %s, please install",path);
+        free(path);
+        return false;
+    }
+    free(path);
+
     return true;
 }
 
diff --git a/plugin/po/de_DE.po b/plugin/po/de_DE.po
index aceb4bd..ae1ec98 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-10 13:35+0200\n"
+"POT-Creation-Date: 2010-04-18 15:58+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"
@@ -63,6 +63,9 @@ msgstr "  während einer anderen Aufnahme"
 msgid "  while replaying"
 msgstr "  während einer Wiedergabe"
 
+msgid "repair index, if broken"
+msgstr "Kaputte Indexdatei reparieren"
+
 msgid "OSD message"
 msgstr "OSD Meldung"
 
diff --git a/plugin/po/it_IT.po b/plugin/po/it_IT.po
index 047603f..a592cd8 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-10 13:35+0200\n"
+"POT-Creation-Date: 2010-04-18 15:58+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"
@@ -66,6 +66,9 @@ msgstr ""
 msgid "  while replaying"
 msgstr ""
 
+msgid "repair index, if broken"
+msgstr ""
+
 msgid "OSD message"
 msgstr ""
 
diff --git a/plugin/setup.cpp b/plugin/setup.cpp
index 157291a..1798239 100644
--- a/plugin/setup.cpp
+++ b/plugin/setup.cpp
@@ -17,6 +17,7 @@ cSetupMarkAd::cSetupMarkAd(struct setup *Setup)
     osdmsg=setup->OSDMessage;
     backupmarks=setup->BackupMarks;
     verbose=setup->Verbose;
+    genindex=setup->GenIndex;
 
     processTexts[0]=tr("after");
     processTexts[1]=tr("during");
@@ -34,6 +35,9 @@ void cSetupMarkAd::write(void)
         Add(new cMenuEditBoolItem(tr("  during another recording"),&whilerecording));
         Add(new cMenuEditBoolItem(tr("  while replaying"),&whilereplaying));
     }
+
+    Add(new cMenuEditBoolItem(tr("repair index, if broken"),&genindex));
+
     Add(new cMenuEditBoolItem(tr("OSD message"),&osdmsg));
     Add(new cMenuEditBoolItem(tr("backup marks"),&backupmarks));
     Add(new cMenuEditBoolItem(tr("verbose logging"),&verbose));
@@ -69,6 +73,7 @@ void cSetupMarkAd::Store(void)
     SetupStore("whileRecording",whilerecording);
     SetupStore("whileReplaying",whilereplaying);
     SetupStore("BackupMarks",backupmarks);
+    SetupStore("GenIndex",genindex);
     SetupStore("OSDMessage",osdmsg);
     SetupStore("Verbose",verbose);
 
@@ -76,6 +81,7 @@ void cSetupMarkAd::Store(void)
     setup->whileRecording=(bool) whilerecording;
     setup->whileReplaying=(bool) whilereplaying;
     setup->OSDMessage=(bool) osdmsg;
+    setup->GenIndex=(bool) genindex;
     setup->BackupMarks=(bool) backupmarks;
     setup->Verbose=(bool) verbose;
 }
diff --git a/plugin/setup.h b/plugin/setup.h
index c13c769..dab1501 100644
--- a/plugin/setup.h
+++ b/plugin/setup.h
@@ -18,6 +18,7 @@ struct setup
     bool OSDMessage;
     bool BackupMarks;
     bool Verbose;
+    bool GenIndex;
 };
 
 class cSetupMarkAd : public cMenuSetupPage
@@ -31,6 +32,7 @@ private:
     int osdmsg;
     int backupmarks;
     int verbose;
+    int genindex;
     void write(void);
 protected:
     virtual void Store(void);
diff --git a/plugin/status.cpp b/plugin/status.cpp
index be32133..91a4d56 100644
--- a/plugin/status.cpp
+++ b/plugin/status.cpp
@@ -69,11 +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 -l \"%s\" %s \"%s\"",bindir,
+    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" : "",
-                                   logodir,Direct ? "after" : "--online=2 before", FileName);
-    dsyslog("executing %s",*cmd);
+                                   logodir,Direct ? "-O after" : "--online=2 before", FileName);
+    dsyslog("markad: executing %s",*cmd);
     if (SystemExec(cmd)!=-1)
     {
         usleep(200000);