From 9ec196d2f1245efbce3684f21027ea39b2501027 Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Tue, 23 Mar 2010 15:55:03 +0100
Subject: Fixed wrong logging output, added some more useful information

---
 markad-standalone.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/markad-standalone.cpp b/markad-standalone.cpp
index 3bd71bb..98d9091 100644
--- a/markad-standalone.cpp
+++ b/markad-standalone.cpp
@@ -770,14 +770,6 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, bool BackupMarks, in
 
     bBackupMarks=BackupMarks;
 
-    if (LogoExtraction!=-1)
-    {
-        // just to be sure extraction works
-        bDecodeVideo=true;
-        bIgnoreAudioInfo=true;
-        bIgnoreVideoInfo=true;
-    }
-
     macontext.General.DPid.Type=MARKAD_PIDTYPE_AUDIO_AC3;
     macontext.General.APid.Type=MARKAD_PIDTYPE_AUDIO_MP2;
 
@@ -801,6 +793,14 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, bool BackupMarks, in
         isyslog("video info usage disabled by user");
     }
 
+    if (LogoExtraction!=-1)
+    {
+        // just to be sure extraction works
+        bDecodeVideo=true;
+        bIgnoreAudioInfo=true;
+        bIgnoreVideoInfo=true;
+    }
+
     if (!CheckTS(Directory))
     {
         video_demux=NULL;
@@ -862,7 +862,11 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, bool BackupMarks, in
 
     if (!LoadInfo(Directory))
     {
-        if (bDecodeVideo) esyslog("failed loading info - logo detection disabled");
+        if (bDecodeVideo)
+        {
+            esyslog("failed loading info - logo %s disabled",
+                    (LogoExtraction!=-1) ? "extraction" : "detection");
+        }
     }
 
     if (MarkFileName[0]) marks.SetFileName(MarkFileName);
-- 
cgit v1.2.3