Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythtv/channelbase.cpp

mythplugins/configure

@@ -175,7 +175,7 @@ MythMusic related options:
   --enable-sdl             use SDL for the synaesthesia output [$sdl]
 
 MythNetvision related options:
-  --enable-mythnetvision      build the mythnetvision plugin [$netvision]
+  --enable-mythnetvision   build the mythnetvision plugin [$netvision]
 
 MythNews related options:
   --enable-mythnews        build the mythnews plugin [$news]
@@ -713,7 +713,7 @@ if test "$gallery" = "yes" ; then
             fi
         else
             if test x"$newexif" = x"yes" ; then
-		echo "#define NEW_LIB_EXIF 1" >> \
+                echo "#define NEW_LIB_EXIF 1" >> \
                     ./mythgallery/mythgallery/config.h
             else
                 echo

mythplugins/mytharchive/mytharchive/archiveutil.cpp

@@ -239,8 +239,11 @@ bool getFileDetails(ArchiveItem *a)
 
     // call mytharchivehelper to get files stream info etc.
     QString command = QString("mytharchivehelper --getfileinfo --infile \"%1\" "
-                              "--outfile \"%2\" --method %3 > /dev/null 2>&1")
+                              "--outfile \"%2\" --method %3")
             .arg(inFile).arg(outFile).arg(lenMethod);
+    command += logPropagateArgs;
+    if (!logPropagateQuiet())
+        command += " --quiet";
 
     uint flags = kMSDontBlockInputDevs | kMSDontDisableDrawing;
     if (myth_system(command, flags) != GENERIC_EXIT_OK)

mythplugins/mytharchive/mytharchive/exportnative.cpp

@@ -464,7 +464,10 @@ void ExportNative::runScript()
 
     createConfigFile(configDir + "/mydata.xml");
     commandline = "mytharchivehelper --nativearchive --outfile " + configDir + 
-                  "/mydata.xml --quiet";  // job file
+                  "/mydata.xml";  // job file
+    commandline += logPropagateArgs;
+    if (!logPropagateQuiet())
+        commandline += " --quiet";
     commandline += " > "  + logDir + "/progress.log 2>&1 &";            // Logs
 
     uint flags = kMSRunBackground | kMSDontBlockInputDevs | 

mythplugins/mytharchive/mytharchive/importnative.cpp

@@ -426,7 +426,10 @@ void ImportNative::finishedPressed()
         QFile::remove(logDir + "/progress.log");
 
     commandline = "mytharchivehelper --importnative --infile \"" + m_xmlFile + 
-                  "\" --chanid " + chanID + " --quiet";
+                  "\" --chanid " + chanID;
+    commandline += logPropagateArgs;
+    if (!logPropagateQuiet())
+        commandline += " --quiet";
     commandline += " > "  + logDir + "/progress.log 2>&1 &";
 
     uint flags = kMSRunBackground | kMSDontBlockInputDevs | 

mythplugins/mytharchive/mytharchive/logviewer.cpp

@@ -5,6 +5,7 @@
 // qt
 #include <QKeyEvent>
 #include <QFile>
+#include <QTextStream>
 
 // mythtv
 #include <mythcontext.h>

mythplugins/mytharchive/mytharchive/mythburn.cpp

@@ -1196,7 +1196,10 @@ void BurnMenu::doBurn(int mode)
 
     commandline = "mytharchivehelper --burndvd --mediatype " + sArchiveFormat +
                   (bEraseDVDRW ? " --erasedvdrw" : "") + 
-                  (bNativeFormat ? " --nativeformat" : "") + " --quiet";
+                  (bNativeFormat ? " --nativeformat" : "");
+    commandline += logPropagateArgs;
+    if (!logPropagateQuiet())
+        commandline += " --quiet";
     commandline += " > "  + logDir + "/progress.log 2>&1 &";
 
     uint flags = kMSRunBackground | kMSDontBlockInputDevs | 

mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -49,6 +49,7 @@ using namespace std;
 #include <QImage>
 #include <QMutex>
 #include <QMutexLocker>
+#include <QTextStream>
 
 // MythTV headers
 #include <mythcommandlineparser.h>
@@ -62,7 +63,6 @@ using namespace std;
 #include <mythconfig.h>
 #include <mythsystem.h>
 #include <util.h>
