summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--command/markad-standalone.cpp6
-rw-r--r--plugin/markad.cpp2
-rw-r--r--plugin/po/de_DE.po14
-rw-r--r--plugin/po/es_ES.po14
-rw-r--r--plugin/po/it_IT.po14
-rw-r--r--plugin/setup.cpp8
-rw-r--r--plugin/setup.h3
-rw-r--r--plugin/status.cpp6
8 files changed, 9 insertions, 58 deletions
diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
index abf820b..51e4950 100644
--- a/command/markad-standalone.cpp
+++ b/command/markad-standalone.cpp
@@ -2167,7 +2167,7 @@ int usage(int svdrpport)
" io priority of markad when running in background\n"
" <class> 1 = realtime, <level> from 0..7, default 4\n"
" 2 = besteffort, <level> from 0..7, default 4\n"
- " 3 = idle\n"
+ " 3 = idle (default)\n"
"-v --verbose\n"
" increments loglevel by one, can be given multiple times\n"
"-B --backupmarks\n"
@@ -2283,8 +2283,8 @@ int main(int argc, char *argv[])
bool bAfter=false,bEdited=false;
bool bFork=false,bNice=false,bImmediateCall=false;
int niceLevel = 19;
- int ioprio_class=2;
- int ioprio=4;
+ int ioprio_class=3;
+ int ioprio=7;
char *tok,*str;
int ntok;
int online=0;
diff --git a/plugin/markad.cpp b/plugin/markad.cpp
index a83c12c..cd4594c 100644
--- a/plugin/markad.cpp
+++ b/plugin/markad.cpp
@@ -37,7 +37,6 @@ cPluginMarkAd::cPluginMarkAd(void)
setup.NoMargins=false;
setup.HideMainMenuEntry=false;
setup.SecondPass=true;
- setup.IOPrioClass=1;
setup.Log2Rec=false;
setup.LogoOnly=true;
setup.SaveInfo=false;
@@ -191,7 +190,6 @@ bool cPluginMarkAd::SetupParse(const char *Name, const char *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 if (!strcasecmp(Name,"IOPrioClass")) setup.IOPrioClass=atoi(Value);
else if (!strcasecmp(Name,"Log2Rec")) setup.Log2Rec=atoi(Value);
else if (!strcasecmp(Name,"LogoOnly")) setup.LogoOnly=atoi(Value);
else if (!strcasecmp(Name,"SaveInfo")) setup.SaveInfo=atoi(Value);
diff --git a/plugin/po/de_DE.po b/plugin/po/de_DE.po
index 9a7f228..41e9040 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: 2011-02-13 13:20+0100\n"
+"POT-Creation-Date: 2011-02-21 22:13+0100\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"
@@ -54,15 +54,6 @@ msgstr "danach"
msgid "during"
msgstr "während"
-msgid "high"
-msgstr "hoch"
-
-msgid "normal"
-msgstr "normal"
-
-msgid "low"
-msgstr "niedrig"
-
msgid "execution"
msgstr "Ausführung"
@@ -75,9 +66,6 @@ msgstr " während einer Wiedergabe"
msgid "scan only channels with logo"
msgstr "nur Kanäle mit Logo scannen"
-msgid "hdd access priority"
-msgstr "HDD-Zugriffspriorität"
-
msgid "ignore timer margins"
msgstr "Timer Vor-/Nachlauf ignorieren"
diff --git a/plugin/po/es_ES.po b/plugin/po/es_ES.po
index ffe9aaa..7f84da2 100644
--- a/plugin/po/es_ES.po
+++ b/plugin/po/es_ES.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-02-13 13:20+0100\n"
+"POT-Creation-Date: 2011-02-21 22:13+0100\n"
"PO-Revision-Date: 2011-02-12 11:30+0100\n"
"Last-Translator: Javier Bradineras <jbradi@hotmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -57,15 +57,6 @@ msgstr "Después"
msgid "during"
msgstr "Durante"
-msgid "high"
-msgstr "Alta"
-
-msgid "normal"
-msgstr "Normal"
-
-msgid "low"
-msgstr "Baja"
-
msgid "execution"
msgstr "Ejecución"
@@ -78,9 +69,6 @@ msgstr " Durante la reproducción"
msgid "scan only channels with logo"
msgstr "Escanea únicamente canales con logo"
-msgid "hdd access priority"
-msgstr "Prioridad de acceso al disco duro"
-
msgid "ignore timer margins"
msgstr "Ignora márgenes de tiempo"
diff --git a/plugin/po/it_IT.po b/plugin/po/it_IT.po
index a7293e3..4876f65 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: 2011-02-13 13:20+0100\n"
+"POT-Creation-Date: 2011-02-21 22:13+0100\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"
@@ -57,15 +57,6 @@ msgstr "dopo"
msgid "during"
msgstr "durante"
-msgid "high"
-msgstr ""
-
-msgid "normal"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
msgid "execution"
msgstr "Esecuzione"
@@ -78,9 +69,6 @@ msgstr " durante la riproduzione"
msgid "scan only channels with logo"
msgstr ""
-msgid "hdd access priority"
-msgstr ""
-
msgid "ignore timer margins"
msgstr "Ignora margini timer"
diff --git a/plugin/setup.cpp b/plugin/setup.cpp
index 82dced9..e9f1eda 100644
--- a/plugin/setup.cpp
+++ b/plugin/setup.cpp
@@ -12,7 +12,6 @@ cSetupMarkAd::cSetupMarkAd(struct setup *Setup)
setup=Setup;
processduring=setup->ProcessDuring;
- ioprioclass=setup->IOPrioClass;
whilerecording=setup->whileRecording;
whilereplaying=setup->whileReplaying;
osdmsg=setup->OSDMessage;
@@ -29,10 +28,6 @@ cSetupMarkAd::cSetupMarkAd(struct setup *Setup)
processTexts[0]=tr("after");
processTexts[1]=tr("during");
- ioprioTexts[0]=tr("high");
- ioprioTexts[1]=tr("normal");
- ioprioTexts[2]=tr("low");
-
lpos=0;
write();
@@ -52,7 +47,6 @@ void cSetupMarkAd::write(void)
}
Add(new cMenuEditBoolItem(tr("scan only channels with logo"),&logoonly),true);
lpos=Current();
- Add(new cMenuEditStraItem(tr("hdd access priority"),&ioprioclass,3,ioprioTexts));
Add(new cMenuEditBoolItem(tr("ignore timer margins"),&nomargins));
Add(new cMenuEditBoolItem(tr("detect overlaps"),&secondpass));
Add(new cMenuEditBoolItem(tr("repair index, if broken"),&genindex));
@@ -124,7 +118,6 @@ void cSetupMarkAd::Store(void)
SetupStore("OSDMessage",osdmsg);
SetupStore("Verbose",verbose);
SetupStore("HideMainMenuEntry",hidemainmenuentry);
- SetupStore("IOPrioClass",ioprioclass);
SetupStore("Log2Rec",log2rec);
SetupStore("LogoOnly",logoonly);
SetupStore("SaveInfo",saveinfo);
@@ -139,7 +132,6 @@ void cSetupMarkAd::Store(void)
setup->Verbose=(bool) verbose;
setup->NoMargins=(bool) nomargins;
setup->HideMainMenuEntry=(bool) hidemainmenuentry;
- setup->IOPrioClass=ioprioclass;
setup->Log2Rec=log2rec;
setup->LogoOnly=logoonly;
setup->SaveInfo=saveinfo;
diff --git a/plugin/setup.h b/plugin/setup.h
index 1994549..1529ab3 100644
--- a/plugin/setup.h
+++ b/plugin/setup.h
@@ -12,7 +12,6 @@
struct setup
{
bool ProcessDuring;
- int IOPrioClass;
bool whileRecording;
bool whileReplaying;
bool OSDMessage;
@@ -33,10 +32,8 @@ class cSetupMarkAd : public cMenuSetupPage
{
private:
const char *processTexts[2];
- const char *ioprioTexts[3];
struct setup *setup;
int processduring;
- int ioprioclass;
int whilerecording;
int whilereplaying;
int osdmsg;
diff --git a/plugin/status.cpp b/plugin/status.cpp
index bdf54ed..4784a17 100644
--- a/plugin/status.cpp
+++ b/plugin/status.cpp
@@ -71,7 +71,7 @@ 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%s%s%s -r %i -l \"%s\" %s \"%s\"",
+ cString cmd = cString::sprintf("\"%s\"/markad %s%s%s%s%s%s%s%s -l \"%s\" %s \"%s\"",
bindir,
setup->Verbose ? " -v " : "",
setup->BackupMarks ? " -B " : "",
@@ -81,7 +81,6 @@ bool cStatusMarkAd::Start(const char *FileName, const char *Name, const bool Dir
setup->NoMargins ? " -i 4 " : "",
setup->SecondPass ? "" : " --pass1only ",
setup->Log2Rec ? " -R " : "",
- setup->IOPrioClass+1,
logodir,Direct ? "-O after" : "--online=2 before",
FileName);
dsyslog("markad: executing %s",*cmd);
@@ -125,8 +124,9 @@ bool cStatusMarkAd::Start(const char *FileName, const char *Name, const bool Dir
void cStatusMarkAd::TimerChange(const cTimer *Timer, eTimerChange Change)
{
if (!Timer) return;
+ isyslog("markad: timer changed to %i now=%li StopTime()=%li",Change,time(NULL),Timer->StopTime());
if (Change!=tcDel) return;
- if (time(NULL)>=Timer->Stop()) return; // don't react on normal VDR timer deletion after recording
+ if (time(NULL)>=Timer->StopTime()) return; // don't react on normal VDR timer deletion after recording
Remove(Timer->File(),true);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 06:53:32 +0000