summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--command/logos/DMAX-A16_9-P0.pgmbin0 -> 10728 bytes
-rw-r--r--command/logos/E4+1-A16_9-P0.pgmbin0 -> 19219 bytes
-rw-r--r--command/logos/E4+1-A4_3-P0.pgmbin14020 -> 19219 bytes
-rw-r--r--command/logos/E4-A16_9-P0.pgmbin0 -> 10019 bytes
-rw-r--r--command/logos/E4-A4_3-P0.pgmbin0 -> 19219 bytes
-rw-r--r--command/logos/E4_A16_9-P0.pgmbin9919 -> 0 bytes
-rw-r--r--command/logos/ITV3-A16_9-P0.pgmbin0 -> 19219 bytes
-rw-r--r--command/markad-standalone.cpp7
-rw-r--r--command/po/it_IT.po26
-rw-r--r--command/po/sk_SK.po23
-rw-r--r--command/video.cpp8
-rw-r--r--plugin/po/it_IT.po18
-rw-r--r--plugin/po/sk_SK.po116
13 files changed, 181 insertions, 17 deletions
diff --git a/command/logos/DMAX-A16_9-P0.pgm b/command/logos/DMAX-A16_9-P0.pgm
new file mode 100644
index 0000000..c79317f
--- /dev/null
+++ b/command/logos/DMAX-A16_9-P0.pgm
Binary files differ
diff --git a/command/logos/E4+1-A16_9-P0.pgm b/command/logos/E4+1-A16_9-P0.pgm
new file mode 100644
index 0000000..16d0853
--- /dev/null
+++ b/command/logos/E4+1-A16_9-P0.pgm
Binary files differ
diff --git a/command/logos/E4+1-A4_3-P0.pgm b/command/logos/E4+1-A4_3-P0.pgm
index b29c2e0..3ba41b2 100644
--- a/command/logos/E4+1-A4_3-P0.pgm
+++ b/command/logos/E4+1-A4_3-P0.pgm
Binary files differ
diff --git a/command/logos/E4-A16_9-P0.pgm b/command/logos/E4-A16_9-P0.pgm
new file mode 100644
index 0000000..bf61f0f
--- /dev/null
+++ b/command/logos/E4-A16_9-P0.pgm
Binary files differ
diff --git a/command/logos/E4-A4_3-P0.pgm b/command/logos/E4-A4_3-P0.pgm
new file mode 100644
index 0000000..3bc0b9c
--- /dev/null
+++ b/command/logos/E4-A4_3-P0.pgm
Binary files differ
diff --git a/command/logos/E4_A16_9-P0.pgm b/command/logos/E4_A16_9-P0.pgm
deleted file mode 100644
index acefd71..0000000
--- a/command/logos/E4_A16_9-P0.pgm
+++ /dev/null
Binary files differ
diff --git a/command/logos/ITV3-A16_9-P0.pgm b/command/logos/ITV3-A16_9-P0.pgm
new file mode 100644
index 0000000..3e9b461
--- /dev/null
+++ b/command/logos/ITV3-A16_9-P0.pgm
Binary files differ
diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
index 33fb53b..3f38cf4 100644
--- a/command/markad-standalone.cpp
+++ b/command/markad-standalone.cpp
@@ -221,7 +221,7 @@ void cMarkAdStandalone::CheckStop()
}
else
{
- isyslog("removing marks from position %i",iStop);
+ isyslog("removing marks from position %i, if any",iStop);
}
marks.DelTill(iStop,false);
}
@@ -469,7 +469,7 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark)
clMark *prev=marks.GetLast();
if (prev)
{
- if ((Mark->Type==MT_LOGOSTART) && (!iStart))
+ if ((Mark->Type==MT_LOGOSTART) && (!iStart) && (Mark->Position<abs(iStop)))
{
if (prev->type==MT_LOGOSTOP)
{
@@ -2014,7 +2014,6 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig *
{
isyslog("timer info usage disabled by user");
}
-
if (config->logoExtraction!=-1)
{
// just to be sure extraction works
@@ -2073,7 +2072,7 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig *
}
else
{
- if (!CheckLogo())
+ if (!CheckLogo() && (config->logoExtraction==-1))
{
isyslog("no logo found, logo detection disabled");
macontext.Video.Options.IgnoreLogoDetection=true;
diff --git a/command/po/it_IT.po b/command/po/it_IT.po
new file mode 100644
index 0000000..4c0e06d
--- /dev/null
+++ b/command/po/it_IT.po
@@ -0,0 +1,26 @@
+# This file is distributed under the same license as the markad package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: markad\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-05-27 15:32+0200\n"
+"PO-Revision-Date: 2011-03-05 15:55+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "starting markad for"
+msgstr "avvio markad per"
+
+msgid "markad aborted for"
+msgstr "markad annullato per"
+
+msgid "markad finished for"
+msgstr "markad completato per"
+
diff --git a/command/po/sk_SK.po b/command/po/sk_SK.po
new file mode 100644
index 0000000..41f782b
--- /dev/null
+++ b/command/po/sk_SK.po
@@ -0,0 +1,23 @@
+# This file is distributed under the same license as the markad package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: markad\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-05-27 15:32+0200\n"
+"PO-Revision-Date: 2011-03-01 20:30+0100\n"
+"Last-Translator: milan hrala <hrala.milan@gmail.com>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "starting markad for"
+msgstr "Spúšťa sa vyhladávanie reklamy v"
+
+msgid "markad aborted for"
+msgstr "Vyhladávanie reklamy zrušené v"
+
+msgid "markad finished for"
+msgstr "Vyhladávanie reklamy skončilo v"
+
diff --git a/command/video.cpp b/command/video.cpp
index ffb24cf..31d0bdc 100644
--- a/command/video.cpp
+++ b/command/video.cpp
@@ -223,8 +223,8 @@ int cMarkAdLogo::SobelPlane(int plane)
}
int boundary=6;
- int cutval=127;
- //int cutval=60;
+ //int cutval=127;
+ int cutval=32;
int width=LOGOWIDTH;
if (plane>0)
@@ -335,13 +335,13 @@ int cMarkAdLogo::Detect(int framenumber, int *logoframenumber)
}
if (extract) return LOGO_NOCHANGE;
if (!processed) return LOGO_ERROR;
-
+#if 0
if (processed==1)
{
if ((area.intensity>100) || (area.status!=LOGO_VISIBLE) &&
(area.intensity>180)) return LOGO_NOCHANGE;
}
-
+#endif
int ret=LOGO_NOCHANGE;
if (area.status==LOGO_UNINITIALIZED)
{
diff --git a/plugin/po/it_IT.po b/plugin/po/it_IT.po
index 6e5c26c..4d09bdd 100644
--- a/plugin/po/it_IT.po
+++ b/plugin/po/it_IT.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: vdr\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2011-02-22 21:59+0100\n"
-"PO-Revision-Date: 2010-08-09 20:05+0100\n"
+"PO-Revision-Date: 2011-03-05 16:11+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -67,19 +67,19 @@ msgid " while replaying"
msgstr " durante la riproduzione"
msgid "scan only channels with logo"
-msgstr ""
+msgstr "Scansione solo canali con loghi"
msgid "ignore timer margins"
msgstr "Ignora margini timer"
msgid "detect overlaps"
-msgstr ""
+msgstr "Rileva sovrapposizioni"
msgid "repair index, if broken"
msgstr "Ripara indice, se errato"
msgid "correct info file"
-msgstr ""
+msgstr "File info corretto"
msgid "OSD message"
msgstr "Messaggio OSD"
@@ -88,19 +88,19 @@ msgid "verbose logging"
msgstr "Log dettagliato"
msgid "log to recording directory"
-msgstr ""
+msgstr "Log nella directory di registrazione"
msgid "hide mainmenu entry"
-msgstr ""
+msgstr "Nascondi voce menu principale"
msgid "show list"
-msgstr ""
+msgstr "Mostra elenco"
msgid "list"
-msgstr ""
+msgstr "Elenco"
msgid "back"
-msgstr ""
+msgstr "Indietro"
msgid "Mark advertisements"
msgstr "Segna i marcatori della pubblicitá"
diff --git a/plugin/po/sk_SK.po b/plugin/po/sk_SK.po
new file mode 100644
index 0000000..6c7de3e
--- /dev/null
+++ b/plugin/po/sk_SK.po
@@ -0,0 +1,116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: markad\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2011-02-23 22:24+0100\n"
+"PO-Revision-Date: 2011-03-01 20:26+0100\n"
+"Last-Translator: milan hrala <hrala.milan@gmail.com>\n"
+"Language-Team: milan hrala <grala.milan@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "markad still running"
+msgstr "Detekcia reklamy stále beží"
+
+msgid "markad status"
+msgstr "Stav detekcie reklamy"
+
+msgid "running"
+msgstr "spustené"
+
+msgid "sleeping"
+msgstr "spí"
+
+msgid "inactive"
+msgstr "nečinné"
+
+msgid "zombie"
+msgstr "zombi"
+
+msgid "stopped"
+msgstr "zastavené"
+
+msgid "unknown"
+msgstr "neznáme"
+
+msgid "Recording\t Status"
+msgstr "Stavy nahrávania"
+
+msgid "no running markad found"
+msgstr "Nie je spustené žiadne snímanie reklamy"
+
+msgid "Pause"
+msgstr "Prerušiť"
+
+msgid "Continue"
+msgstr "Pokračovať"
+
+msgid "after"
+msgstr "po"
+
+msgid "during"
+msgstr "priebežne"
+
+msgid "execution"
+msgstr "vykonávať"
+
+msgid " during another recording"
+msgstr " počas iného nahrávania"
+
+msgid " while replaying"
+msgstr " keď sa prehráva"
+
+msgid "scan only channels with logo"
+msgstr "Snímať kanály iba s logom"
+
+msgid "ignore timer margins"
+msgstr "Ignorovať okraje plánu"
+
+msgid "detect overlaps"
+msgstr "rozoznávanie presahov"
+
+msgid "repair index, if broken"
+msgstr "opraviť index, ak je poškodený"
+
+msgid "correct info file"
+msgstr "správne informácie súboru"
+
+msgid "OSD message"
+msgstr "OSD správa"
+
+msgid "verbose logging"
+msgstr "mnohoslovné logovanie"
+
+msgid "log to recording directory"
+msgstr "logovať do adresára nahrávky"
+
+msgid "hide mainmenu entry"
+msgstr "schovať v hlavnom menu"
+
+msgid "show list"
+msgstr "Zoznam"
+
+msgid "list"
+msgstr "zoznam"
+
+msgid "back"
+msgstr "späť"
+
+msgid "Mark advertisements"
+msgstr "Značkovač reklamy"
+
+#~ msgid "high"
+#~ msgstr "vysoký"
+#~ msgid "normal"
+#~ msgstr "normálny"
+#~ msgid "low"
+#~ msgstr "nízky"
+#~ msgid "backup marks"
+#~ msgstr "zálohovanie značiek"
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 06:49:56 +0000