-#include <mythverbose.h>
 #include <mythlogging.h>
 
 extern "C" {
@@ -977,11 +977,7 @@ int NativeArchive::exportVideo(QDomElement   &itemNode,
     query.bindValue(":INTID", intID);
 
     if (!query.exec())
-    {
-        print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
         MythDB::DBError("select countries", query);
-        print_verbose_messages = VB_JOBQUEUE;
-    }
 
     if (query.isActive() && query.size())
     {
@@ -1006,11 +1002,7 @@ int NativeArchive::exportVideo(QDomElement   &itemNode,
     query.bindValue(":INTID", intID);
 
     if (!query.exec())
-    {
-        print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
         MythDB::DBError("select genres", query);
-        print_verbose_messages = VB_JOBQUEUE;
-    }
 
     if (query.isActive() && query.size())
     {
@@ -1262,11 +1254,7 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
     if (query.exec())
         VERBOSE(VB_JOBQUEUE, "Inserted recorded details into database");
     else
-    {
-        print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
         MythDB::DBError("recorded insert", query);
-        print_verbose_messages = VB_JOBQUEUE;
-    }
 
     // copy recordedmarkup to db
     nodeList = itemNode.elementsByTagName("recordedmarkup");
@@ -1301,7 +1289,6 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
 
                 if (!query.exec())
                 {
-                    print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
                     MythDB::DBError("recordedmark insert", query);
                     return 1;
                 }
@@ -1344,7 +1331,6 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
 
                 if (!query.exec())
                 {
-                    print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
                     MythDB::DBError("recordedseek insert", query);
                     return 1;
                 }
@@ -1457,9 +1443,7 @@ int NativeArchive::importVideo(const QDomElement &itemNode, const QString &xmlFi
         VERBOSE(VB_JOBQUEUE, "Inserted videometadata details into database");
     else
     {
-        print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
         MythDB::DBError("videometadata insert", query);
-        print_verbose_messages = VB_JOBQUEUE;
         return 1;
     }
 
@@ -1473,9 +1457,7 @@ int NativeArchive::importVideo(const QDomElement &itemNode, const QString &xmlFi
     }
     else
     {
-        print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
         MythDB::DBError("Failed to get intid", query);
-        print_verbose_messages = VB_JOBQUEUE;
         return 1;
     }
 
@@ -1746,11 +1728,7 @@ static void clearArchiveTable(void)
     query.prepare("DELETE FROM archiveitems;");
 
     if (!query.exec())
-    {
-        print_verbose_messages = VB_JOBQUEUE + VB_IMPORTANT;
         MythDB::DBError("delete archiveitems", query);
-        print_verbose_messages = VB_JOBQUEUE;
-    }
 }
 
 static int doNativeArchive(const QString &jobFile)
@@ -2587,7 +2565,7 @@ int main(int argc, char **argv)
     int quiet = 0;
 
     // by default we only output our messages
-    print_verbose_messages = VB_JOBQUEUE;
+    verboseMask = VB_JOBQUEUE | VB_IMPORTANT;
 
     MythArchiveHelperCommandLineParser cmdline;
     if (!cmdline.Parse(argc, argv))
@@ -2613,7 +2591,7 @@ int main(int argc, char **argv)
     QCoreApplication::setApplicationName("mytharchivehelper");
 
     if (cmdline.toBool("verbose"))
-        if (parse_verbose_arg(cmdline.toString("verbose")) ==
+        if (verboseArgParse(cmdline.toString("verbose")) ==
                     GENERIC_EXIT_INVALID_CMDLINE)
             return GENERIC_EXIT_INVALID_CMDLINE;
 
@@ -2622,13 +2600,16 @@ int main(int argc, char **argv)
         quiet = cmdline.toUInt("quiet");
         if (quiet > 1)
         {
-            print_verbose_messages = VB_NONE;
-            parse_verbose_arg("none");
+            verboseMask = VB_NONE;
+            verboseArgParse("none");
         }
     }
 
     int facility = cmdline.GetSyslogFacility();
     bool dblog = !cmdline.toBool("nodblog");
+    LogLevel_t level = cmdline.GetLogLevel();
+    if (level == LOG_UNKNOWN)
+        return GENERIC_EXIT_INVALID_CMDLINE;
 
     ///////////////////////////////////////////////////////////////////////
     // Don't listen to console input
@@ -2639,7 +2620,8 @@ int main(int argc, char **argv)
             .arg(MYTH_SOURCE_VERSION));
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, level, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init(false))