diff --git a/mythtv/libs/libmyth/mediamonitor-darwin.cpp b/mythtv/libs/libmyth/mediamonitor-darwin.cpp
@@ -12,7 +12,7 @@
 #include "mythcdrom.h"
 #include "mythhdd.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOMedia.h>

diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
@@ -39,7 +39,7 @@ using namespace std;
 #include "mythconfig.h"
 #include "mythcdrom.h"
 #include "mythhdd.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythsystem.h"
 #include "exitcodes.h"
 

diff --git a/mythtv/libs/libmyth/mediamonitor-windows.cpp b/mythtv/libs/libmyth/mediamonitor-windows.cpp
@@ -10,7 +10,7 @@
 #include "mediamonitor-windows.h"
 #include "mythcdrom.h"
 #include "mythhdd.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 
 /**

diff --git a/mythtv/libs/libmyth/mythcommandlineparser.cpp b/mythtv/libs/libmyth/mythcommandlineparser.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "exitcodes.h"
 #include "mythconfig.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythversion.h"
 #include "util.h"
 

diff --git a/mythtv/libs/libmyth/mythconfiggroups.cpp b/mythtv/libs/libmyth/mythconfiggroups.cpp
@@ -5,7 +5,7 @@
 
 #include "mythconfiggroups.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythuihelper.h"
 
 static void clear_widgets(vector<Configurable*> &children,

diff --git a/mythtv/libs/libmyth/mythcontext.h b/mythtv/libs/libmyth/mythcontext.h
@@ -7,7 +7,7 @@
 #include "mythcorecontext.h"
 #include "mythevent.h"
 #include "mythexp.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 class MythPluginManager;
 class MythContextPrivate;

diff --git a/mythtv/libs/libmyth/mythdialogs.cpp b/mythtv/libs/libmyth/mythdialogs.cpp
@@ -30,7 +30,7 @@ using namespace std;
 #include "mythdbcon.h"
 #include "mythfontproperties.h"
 #include "mythuihelper.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcorecontext.h"
 
 #ifdef USING_MINGW

diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp
@@ -20,7 +20,6 @@ using namespace std;
 #include "mythdialogs.h"
 #include "mythconfig.h"
 #include "mythdialogbox.h"
-#include "mythverbose.h"
 #include "util.h"
 #include "mythlogging.h"
 

diff --git a/mythtv/libs/libmyth/mythplugin.cpp b/mythtv/libs/libmyth/mythplugin.cpp
@@ -15,7 +15,7 @@
 
 #include "mythdirs.h"
 #include "mythversion.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 using namespace std;
 

diff --git a/mythtv/libs/libmyth/mythrssmanager.cpp b/mythtv/libs/libmyth/mythrssmanager.cpp
@@ -5,7 +5,7 @@
 
 #include "mythdirs.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "mythrssmanager.h"
 #include "netutils.h"

diff --git a/mythtv/libs/libmyth/mythwidgets.cpp b/mythtv/libs/libmyth/mythwidgets.cpp
@@ -15,7 +15,7 @@ using namespace std;
 #include "mythcontext.h"
 #include "util.h"
 #include "mythdialogs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythmainwindow.h"
 
 typedef VirtualKeyboardQt* QWidgetP;

diff --git a/mythtv/libs/libmyth/netgrabbermanager.cpp b/mythtv/libs/libmyth/netgrabbermanager.cpp
@@ -6,7 +6,6 @@
 
 #include "mythdirs.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
 #include "mythsystem.h"
 #include "exitcodes.h"
 #include "util.h"

diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
@@ -27,7 +27,7 @@ using namespace std;
 #include "dialogbox.h"
 #include "remoteutil.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "storagegroup.h"
 #include "programinfoupdater.h"
 

diff --git a/mythtv/libs/libmyth/rawsettingseditor.cpp b/mythtv/libs/libmyth/rawsettingseditor.cpp
@@ -1,6 +1,6 @@
 
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythuibutton.h"
 #include "mythuibuttonlist.h"
 #include "mythuitext.h"

diff --git a/mythtv/libs/libmyth/schemawizard.cpp b/mythtv/libs/libmyth/schemawizard.cpp
@@ -8,7 +8,7 @@
 #include "util.h"
 
 #include "mythtimer.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythmainwindow.h"
 #include "mythuihelper.h"
 #include "mythdb.h"

diff --git a/mythtv/libs/libmyth/settings.cpp b/mythtv/libs/libmyth/settings.cpp
@@ -29,7 +29,7 @@ using namespace std;
 #include "mythwidgets.h"
 #include "mythcontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "DisplayRes.h"
 #include "mythuihelper.h"
 

diff --git a/mythtv/libs/libmyth/storagegroupeditor.cpp b/mythtv/libs/libmyth/storagegroupeditor.cpp
@@ -7,7 +7,7 @@
 #include "storagegroupeditor.h"
 #include "mythcorecontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "util.h"
 
 #define LOC QString("SGE(%1): ").arg(m_groupname)

diff --git a/mythtv/libs/libmyth/uilistbtntype.cpp b/mythtv/libs/libmyth/uilistbtntype.cpp
@@ -27,7 +27,7 @@ using namespace std;
 #include <QPixmap>
 #include <QPainter>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "lcddevice.h"
 
 #include "uilistbtntype.h"

diff --git a/mythtv/libs/libmyth/uitypes.cpp b/mythtv/libs/libmyth/uitypes.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "mythuihelper.h"
 #include "x11colors.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #ifdef USING_MINGW
 #undef LoadImage

diff --git a/mythtv/libs/libmyth/virtualkeyboard_qt.cpp b/mythtv/libs/libmyth/virtualkeyboard_qt.cpp
@@ -6,7 +6,7 @@
 #include "virtualkeyboard_qt.h"
 #include "mythdialogs.h"
 #include "uitypes.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcorecontext.h"
 
 #include "mythfontproperties.h"

diff --git a/mythtv/libs/libmyth/xmlparse.cpp b/mythtv/libs/libmyth/xmlparse.cpp
@@ -17,7 +17,7 @@ using namespace std;
 #include "mythfontproperties.h"
 #include "mythuihelper.h"
 #include "x11colors.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcorecontext.h"
 
 #ifdef USING_MINGW

diff --git a/mythtv/libs/libmythbase/dbutil.cpp b/mythtv/libs/libmythbase/dbutil.cpp
@@ -18,7 +18,7 @@
 #include "util.h"
 #include "mythdb.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythsystem.h"
 #include "exitcodes.h"
 

diff --git a/mythtv/libs/libmythbase/httpcomms.cpp b/mythtv/libs/libmythbase/httpcomms.cpp
@@ -6,7 +6,7 @@ using namespace std;
 #include <QTimer>
 #include <QFile>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "compat.h"
 #include "mcodecs.h"
 #include "httpcomms.h"

diff --git a/mythtv/libs/libmythbase/lcddevice.cpp b/mythtv/libs/libmythbase/lcddevice.cpp
@@ -22,7 +22,7 @@
 
 // MythTV headers
 #include "lcddevice.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "compat.h"
 #include "mythdb.h"
 #include "mythdirs.h"

diff --git a/mythtv/libs/libmythbase/libmythbase.pro b/mythtv/libs/libmythbase/libmythbase.pro
@@ -12,7 +12,7 @@ QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
 # Input
 HEADERS += mythsocket.h mythsocket_cb.h mythsocketthread.h msocketdevice.h
 HEADERS += mythbaseexp.h mythdbcon.h mythdb.h mythdbparams.h oldsettings.h
-HEADERS += mythverbose.h verbosedefs.h mythversion.h compat.h mythconfig.h
+HEADERS += verbosedefs.h mythversion.h compat.h mythconfig.h
 HEADERS += mythobservable.h mythevent.h httpcomms.h mcodecs.h
 HEADERS += mythtimer.h mythsignalingtimer.h mythdirs.h exitcodes.h
 HEADERS += lcddevice.h mythstorage.h remotefile.h
@@ -24,7 +24,7 @@ HEADERS += mythhttppool.h mythhttphandler.h mythdeque.h mythlogging.h
 HEADERS += mythbaseutil.h referencecounter.h version.h
 
 SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
-SOURCES += mythdbcon.cpp mythdb.cpp oldsettings.cpp mythverbose.cpp
+SOURCES += mythdbcon.cpp mythdb.cpp oldsettings.cpp
 SOURCES += mythobservable.cpp mythevent.cpp httpcomms.cpp mcodecs.cpp
 SOURCES += mythdirs.cpp mythsignalingtimer.cpp
 SOURCES += lcddevice.cpp mythstorage.cpp remotefile.cpp
@@ -49,7 +49,7 @@ mingw {
 
 # Install headers to same location as libmyth to make things easier
 inc.path = $${PREFIX}/include/mythtv/
-inc.files  = mythverbose.h mythdbcon.h mythdbparams.h mythbaseexp.h mythdb.h
+inc.files  = mythdbcon.h mythdbparams.h mythbaseexp.h mythdb.h
 inc.files += compat.h mythversion.h mythconfig.h mythconfig.mak version.h
 inc.files += mythobservable.h mythevent.h httpcomms.h mcodecs.h verbosedefs.h
 inc.files += mythtimer.h lcddevice.h exitcodes.h mythdirs.h mythstorage.h

diff --git a/mythtv/libs/libmythbase/msocketdevice_unix.cpp b/mythtv/libs/libmythbase/msocketdevice_unix.cpp
@@ -42,7 +42,7 @@
 ****************************************************************************/
 
 #include "qplatformdefs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Almost always the same. If not, specify in qplatformdefs.h.
 #if !defined(QT_SOCKOPTLEN_T)

diff --git a/mythtv/libs/libmythbase/msocketdevice_win.cpp b/mythtv/libs/libmythbase/msocketdevice_win.cpp
@@ -46,7 +46,7 @@
 #include <QDateTime>
 
 #include <QCoreApplication>
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include <string.h>
 

diff --git a/mythtv/libs/libmythbase/mythbaseutil.h b/mythtv/libs/libmythbase/mythbaseutil.h
@@ -10,7 +10,7 @@
 #include <QString>
 
 // MythTV
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #ifdef USING_MINGW
 static inline void setup_pipe(int[2], long[2]) {}

diff --git a/mythtv/libs/libmythbase/mythcdrom-darwin.cpp b/mythtv/libs/libmythbase/mythcdrom-darwin.cpp
@@ -6,7 +6,7 @@
 
 #include "mythcdrom.h"
 #include "mythcdrom-darwin.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC     QString("MythCDROMDarwin:")
 #define LOC_ERR QString("mythcdrom-darwin, Error: ")

diff --git a/mythtv/libs/libmythbase/mythcdrom-freebsd.cpp b/mythtv/libs/libmythbase/mythcdrom-freebsd.cpp
@@ -4,7 +4,7 @@
 
 #include "mythcdrom.h"
 #include "mythcdrom-freebsd.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 
 #define ASSUME_WANT_AUDIO 1

diff --git a/mythtv/libs/libmythbase/mythcdrom-linux.cpp b/mythtv/libs/libmythbase/mythcdrom-linux.cpp
@@ -15,7 +15,7 @@
 #include "mythcdrom.h"
 #include "mythcdrom-linux.h"
 #include "mythconfig.h"      // for HAVE_BIGENDIAN
-#include "mythverbose.h"
+#include "mythlogging.h"
 #ifdef USING_LIBUDF
 #include <cdio/udf.h>
 #endif

diff --git a/mythtv/libs/libmythbase/mythcdrom.cpp b/mythtv/libs/libmythbase/mythcdrom.cpp
@@ -10,7 +10,7 @@
 #elif CONFIG_DARWIN
 #include "mythcdrom-darwin.h"
 #endif
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 
 // If your DVD has directories in lowercase, then it is wrongly mounted!

diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h
@@ -8,7 +8,7 @@
 #include "mythbaseexp.h"
 #include "mythobservable.h"
 #include "mythsocket_cb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythlocale.h"
 
 #define MYTH_APPNAME_MYTHBACKEND "mythbackend"

diff --git a/mythtv/libs/libmythbase/mythcoreutil.cpp b/mythtv/libs/libmythbase/mythcoreutil.cpp
@@ -28,7 +28,7 @@
 
 // libmythbase headers
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "unzip.h"
 
 /** \fn getDiskSpace(const QString&,long long&,long long&)

diff --git a/mythtv/libs/libmythbase/mythdb.cpp b/mythtv/libs/libmythbase/mythdb.cpp
@@ -12,7 +12,7 @@ using namespace std;
 
 #include "mythdb.h"
 #include "mythdbcon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "oldsettings.h"
 #include "mythdirs.h"
 #include "mythcorecontext.h"

diff --git a/mythtv/libs/libmythbase/mythdbcon.cpp b/mythtv/libs/libmythbase/mythdbcon.cpp
@@ -13,7 +13,7 @@
 #include "compat.h"
 #include "mythdbcon.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythsystem.h"
 #include "exitcodes.h"
 #include <unistd.h>

diff --git a/mythtv/libs/libmythbase/mythdirs.cpp b/mythtv/libs/libmythbase/mythdirs.cpp
@@ -6,7 +6,7 @@
 
 #include "mythconfig.h"  // for CONFIG_DARWIN
 #include "mythdirs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 static QString installprefix = QString::null;
 static QString sharedir = QString::null;

diff --git a/mythtv/libs/libmythbase/mythdownloadmanager.cpp b/mythtv/libs/libmythbase/mythdownloadmanager.cpp
@@ -15,7 +15,6 @@
 #include "mythcoreutil.h"
 #include "mythdirs.h"
 #include "mythevent.h"
-#include "mythverbose.h"
 #include "mythversion.h"
 #include "remotefile.h"
 

diff --git a/mythtv/libs/libmythbase/mythhttphandler.cpp b/mythtv/libs/libmythbase/mythhttphandler.cpp
@@ -8,7 +8,7 @@
 // Myth headers
 #include "mythhttphandler.h"
 #include "mythhttppool.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC      QString("MythHttpHandler: ")
 #define LOC_WARN QString("MythHttpHandler, Warning: ")

diff --git a/mythtv/libs/libmythbase/mythhttppool.cpp b/mythtv/libs/libmythbase/mythhttppool.cpp
@@ -5,7 +5,7 @@
 // Myth headers
 #include "mythhttppool.h"
 #include "mythhttphandler.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC      QString("MythHttpPool: ")
 #define LOC_WARN QString("MythHttpPool, Warning: ")

diff --git a/mythtv/libs/libmythbase/mythlocale.cpp b/mythtv/libs/libmythbase/mythlocale.cpp
@@ -8,7 +8,7 @@
 #include <QIODevice>
 
 // libmythbase
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "mythdirs.h"
 

diff --git a/mythtv/libs/libmythbase/mythlogging.cpp b/mythtv/libs/libmythbase/mythlogging.cpp
@@ -6,14 +6,19 @@
 #include <QHash>
 #include <QCoreApplication>
 #include <QFileInfo>
+#include <QStringList>
+#include <QMap>
+#include <iostream>
+
+using namespace std;
 
 #define _LogLevelNames_
 #include "mythlogging.h"
-#include "mythverbose.h"
 #include "mythconfig.h"
 #include "mythdb.h"
 #include "mythcorecontext.h"
 #include "dbutil.h"
+#include "exitcodes.h"
 
 #include <stdlib.h>
 #define SYSLOG_NAMES
@@ -64,12 +69,40 @@ QString                 logPropagatePath;
 
 LogLevel_t logLevel = (LogLevel_t)LOG_INFO;
 
+typedef struct {
+    uint64_t    mask;
+    QString     name;
+    bool        additive;
+    QString     helpText;
+} VerboseDef;
+
+typedef QMap<QString, VerboseDef *> VerboseMap;
+
+bool verboseInitialized = false;
+VerboseMap verboseMap;
+QMutex verboseMapMutex;
+
+const uint64_t verboseDefaultInt = VB_IMPORTANT | VB_GENERAL;
+const char    *verboseDefaultStr = " important general";
+
+uint64_t verboseMask = verboseDefaultInt;
+QString verboseString = QString(verboseDefaultStr);
+
+unsigned int userDefaultValueInt = verboseDefaultInt;
+QString      userDefaultValueStr = QString(verboseDefaultStr);
+bool         haveUserDefaultValues = false;
+
+void verboseAdd(uint64_t mask, QString name, bool additive, QString helptext);
+void verboseInit(void);
+void verboseHelp();
+
 char *getThreadName( LoggingItem_t *item );
 int64_t getThreadTid( LoggingItem_t *item );
 void setThreadTid( LoggingItem_t *item );
 void deleteItem( LoggingItem_t *item );
 void logSighup( int signum, siginfo_t *info, void *secret );
 
+
 LoggerBase::LoggerBase(char *string, int number)
 {
     QMutexLocker locker(&loggerListMutex);
@@ -897,6 +930,176 @@ LogLevel_t logLevelGet(QString level)
     return LOG_UNKNOWN;
 }
 
+
+void verboseAdd(uint64_t mask, QString name, bool additive, QString helptext)
+{
+    VerboseDef *item = new VerboseDef;
+
+    item->mask = mask;
+    name.detach();
+    // VB_GENERAL -> general
+    name.remove(0, 3);
+    name = name.toLower();
+    item->name = name;
+    item->additive = additive;
+    helptext.detach();
+    item->helpText = helptext;
+
+    verboseMap.insert(name, item);
+}
+
+void verboseInit(void)
+{
+    QMutexLocker locker(&verboseMapMutex);
+    verboseMap.clear();
+
+    // This looks funky, so I'll put some explanation here.  The verbosedefs.h
+    // file gets included as part of the mythlogging.h include, and at that
+    // time, the normal (without _IMPLEMENT_VERBOSE defined) code case will
+    // define the VerboseMask enum.  At this point, we force it to allow us
+    // to include the file again, but with _IMPLEMENT_VERBOSE set so that the
+    // single definition of the VB_* values can be shared to define also the
+    // contents of verboseMap, via repeated calls to verboseAdd()
+
+#undef VERBOSEDEFS_H_
+#define _IMPLEMENT_VERBOSE
+#include "verbosedefs.h"
+
+    verboseInitialized = true;
+}
+
+void verboseHelp()
+{
+    QString m_verbose = verboseString.trimmed();
+    m_verbose.replace(QRegExp(" "), ",");
+    m_verbose.remove(QRegExp("^,"));
+
+    cerr << "Verbose debug levels.\n"
+            "Accepts any combination (separated by comma) of:\n\n";
+
+    for (VerboseMap::Iterator vit = verboseMap.begin();
+         vit != verboseMap.end(); ++vit )
+    {
+        VerboseDef *item = vit.value();
+        QString name = QString("  %1").arg(item->name, -15, ' ');
+        cerr << name.toLocal8Bit().constData() << " - " << 
+                item->helpText.toLocal8Bit().constData() << endl;
+    }
+
+    cerr << endl <<
+      "The default for this program appears to be: '-v " <<
+      m_verbose.toLocal8Bit().constData() << "'\n\n"
+      "Most options are additive except for none, all, and important.\n"
+      "These three are semi-exclusive and take precedence over any\n"
+      "prior options given.  You can however use something like\n"
+      "'-v none,jobqueue' to get only JobQueue related messages\n"
+      "and override the default verbosity level.\n\n"
+      "The additive options may also be subtracted from 'all' by \n"
+      "prefixing them with 'no', so you may use '-v all,nodatabase'\n"
+      "to view all but database debug messages.\n\n"
+      "Some debug levels may not apply to this program.\n\n";
+}
+
+int verboseArgParse(QString arg)
+{
+    QString option;
+
+    if (!verboseInitialized)
+        verboseInit();
+
+    QMutexLocker locker(&verboseMapMutex);
+
+    verboseMask = verboseDefaultInt;
+    verboseString = QString(verboseDefaultStr);
+
+    if (arg.startsWith('-'))
+    {
+        cerr << "Invalid or missing argument to -v/--verbose option\n";
+        return GENERIC_EXIT_INVALID_CMDLINE;
+    }
+
+    QStringList verboseOpts = arg.split(',');
+    for (QStringList::Iterator it = verboseOpts.begin();
+         it != verboseOpts.end(); ++it )
+    {
+        option = (*it).toLower();
+        bool reverseOption = false;
+
+        if (option != "none" && option.left(2) == "no")
+        {
+            reverseOption = true;
+            option = option.right(option.length() - 2);
+        }
+
+        if (option == "help")
+        {
+            verboseHelp();
+            return GENERIC_EXIT_INVALID_CMDLINE;
+        }
+        else if (option == "default")
+        {
+            if (haveUserDefaultValues)
+            {
+                verboseMask = userDefaultValueInt;
+                verboseString = userDefaultValueStr;
+            }
+            else
+            {
+                verboseMask = verboseDefaultInt;
+                verboseString = QString(verboseDefaultStr);
+            }
+        }
+        else 
+        {
+            VerboseDef *item = verboseMap.value(option);
+
+            if (item)
+            {
+                if (reverseOption)
+                {
+                    verboseMask &= ~(item->mask);
+                    verboseString += " no" + item->name;
+                }
+                else
+                {
+                    if (item->additive)
+                    {
+                        verboseMask |= item->mask;
+                        verboseString += ' ' + item->name;
+                    }
+                    else
+                    {
+                        verboseMask = item->mask;
+                        verboseString = item->name;
+                    }
+                }
+            }
+            else
+            {
+                cerr << "Unknown argument for -v/--verbose: " << 
+                        option.toLocal8Bit().constData() << endl;;
+                return GENERIC_EXIT_INVALID_CMDLINE;
+            }
+        }
+    }
+
+    if (!haveUserDefaultValues)
+    {
+        haveUserDefaultValues = true;
+        userDefaultValueInt = verboseMask;
+        userDefaultValueStr = verboseString;
+    }
+
+    return GENERIC_EXIT_OK;
+}
+
+// Verbose helper function for ENO macro
+QString logStrerror(int errnum)
+{
+    return QString("%1 (%2)").arg(strerror(errnum)).arg(errnum);
+}
+
+
 /*
  * vim:ts=4:sw=4:ai:et:si:sts=4
  */
diff --git a/mythtv/libs/libmythbase/mythlogging.h b/mythtv/libs/libmythbase/mythlogging.h
@@ -11,7 +11,10 @@
 #include <stdint.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
+
 #include "mythbaseexp.h"  //  MBASE_PUBLIC , etc.
+#include "verbosedefs.h"
 
 #define LOGLINE_MAX 2048
 
@@ -218,6 +221,44 @@ class DBLoggerThread : public QThread {
 };
 #endif
 
+/// This global variable is set at startup with the flags
+/// of the verbose messages we want to see.
+extern MBASE_PUBLIC uint64_t verboseMask;
+
+// Helper for checking verbose flags outside of VERBOSE macro
+#define VERBOSE_LEVEL_NONE        (verboseMask == 0)
+#define VERBOSE_LEVEL_CHECK(mask) ((verboseMask & (mask)) == (mask))
+
+// There are two VERBOSE macros now.  One for use with Qt/C++, one for use
+// without Qt.
+//
+// Neither of them will lock the calling thread, but rather put the log message
+// onto a queue.
+
+#ifdef __cplusplus
+#define VERBOSE(mask, ...) \
+    LogPrint((uint64_t)(mask), LOG_INFO, QString(__VA_ARGS__))
+#else
+#define VERBOSE(mask, ...) \
+    LogPrint((uint64_t)(mask), LOG_INFO, __VA_ARGS__)
+#endif
+
+
+#ifdef  __cplusplus
+/// Verbose helper function for ENO macro
+extern MBASE_PUBLIC QString logStrerror(int errnum);
+
+extern MBASE_PUBLIC QString verboseString;
+
+MBASE_PUBLIC int verboseArgParse(QString arg);
+
+/// This can be appended to the VERBOSE args with 
+/// "+".  Please do not use "<<".  It uses
+/// a thread safe version of strerror to produce the
+/// string representation of errno and puts it on the
+/// next line in the verbose output.
+#define ENO QString("\n\t\t\teno: ") + logStrerror(errno)
+#endif // __cplusplus
 
 #endif
 

diff --git a/mythtv/libs/libmythbase/mythmedia.cpp b/mythtv/libs/libmythbase/mythmedia.cpp
@@ -14,7 +14,7 @@
 // MythTV headers
 #include "mythmedia.h"
 #include "mythconfig.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "util.h"
 #include "mythsystem.h"
 #include "exitcodes.h"

diff --git a/mythtv/libs/libmythbase/mythsocket.cpp b/mythtv/libs/libmythbase/mythsocket.cpp
@@ -23,7 +23,7 @@
 #include "mythsocket.h"
 #include "mythevent.h"
 #include "mythversion.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcorecontext.h"
 
 #define SLOC(a) QString("MythSocket(%1:%2): ")\

diff --git a/mythtv/libs/libmythbase/mythsocketthread.cpp b/mythtv/libs/libmythbase/mythsocketthread.cpp
@@ -25,7 +25,6 @@
 // MythTV
 #include "mythsocketthread.h"
 #include "mythbaseutil.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 #include "mythsocket.h"
 

diff --git a/mythtv/libs/libmythbase/mythsystem.cpp b/mythtv/libs/libmythbase/mythsystem.cpp
@@ -25,7 +25,7 @@
 // libmythbase headers
 #include "mythcorecontext.h"
 #include "mythevent.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "exitcodes.h"
 
 #if CONFIG_CYGWIN || defined(_WIN32)

diff --git a/mythtv/libs/libmythbase/mythverbose.cpp b/mythtv/libs/libmythbase/mythverbose.cpp
diff --git a/mythtv/libs/libmythbase/mythverbose.h b/mythtv/libs/libmythbase/mythverbose.h
diff --git a/mythtv/libs/libmythbase/oldsettings.cpp b/mythtv/libs/libmythbase/oldsettings.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include <QDir>
 
 #include "oldsettings.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 Settings::Settings(QString strSettingsFile)
 {

diff --git a/mythtv/libs/libmythbase/referencecounter.cpp b/mythtv/libs/libmythbase/referencecounter.cpp
@@ -3,7 +3,7 @@
 #include <QString>
 #include <QMutexLocker>
 #include "referencecounter.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 ReferenceCounter::ReferenceCounter(void) :
     m_refCount(1)

diff --git a/mythtv/libs/libmythbase/storagegroup.cpp b/mythtv/libs/libmythbase/storagegroup.cpp
@@ -6,7 +6,7 @@
 #include "storagegroup.h"
 #include "mythcorecontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcoreutil.h"
 #include "mythdirs.h"
 

diff --git a/mythtv/libs/libmythbase/system-unix.cpp b/mythtv/libs/libmythbase/system-unix.cpp
@@ -29,7 +29,6 @@
 // libmythbase headers
 #include "mythcorecontext.h"
 #include "mythevent.h"
-#include "mythverbose.h"
 #include "exitcodes.h"
 #include "mythlogging.h"
 

diff --git a/mythtv/libs/libmythbase/system-windows.cpp b/mythtv/libs/libmythbase/system-windows.cpp
@@ -26,7 +26,6 @@
 // libmythbase headers
 #include "mythcorecontext.h"
 #include "mythevent.h"
-#include "mythverbose.h"
 #include "exitcodes.h"
 #include "mythlogging.h"
 

diff --git a/mythtv/libs/libmythbase/util.cpp b/mythtv/libs/libmythbase/util.cpp
@@ -43,7 +43,7 @@ using namespace std;
 // Myth headers
 #include "mythcorecontext.h"
 #include "exitcodes.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "msocketdevice.h"
 #include "mythsocket.h"
 #include "mythcoreutil.h"

diff --git a/mythtv/libs/libmythbase/verbosedefs.h b/mythtv/libs/libmythbase/verbosedefs.h
@@ -4,10 +4,10 @@
 #include <stdint.h>
 
 /// This file gets included in two different ways:
-/// 1) from mythverbose.h from nearly every file.  This will define the 
+/// 1) from mythlogging.h from nearly every file.  This will define the 
 ///    VerboseMask enum
 /// 2) specifically (and a second include with _IMPLEMENT_VERBOSE defined) from
-///    mythverbose.cpp.  This is done in verboseInit (in the middle of the
+///    mythlogging.cpp.  This is done in verboseInit (in the middle of the
 ///    function) as it will expand out to a series of calls to verboseAdd()
 ///    to fill the verboseMap.
 ///
@@ -19,7 +19,7 @@
 ///
 /// To create a new VB_* flag, this is the only piece of code you need to
 /// modify, then you can start using the new flag and it will automatically be
-/// processed by the parse_verbose_arg() function and help info printed when
+/// processed by the verboseArgParse() function and help info printed when
 /// "-v help" is used.
 
 #undef VERBOSE_PREAMBLE
@@ -28,7 +28,7 @@
 
 #ifdef _IMPLEMENT_VERBOSE
 
-// This is used to actually implement the mask in mythverbose.cpp
+// This is used to actually implement the mask in mythlogging.cpp
 #define VERBOSE_PREAMBLE
 #define VERBOSE_POSTAMBLE
 #define VERBOSE_MAP(name,mask,additive,help) \

diff --git a/mythtv/libs/libmythfreesurround/freesurround.cpp b/mythtv/libs/libmythfreesurround/freesurround.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 using namespace std;
 
 #include "compat.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "freesurround.h"
 #include "el_processor.h"
 

diff --git a/mythtv/libs/libmythmetadata/dirscan.cpp b/mythtv/libs/libmythmetadata/dirscan.cpp
@@ -7,7 +7,7 @@
 #include "dirscan.h"
 #include "remoteutil.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "videoutils.h"
 #include "storagegroup.h"
 

diff --git a/mythtv/libs/libmythmetadata/metadatacommon.cpp b/mythtv/libs/libmythmetadata/metadatacommon.cpp
@@ -3,7 +3,7 @@
 #include "rssparse.h"
 #include "mythcorecontext.h"
 #include "metadatacommon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // null constructor
 MetadataLookup::MetadataLookup(void) :

diff --git a/mythtv/libs/libmythmetadata/metadatadownload.cpp b/mythtv/libs/libmythmetadata/metadatadownload.cpp
@@ -6,7 +6,6 @@
 // myth
 #include "mythcorecontext.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
 #include "mythuihelper.h"
 #include "mythsystem.h"
 #include "metadatadownload.h"

diff --git a/mythtv/libs/libmythmetadata/metadataimagedownload.cpp b/mythtv/libs/libmythmetadata/metadataimagedownload.cpp
@@ -13,7 +13,6 @@
 #include "mythcorecontext.h"
 #include "mythuihelper.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
 #include "httpcomms.h"
 #include "metadataimagedownload.h"
 #include "remotefile.h"

diff --git a/mythtv/libs/libmythmetadata/videometadata.cpp b/mythtv/libs/libmythmetadata/videometadata.cpp
@@ -11,7 +11,7 @@
 #include "remotefile.h"
 #include "remoteutil.h"
 #include "util.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "globals.h"
 #include "dbaccess.h"
 #include "videometadatalistmanager.h"

diff --git a/mythtv/libs/libmythprotoserver/mythsocketmanager.cpp b/mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
@@ -18,7 +18,6 @@ using namespace std;
 #include "referencecounter.h"
 #include "mythcorecontext.h"
 #include "mythconfig.h"
-#include "mythverbose.h"
 #include "mythversion.h"
 #include "mythlogging.h"
 

diff --git a/mythtv/libs/libmythprotoserver/requesthandler/basehandler.cpp b/mythtv/libs/libmythprotoserver/requesthandler/basehandler.cpp
@@ -10,7 +10,7 @@ using namespace std;
 #include "socketrequesthandler.h"
 #include "sockethandler.h"
 #include "util.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcorecontext.h"
 
 #include "requesthandler/basehandler.h"

diff --git a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp b/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
@@ -14,7 +14,6 @@ using namespace std;
 
 #include "util.h"
 #include "mythdb.h"
-#include "mythverbose.h"
 #include "requesthandler/deletethread.h"
 #include "mythcorecontext.h"
 #include "mythlogging.h"

diff --git a/mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp b/mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp
@@ -9,7 +9,7 @@ using namespace std;
 #include "mythdb.h"
 #include "ringbuffer.h"
 #include "mythsocket.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "programinfo.h"
 #include "storagegroup.h"
 #include "mythcorecontext.h"

diff --git a/mythtv/libs/libmythprotoserver/sockethandler.cpp b/mythtv/libs/libmythprotoserver/sockethandler.cpp
@@ -4,7 +4,7 @@ using namespace std;
 #include <QStringList>
 
 #include "sockethandler.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 SocketHandler::SocketHandler(MythSocket *sock, MythSocketManager *parent,
                   QString hostname) :

diff --git a/mythtv/libs/libmythtv/DeviceReadBuffer.cpp b/mythtv/libs/libmythtv/DeviceReadBuffer.cpp
@@ -5,7 +5,6 @@ using namespace std;
 #include "DeviceReadBuffer.h"
 #include "mythcorecontext.h"
 #include "mythbaseutil.h"
-#include "mythverbose.h"
 #include "tspacket.h"
 #include "compat.h"
 #include "mythlogging.h"

diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
@@ -22,7 +22,6 @@ using namespace std;
 
 #include "util.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
 #include "NuppelVideoRecorder.h"
 #include "channelbase.h"
 #include "filtermanager.h"

diff --git a/mythtv/libs/libmythtv/ThreadedFileWriter.cpp b/mythtv/libs/libmythtv/ThreadedFileWriter.cpp
@@ -17,7 +17,6 @@
 
 // MythTV headers
 #include "ThreadedFileWriter.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #include "mythtimer.h"

diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
@@ -10,7 +10,7 @@
 #include <linux/videodev.h>
 #endif // USING_V4L1
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "analogsignalmonitor.h"
 #include "v4lchannel.h"
 

diff --git a/mythtv/libs/libmythtv/asichannel.cpp b/mythtv/libs/libmythtv/asichannel.cpp
@@ -3,7 +3,7 @@
  */
 
 // MythTV includes
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mpegtables.h"
 #include "asichannel.h"
 

diff --git a/mythtv/libs/libmythtv/asisignalmonitor.cpp b/mythtv/libs/libmythtv/asisignalmonitor.cpp
@@ -10,7 +10,7 @@
 #include <sys/select.h>
 #endif
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdbcon.h"
 #include "asisignalmonitor.h"
 #include "atscstreamdata.h"

diff --git a/mythtv/libs/libmythtv/audioinput.cpp b/mythtv/libs/libmythtv/audioinput.cpp
@@ -18,7 +18,7 @@
  * 02110-1301, USA.
  */
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythconfig.h"
 #include "audioinput.h"
 #include "audioinputoss.h"

diff --git a/mythtv/libs/libmythtv/audioinputalsa.cpp b/mythtv/libs/libmythtv/audioinputalsa.cpp
@@ -19,7 +19,7 @@
  * 02110-1301, USA.
  */
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "audioinputalsa.h"
 
 #define LOC     QString("AudioInALSA: ")

diff --git a/mythtv/libs/libmythtv/audioinputoss.cpp b/mythtv/libs/libmythtv/audioinputoss.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include "audioinputoss.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include <fcntl.h>
 #include <sys/ioctl.h>
 

diff --git a/mythtv/libs/libmythtv/bdringbuffer.cpp b/mythtv/libs/libmythtv/bdringbuffer.cpp
@@ -12,7 +12,7 @@
 #include "mythevent.h"
 #include "iso639.h"
 #include "bdringbuffer.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcorecontext.h"
 #include "mythlocale.h"
 #include "mythdirs.h"

diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
@@ -20,7 +20,7 @@
 #include "diseqcsettings.h"
 #include "sourceutil.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #ifdef USING_DVB
 #include "dvbtypes.h"

diff --git a/mythtv/libs/libmythtv/cc608decoder.cpp b/mythtv/libs/libmythtv/cc608decoder.cpp
@@ -10,7 +10,7 @@ using namespace std;
 #include "format.h"
 #include "cc608decoder.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "vbilut.h"
 
 #define DEBUG_XDS 0

diff --git a/mythtv/libs/libmythtv/cc708decoder.cpp b/mythtv/libs/libmythtv/cc708decoder.cpp
@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include <stdio.h>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "cc708reader.h"
 #include "cc708decoder.h"
 

diff --git a/mythtv/libs/libmythtv/cc708reader.cpp b/mythtv/libs/libmythtv/cc708reader.cpp
@@ -3,7 +3,7 @@
 
 #include <cstdlib>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "decoderbase.h"
 #include "mythplayer.h"
 #include "cc708reader.h"

diff --git a/mythtv/libs/libmythtv/cc708window.cpp b/mythtv/libs/libmythtv/cc708window.cpp
@@ -6,7 +6,7 @@
 using namespace std;
 
 #include "cc708window.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /************************************************************************
 

diff --git a/mythtv/libs/libmythtv/channelbase.cpp b/mythtv/libs/libmythtv/channelbase.cpp
@@ -28,7 +28,7 @@ using namespace std;
 #include "frequencies.h"
 #include "hdhrchannel.h"
 #include "iptvchannel.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "asichannel.h"
 #include "dtvchannel.h"
 #include "dvbchannel.h"

diff --git a/mythtv/libs/libmythtv/channelgroup.cpp b/mythtv/libs/libmythtv/channelgroup.cpp
@@ -2,7 +2,7 @@
 #include <algorithm>
 
 // mythtv
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "channelgroup.h"
 

diff --git a/mythtv/libs/libmythtv/channelgroupsettings.cpp b/mythtv/libs/libmythtv/channelgroupsettings.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 
 // myth
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "channelutil.h"
 #include "channelgroup.h"

diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp
@@ -93,7 +93,7 @@ void ChannelScannerCLI::HandleEvent(const ScannerEvent *scanEvent)
     else if (scanEvent->type() == ScannerEvent::SetStatusSignalStrength)
         ;
 
-    //cout<<"HERE<"<<print_verbose_messages<<">"<<endl;
+    //cout<<"HERE<"<<verboseMask<<">"<<endl;
     QString msg;
     if (VERBOSE_LEVEL_NONE || VERBOSE_LEVEL_CHECK(VB_CHANSCAN))
     {

diff --git a/mythtv/libs/libmythtv/channelscan/scaninfo.cpp b/mythtv/libs/libmythtv/channelscan/scaninfo.cpp
@@ -8,7 +8,7 @@
 #include "mythdb.h"
 #include "scaninfo.h"
 #include "mythdbcon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 ScanInfo::ScanInfo() : scanid(0), cardid(0), sourceid(0), processed(false) { }
 

diff --git a/mythtv/libs/libmythtv/channelsettings.h b/mythtv/libs/libmythtv/channelsettings.h
@@ -13,7 +13,7 @@
 #include "mythwidgets.h"
 #include "mythwizard.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 class QWidget;
 

diff --git a/mythtv/libs/libmythtv/darwinavcinfo.cpp b/mythtv/libs/libmythtv/darwinavcinfo.cpp
@@ -11,7 +11,7 @@ using namespace std;
 // MythTV headers
 #include "darwinfirewiredevice.h"
 #include "darwinavcinfo.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #ifndef kIOFireWireAVCLibUnitInterfaceID2
 #define kIOFireWireAVCLibUnitInterfaceID2 \

diff --git a/mythtv/libs/libmythtv/darwinfirewiredevice.cpp b/mythtv/libs/libmythtv/darwinfirewiredevice.cpp
@@ -26,7 +26,6 @@ using namespace std;
 // MythTV headers
 #include "darwinfirewiredevice.h"
 #include "darwinavcinfo.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 // Apple Firewire example headers

diff --git a/mythtv/libs/libmythtv/datadirect.cpp b/mythtv/libs/libmythtv/datadirect.cpp
@@ -13,7 +13,7 @@
 #include "listingsources.h"
 #include "mythcontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythversion.h"
 #include "util.h"
 #include "dbutil.h"

diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -11,7 +11,7 @@ using namespace std;
 #include "mythcorecontext.h"
 #include "schemawizard.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "diseqcsettings.h" // for convert_diseqc_db()
 #include "videodbcheck.h"
 

diff --git a/mythtv/libs/libmythtv/decoderbase.cpp b/mythtv/libs/libmythtv/decoderbase.cpp
@@ -9,7 +9,7 @@ using namespace std;
 #include "mythplayer.h"
 #include "remoteencoder.h"
 #include "mythdbcon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "decoderbase.h"
 #include "programinfo.h"
 #include "livetvchain.h"

diff --git a/mythtv/libs/libmythtv/deletemap.cpp b/mythtv/libs/libmythtv/deletemap.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 #include <stdint.h>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythcontext.h"
 #include "osd.h"
 #include "deletemap.h"

diff --git a/mythtv/libs/libmythtv/diseqc.cpp b/mythtv/libs/libmythtv/diseqc.cpp
@@ -18,7 +18,7 @@
 // MythTV headers
 #include "mythcorecontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "diseqc.h"
 #include "dtvmultiplex.h"
 #include "compat.h"

diff --git a/mythtv/libs/libmythtv/diseqcsettings.cpp b/mythtv/libs/libmythtv/diseqcsettings.cpp
@@ -9,7 +9,7 @@
 
 // MythTV headers
 #include "mythdbcon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "diseqcsettings.h"
 
 /* Lat/Long items relocated from videosource.cpp */

diff --git a/mythtv/libs/libmythtv/dsmcc.cpp b/mythtv/libs/libmythtv/dsmcc.cpp
@@ -4,7 +4,7 @@
  */
 #include <stdint.h>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "dsmccreceiver.h"
 #include "dsmccbiop.h"

diff --git a/mythtv/libs/libmythtv/dsmccbiop.cpp b/mythtv/libs/libmythtv/dsmccbiop.cpp
@@ -12,7 +12,7 @@
 #include "dsmccobjcarousel.h"
 #include "dsmcc.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 BiopNameComp::~BiopNameComp()
 {

diff --git a/mythtv/libs/libmythtv/dsmcccache.cpp b/mythtv/libs/libmythtv/dsmcccache.cpp
@@ -11,7 +11,7 @@
 #include "dsmccreceiver.h"
 #include "dsmcc.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /** \class DSMCCCache
  *

diff --git a/mythtv/libs/libmythtv/dsmccobjcarousel.cpp b/mythtv/libs/libmythtv/dsmccobjcarousel.cpp
@@ -11,7 +11,7 @@
 #include "dsmcccache.h"
 #include "dsmcc.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Construct the data for a new module from a DII message.
 DSMCCCacheModuleData::DSMCCCacheModuleData(DsmccDii *dii,

diff --git a/mythtv/libs/libmythtv/dtvchannel.cpp b/mythtv/libs/libmythtv/dtvchannel.cpp
@@ -8,7 +8,7 @@ using namespace std;
 #include "cardutil.h"
 #include "dtvchannel.h"
 #include "mpegtables.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC QString("DTVChan(%1): ").arg(GetDevice())
 #define LOC_WARN QString("DTVChan(%1) Warning: ").arg(GetDevice())

diff --git a/mythtv/libs/libmythtv/dtvconfparser.cpp b/mythtv/libs/libmythtv/dtvconfparser.cpp
@@ -36,7 +36,7 @@
 // MythTV headers
 #include "mythcontext.h"
 #include "mythdbcon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "dtvconfparser.h"
 #include "channelutil.h"
 

diff --git a/mythtv/libs/libmythtv/dtvconfparserhelpers.cpp b/mythtv/libs/libmythtv/dtvconfparserhelpers.cpp
@@ -2,7 +2,7 @@
 #include <QMutex>
 #include <QMap>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "dtvconfparserhelpers.h"
 
 bool DTVParamHelper::ParseParam(const QString &symbol, int &value,

diff --git a/mythtv/libs/libmythtv/dtvmultiplex.cpp b/mythtv/libs/libmythtv/dtvmultiplex.cpp
@@ -1,7 +1,7 @@
 // MythTV headers
 #include "dtvmultiplex.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mpeg/dvbdescriptors.h"
 
 #define LOC      QString("DTVMux: ")

diff --git a/mythtv/libs/libmythtv/dtvrecorder.cpp b/mythtv/libs/libmythtv/dtvrecorder.cpp
@@ -23,7 +23,7 @@
 #include "dvbstreamdata.h"
 #include "dtvrecorder.h"
 #include "programinfo.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mpegtables.h"
 #include "ringbuffer.h"
 #include "tv_rec.h"

diff --git a/mythtv/libs/libmythtv/dvbdev/dvbci.cpp b/mythtv/libs/libmythtv/dvbdev/dvbci.cpp
@@ -40,7 +40,7 @@
 
 #include <QString>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #ifndef MALLOC
 #define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))

diff --git a/mythtv/libs/libmythtv/dvbrecorder.cpp b/mythtv/libs/libmythtv/dvbrecorder.cpp
@@ -27,7 +27,7 @@
 #include "dvbrecorder.h"
 #include "dvbchannel.h"
 #include "tv_rec.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC      QString("DVBRec(%1:%2): ") \
                  .arg(tvrec->GetCaptureCardNum()).arg(videodevice)

diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp
@@ -10,7 +10,7 @@
 
 #include "mythdvdplayer.h"
 #include "compat.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythuihelper.h"
 
 #define LOC      QString("DVDRB: ")

diff --git a/mythtv/libs/libmythtv/dxva2decoder.cpp b/mythtv/libs/libmythtv/dxva2decoder.cpp
@@ -1,7 +1,7 @@
 #include <QString>
 #include <QLibrary>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "initguid.h"
 #include "mythrender_d3d9.h"
 #include "dxva2decoder.h"

diff --git a/mythtv/libs/libmythtv/eitcache.cpp b/mythtv/libs/libmythtv/eitcache.cpp
@@ -10,7 +10,7 @@
 #include "eitcache.h"
 #include "mythcontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC QString("EITCache: ")
 

diff --git a/mythtv/libs/libmythtv/eitscanner.cpp b/mythtv/libs/libmythtv/eitscanner.cpp
@@ -15,7 +15,6 @@
 #include "scheduledrecording.h"
 #include "util.h"
 #include "mythdb.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #define LOC QString("EITScanner: ")

diff --git a/mythtv/libs/libmythtv/fifowriter.cpp b/mythtv/libs/libmythtv/fifowriter.cpp
@@ -12,7 +12,6 @@
 
 #include "fifowriter.h"
 #include "compat.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #include "mythconfig.h"

diff --git a/mythtv/libs/libmythtv/firewirechannel.cpp b/mythtv/libs/libmythtv/firewirechannel.cpp
@@ -5,7 +5,7 @@
  *  Distributed as part of MythTV under GPL v2 and later.
  */
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "tv_rec.h"
 #include "linuxfirewiredevice.h"
 #include "darwinfirewiredevice.h"

diff --git a/mythtv/libs/libmythtv/firewiredevice.cpp b/mythtv/libs/libmythtv/firewiredevice.cpp
@@ -13,7 +13,7 @@
 // MythTV headers
 #include "linuxfirewiredevice.h"
 #include "darwinfirewiredevice.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "pespacket.h"
 
 #define LOC      QString("FireDev(%1): ").arg(guid_to_string(m_guid))

diff --git a/mythtv/libs/libmythtv/firewirerecorder.cpp b/mythtv/libs/libmythtv/firewirerecorder.cpp
@@ -7,7 +7,7 @@
 // MythTV includes
 #include "firewirerecorder.h"
 #include "firewirechannel.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mpegtables.h"
 #include "mpegstreamdata.h"
 #include "tv_rec.h"

diff --git a/mythtv/libs/libmythtv/firewiresignalmonitor.cpp b/mythtv/libs/libmythtv/firewiresignalmonitor.cpp
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <sys/select.h>
 
-#include "mythverbose.h"
 #include "mythdbcon.h"
 #include "atscstreamdata.h"
 #include "mpegtables.h"

diff --git a/mythtv/libs/libmythtv/hdhrchannel.cpp b/mythtv/libs/libmythtv/hdhrchannel.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 // MythTV includes
 #include "mythdbcon.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "hdhrchannel.h"
 #include "videosource.h"
 #include "channelutil.h"

diff --git a/mythtv/libs/libmythtv/hdhrrecorder.cpp b/mythtv/libs/libmythtv/hdhrrecorder.cpp
@@ -11,7 +11,7 @@
 #include "hdhrrecorder.h"
 #include "hdhrchannel.h"
 #include "tv_rec.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC QString("HDHRRec(%1): ").arg(tvrec->GetCaptureCardNum())
 #define LOC_WARN QString("HDHRRec(%1), Warning: ") \

diff --git a/mythtv/libs/libmythtv/hdhrsignalmonitor.cpp b/mythtv/libs/libmythtv/hdhrsignalmonitor.cpp
@@ -10,7 +10,7 @@
 #include <sys/select.h>
 #endif
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdbcon.h"
 #include "hdhrsignalmonitor.h"
 #include "atscstreamdata.h"

diff --git a/mythtv/libs/libmythtv/hdhrstreamhandler.cpp b/mythtv/libs/libmythtv/hdhrstreamhandler.cpp
@@ -15,7 +15,6 @@
 #include "streamlisteners.h"
 #include "mpegstreamdata.h"
 #include "cardutil.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #define LOC      QString("HDHRSH(%1): ").arg(_device)

diff --git a/mythtv/libs/libmythtv/interactivetv.cpp b/mythtv/libs/libmythtv/interactivetv.cpp
@@ -10,7 +10,7 @@
 // MythTV headers
 #include "interactivetv.h"
 #include "mhi.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 InteractiveTV::InteractiveTV(MythPlayer *nvp)
     : m_context(new MHIContext(this)), m_nvp(nvp)

diff --git a/mythtv/libs/libmythtv/iptv/iptvchannelfetcher.cpp b/mythtv/libs/libmythtv/iptv/iptvchannelfetcher.cpp
@@ -11,7 +11,6 @@
 // MythTV headers
 #include "mythcontext.h"
 #include "httpcomms.h"
-#include "mythverbose.h"
 #include "cardutil.h"
 #include "channelutil.h"
 #include "iptvchannelfetcher.h"

diff --git a/mythtv/libs/libmythtv/iptv/iptvfeederfile.cpp b/mythtv/libs/libmythtv/iptv/iptvfeederfile.cpp
@@ -24,7 +24,7 @@
 // MythTV headers
 #include "iptvmediasink.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "tspacket.h"
 
 #define LOC QString("FbFeedFile: ")

diff --git a/mythtv/libs/libmythtv/iptv/iptvfeederlive.cpp b/mythtv/libs/libmythtv/iptv/iptvfeederlive.cpp
@@ -7,7 +7,7 @@
 #include "iptvfeederlive.h"
 
 // MythTV headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "timeoutedtaskscheduler.h"
 
 #define LOC QString("FbFeedLive:")

diff --git a/mythtv/libs/libmythtv/iptv/iptvfeederrtp.cpp b/mythtv/libs/libmythtv/iptv/iptvfeederrtp.cpp
@@ -20,7 +20,7 @@
 // MythTV headers
 #include "iptvmediasink.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "tspacket.h"
 
 #define LOC QString("IPTVFeedRTP: ")

diff --git a/mythtv/libs/libmythtv/iptv/iptvfeederrtsp.cpp b/mythtv/libs/libmythtv/iptv/iptvfeederrtsp.cpp
@@ -15,7 +15,7 @@
 // MythTV headers
 #include "iptvmediasink.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "tspacket.h"
 
 #define LOC QString("IPTVFeedRTSP:")

diff --git a/mythtv/libs/libmythtv/iptv/iptvfeederudp.cpp b/mythtv/libs/libmythtv/iptv/iptvfeederudp.cpp
@@ -22,7 +22,7 @@
 // MythTV headers
 #include "iptvmediasink.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "tspacket.h"
 
 #define LOC QString("IPTVFeedUDP: ")

diff --git a/mythtv/libs/libmythtv/iptv/iptvfeederwrapper.cpp b/mythtv/libs/libmythtv/iptv/iptvfeederwrapper.cpp
@@ -17,7 +17,7 @@ using namespace std;
 #include "iptvfeederrtp.h"
 #include "iptvfeederfile.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC QString("IPTVFeed: ")
 #define LOC_ERR QString("IPTVFeed, Error: ")

diff --git a/mythtv/libs/libmythtv/iptv/iptvmediasink.cpp b/mythtv/libs/libmythtv/iptv/iptvmediasink.cpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 
 #include "mythcontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "iptvmediasink.h"
 #include "streamlisteners.h"
 

diff --git a/mythtv/libs/libmythtv/iptvchannel.cpp b/mythtv/libs/libmythtv/iptvchannel.cpp
@@ -8,7 +8,7 @@
 
 // MythTV headers
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "iptvchannelfetcher.h"
 #include "iptvfeederwrapper.h"
 

diff --git a/mythtv/libs/libmythtv/jitterometer.cpp b/mythtv/libs/libmythtv/jitterometer.cpp
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <cmath>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "jitterometer.h"
 
 Jitterometer::Jitterometer(QString nname, int ncycles)

diff --git a/mythtv/libs/libmythtv/jobqueue.cpp b/mythtv/libs/libmythtv/jobqueue.cpp
@@ -26,7 +26,6 @@ using namespace std;
 
 #include "mythdb.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #ifndef O_STREAMING
@@ -1768,7 +1767,7 @@ QString JobQueue::GetJobCommand(int id, int jobType, ProgramInfo *tmpInfo)
         tmpInfo->SubstituteMatches(command);
 
         command.replace("%VERBOSELEVEL%",
-                        QString("%1").arg(print_verbose_messages));
+                        QString("%1").arg(verboseMask));
 
         uint transcoder = tmpInfo->QueryTranscoderID();
         command.replace("%TRANSPROFILE%",
@@ -1885,7 +1884,7 @@ void JobQueue::DoTranscodeThread(int jobID)
         path = GetInstallPrefix() + "/bin/mythtranscode";
         QByteArray parg = profilearg.toAscii();
         command = QString("%1 -j %2 -V %3 -p %4 %5")
-          .arg(path).arg(jobID).arg(print_verbose_messages)
+          .arg(path).arg(jobID).arg(verboseMask)
           .arg(parg.constData()).arg(useCutlist ? "--honorcutlist" : "");
         if (logPropagate())
             command += QString(" --logpath %1").arg(logPropPath());
@@ -2126,7 +2125,7 @@ void JobQueue::DoFlagCommercialsThread(int jobID)
     {
         path = GetInstallPrefix() + "/bin/mythcommflag";
         command = QString("%1 -j %2 -V %3 --noprogress")
-                          .arg(path).arg(jobID).arg(print_verbose_messages);
+                          .arg(path).arg(jobID).arg(verboseMask);
         if (logPropagate())
             command += QString(" --logpath %1").arg(logPropPath());
     }

diff --git a/mythtv/libs/libmythtv/livetvchain.cpp b/mythtv/libs/libmythtv/livetvchain.cpp
@@ -1,7 +1,7 @@
 #include "livetvchain.h"
 #include "mythcontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "programinfo.h"
 #include "mythsocket.h"
 #include "cardutil.h"

diff --git a/mythtv/libs/libmythtv/mhi.cpp b/mythtv/libs/libmythtv/mhi.cpp
@@ -11,7 +11,6 @@
 #include "mythuiimage.h"
 #include "osd.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
 #include "myth_imgconvert.h"
 #include "mythlogging.h"
 

diff --git a/mythtv/libs/libmythtv/mpeg/H264Parser.cpp b/mythtv/libs/libmythtv/mpeg/H264Parser.cpp
@@ -1,7 +1,7 @@
 // MythTV headers
 #include "H264Parser.h"
 #include <iostream>
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 extern "C" {
 // from libavcodec

diff --git a/mythtv/libs/libmythtv/mpeg/atscdescriptors.cpp b/mythtv/libs/libmythtv/mpeg/atscdescriptors.cpp
@@ -5,7 +5,7 @@
 using namespace std;
 
 #include "atscdescriptors.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "iso639.h"
 #include "atsc_huffman.h"
 

diff --git a/mythtv/libs/libmythtv/mpeg/atsctables.h b/mythtv/libs/libmythtv/mpeg/atsctables.h
@@ -7,7 +7,7 @@
 #include <QString>
 #include "mpegtables.h"
 #include "atscdescriptors.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Some sample code is in pcHDTV's dtvscan.c,
 // accum_sect/dequeue_buf/atsc_tables.  We should stuff

diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
@@ -5,7 +5,7 @@
 #include "dvbdescriptors.h"
 #include "iso6937tables.h"
 #include "freesat_huffman.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 
 // Only some of the QTextCodec calls are reenterant.

diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.cpp b/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2003-2004, Daniel Thor Kristjansson
 #include "mpegtables.h"
 #include "atscdescriptors.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 const unsigned char DEFAULT_PAT_HEADER[8] =
 {

diff --git a/mythtv/libs/libmythtv/mpeg/pespacket.cpp b/mythtv/libs/libmythtv/mpeg/pespacket.cpp
@@ -1,6 +1,6 @@
 // -*- Mode: c++ -*-
 // Copyright (c) 2003-2004, Daniel Thor Kristjansson
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "pespacket.h"
 #include "mpegtables.h"
 

diff --git a/mythtv/libs/libmythtv/mpeg/pespacket.h b/mythtv/libs/libmythtv/mpeg/pespacket.h
@@ -12,7 +12,7 @@
 using namespace std;
 
 #include "tspacket.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 unsigned char *pes_alloc(uint size);
 void pes_free(unsigned char *ptr);

diff --git a/mythtv/libs/libmythtv/myth_imgconvert.cpp b/mythtv/libs/libmythtv/myth_imgconvert.cpp
@@ -31,7 +31,7 @@ extern "C" {
 #include <QMutex>
 #include <QMutexLocker>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "myth_imgconvert.h"
 
 int myth_sws_img_convert(AVPicture *dst, PixelFormat dst_pix_fmt, AVPicture *src,

diff --git a/mythtv/libs/libmythtv/mythcodecid.cpp b/mythtv/libs/libmythtv/mythcodecid.cpp
@@ -1,5 +1,5 @@
 #include "mythcodecid.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 extern "C"
 {

diff --git a/mythtv/libs/libmythtv/mythiowrapper.cpp b/mythtv/libs/libmythtv/mythiowrapper.cpp
@@ -18,7 +18,7 @@
 #include "mythconfig.h"
 #include "compat.h"
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "remotefile.h"
 #include "ringbuffer.h"
 

diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -53,7 +53,6 @@ using namespace std;
 #include "NuppelVideoRecorder.h"
 #include "tv_play.h"
 #include "interactivetv.h"
-#include "mythverbose.h"
 #include "myth_imgconvert.h"
 #include "mythsystemevent.h"
 #include "mythpainter.h"

diff --git a/mythtv/libs/libmythtv/mythsystemevent.cpp b/mythtv/libs/libmythtv/mythsystemevent.cpp
@@ -7,7 +7,6 @@
 #include "mythcorecontext.h"
 #include "mythsystem.h"
 #include "mythsystemevent.h"
-#include "mythverbose.h"
 #include "programinfo.h"
 #include "remoteutil.h"
 #include "exitcodes.h"
@@ -216,7 +215,7 @@ void MythSystemEventHandler::SubstituteMatches(const QStringList &tokens,
     }
 
     command.replace(QString("%VERBOSELEVEL%"),
-                    QString("%1").arg(print_verbose_messages));
+                    QString("%1").arg(verboseMask));
 
     VERBOSE(VB_FILE+VB_EXTRA, LOC + QString("SubstituteMatches: AFTER : %1")
                                             .arg(command));

diff --git a/mythtv/libs/libmythtv/nuppeldecoder.cpp b/mythtv/libs/libmythtv/nuppeldecoder.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "nuppeldecoder.h"
 #include "mythplayer.h"
 #include "remoteencoder.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "myth_imgconvert.h"
 #include "programinfo.h"
 

diff --git a/mythtv/libs/libmythtv/osd.cpp b/mythtv/libs/libmythtv/osd.cpp
@@ -2,7 +2,7 @@
 #include <QCoreApplication>
 
 // libmyth
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // libmythui
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythtv/osdchromakey.cpp b/mythtv/libs/libmythtv/osdchromakey.cpp
@@ -11,7 +11,7 @@
 #include "osd.h"
 #include "osdchromakey.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "videoout_xv.h"
 #include "mythxdisplay.h"
 

diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp
@@ -30,7 +30,6 @@
 #include "util.h"
 #include "playercontext.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
 #include "remoteutil.h"
 #include "mythsystem.h"
 #include "exitcodes.h"

diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.cpp b/mythtv/libs/libmythtv/privatedecoder_vda.cpp
@@ -1,7 +1,7 @@
 // Based upon CDVDVideoCodecVDA from the xbmc project, originally written by
 // Scott Davilla (davilla@xbmc.org) and released under the GPLv2
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #define LOC QString("VDADec: ")
 #define ERR QString("VDADec error: ")
 

diff --git a/mythtv/libs/libmythtv/programdata.cpp b/mythtv/libs/libmythtv/programdata.cpp
@@ -9,7 +9,7 @@ using namespace std;
 // MythTV headers
 #include "channelutil.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "programinfo.h"
 #include "programdata.h"
 #include "dvbdescriptors.h"

diff --git a/mythtv/libs/libmythtv/recorderbase.cpp b/mythtv/libs/libmythtv/recorderbase.cpp
@@ -17,7 +17,7 @@ using namespace std;
 #include "dvbrecorder.h"
 #include "hdhrchannel.h"
 #include "iptvchannel.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "programinfo.h"
 #include "asichannel.h"
 #include "dtvchannel.h"

diff --git a/mythtv/libs/libmythtv/recordinginfo.cpp b/mythtv/libs/libmythtv/recordinginfo.cpp
@@ -27,7 +27,7 @@ using namespace std;
 #include "tvremoteutil.h"
 #include "jobqueue.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "previewgenerator.h"
 #include "channelutil.h"
 

diff --git a/mythtv/libs/libmythtv/recordingprofile.cpp b/mythtv/libs/libmythtv/recordingprofile.cpp
@@ -7,7 +7,7 @@
 #include "cardutil.h"
 #include "mythcorecontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythwizard.h"
 #include "managedlist.h"
 

diff --git a/mythtv/libs/libmythtv/remoteencoder.cpp b/mythtv/libs/libmythtv/remoteencoder.cpp
@@ -10,7 +10,7 @@
 #include "videooutbase.h"
 #include "mythdb.h"
 #include "mythsocket.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 using namespace std;
 

diff --git a/mythtv/libs/libmythtv/scanwizard.cpp b/mythtv/libs/libmythtv/scanwizard.cpp
@@ -37,7 +37,7 @@
 #include "videosource.h"
 #include "scaninfo.h"
 #include "channelimporter.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC QString("SWiz: ")
 #define LOC_ERR QString("SWiz, Error: ")

diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
@@ -11,7 +11,6 @@
 #include "signalmonitor.h"
 #include "mythcontext.h"
 #include "compat.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 #include "tv_rec.h"
 

diff --git a/mythtv/libs/libmythtv/signalmonitorvalue.cpp b/mythtv/libs/libmythtv/signalmonitorvalue.cpp
@@ -2,7 +2,7 @@
 using namespace std;
 
 #include "signalmonitorvalue.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 bool SignalMonitorValue::run_static_init = true;
 QStringList SignalMonitorValue::ERROR_NO_CHANNEL;

diff --git a/mythtv/libs/libmythtv/sourceutil.cpp b/mythtv/libs/libmythtv/sourceutil.cpp
@@ -7,7 +7,7 @@
 #include "sourceutil.h"
 #include "cardutil.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "util.h"
 
 bool SourceUtil::HasDigitalChannel(uint sourceid)

diff --git a/mythtv/libs/libmythtv/streamingringbuffer.cpp b/mythtv/libs/libmythtv/streamingringbuffer.cpp
@@ -1,4 +1,4 @@
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "streamingringbuffer.h"
 

diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -1,6 +1,6 @@
 #include <QFontMetrics>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythfontproperties.h"
 #include "mythuitext.h"
 #include "mythuishape.h"

diff --git a/mythtv/libs/libmythtv/teletextdecoder.cpp b/mythtv/libs/libmythtv/teletextdecoder.cpp
@@ -33,7 +33,7 @@ using namespace std;
 #include "teletextdecoder.h"
 #include "teletextreader.h"
 #include "vbilut.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /** \fn TeletextDecoder::Decode(const unsigned char*, int)
  *  \brief Decodes teletext data

diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
@@ -1,7 +1,7 @@
 #include <QFontMetrics>
 #include <QPainter>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythfontproperties.h"
 #include "mythuitext.h"
 #include "mythuishape.h"

diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -45,7 +45,6 @@ using namespace std;
 #include "cardutil.h"
 #include "channelutil.h"
 #include "compat.h"
-#include "mythverbose.h"
 #include "mythuihelper.h"
 #include "mythdialogbox.h"
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythtv/tv_play_win.cpp b/mythtv/libs/libmythtv/tv_play_win.cpp
@@ -3,7 +3,7 @@
 
 // MythTV
 #include "mythmainwindow.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythuiprogressbar.h"
 
 #include "tv_play_win.h"

diff --git a/mythtv/libs/libmythtv/util-osd.h b/mythtv/libs/libmythtv/util-osd.h
@@ -1,7 +1,7 @@
 #ifndef UTIL_OSD_H
 #define UTIL_OSD_H
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythimage.h"
 #include "frame.h"
 

diff --git a/mythtv/libs/libmythtv/util-xv.cpp b/mythtv/libs/libmythtv/util-xv.cpp
@@ -7,7 +7,7 @@
 using namespace std;
 
 // MythTH headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythxdisplay.h"
 #include "util-xv.h"
 

diff --git a/mythtv/libs/libmythtv/vaapicontext.cpp b/mythtv/libs/libmythtv/vaapicontext.cpp
@@ -1,5 +1,5 @@
 #include "openglvideo.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythxdisplay.h"
 #include "mythcodecid.h"
 #include "frame.h"

diff --git a/mythtv/libs/libmythtv/vbi608extractor.cpp b/mythtv/libs/libmythtv/vbi608extractor.cpp
@@ -27,7 +27,7 @@
 using namespace std;
 
 #include "vbi608extractor.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC      QString("VBI608Extractor: ")
 #define LOC_WARN QString("VBI608Extractor, Warning: ")

diff --git a/mythtv/libs/libmythtv/videobuffers.cpp b/mythtv/libs/libmythtv/videobuffers.cpp
@@ -12,7 +12,7 @@ extern "C" {
 }
 #include "fourcc.h"
 #include "compat.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define TRY_LOCK_SPINS                 100
 #define TRY_LOCK_SPINS_BEFORE_WARNING   10

diff --git a/mythtv/libs/libmythtv/videocolourspace.cpp b/mythtv/libs/libmythtv/videocolourspace.cpp
@@ -2,7 +2,7 @@
 
 #include "compat.h"
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "videocolourspace.h"
 
 

diff --git a/mythtv/libs/libmythtv/videodbcheck.cpp b/mythtv/libs/libmythtv/videodbcheck.cpp
@@ -9,7 +9,7 @@
 #include "videodbcheck.h"
 #include "mythdb.h"
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "remotefile.h"
 #include "util.h"
 #include "libmythmetadata/videoutils.h"

diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
@@ -5,7 +5,7 @@ using namespace std;
 #include "videodisplayprofile.h"
 #include "mythcorecontext.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "videooutbase.h"
 #include "avformatdecoder.h"
 

diff --git a/mythtv/libs/libmythtv/videometadatautil.cpp b/mythtv/libs/libmythtv/videometadatautil.cpp
@@ -3,7 +3,7 @@
 #include <QUrl>
 
 #include "videometadatautil.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 #define LOC      QString("VideoMetaDataUtil: ")

diff --git a/mythtv/libs/libmythtv/videoout_null.cpp b/mythtv/libs/libmythtv/videoout_null.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 using namespace std;
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "videoout_null.h"
 #include "videodisplayprofile.h"
 

diff --git a/mythtv/libs/libmythtv/videoout_quartz.cpp b/mythtv/libs/libmythtv/videoout_quartz.cpp
@@ -63,7 +63,7 @@ using namespace std;
 
 #include "osd.h"
 #include "mythconfig.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "videodisplayprofile.h"
 
 #define LOC     QString("VideoOutputQuartz::")

diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
@@ -37,7 +37,7 @@ using namespace std;
 
 // MythTV General headers
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "filtermanager.h"
 #include "videodisplayprofile.h"
 #define IGNORE_TV_PLAY_REC

diff --git a/mythtv/libs/libmythtv/videooutbase.cpp b/mythtv/libs/libmythtv/videooutbase.cpp
@@ -9,7 +9,7 @@
 #include "decoderbase.h"
 
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythmainwindow.h"
 #include "mythuihelper.h"
 #include "mythxdisplay.h"

diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
@@ -38,7 +38,7 @@ using namespace std;
 #include "compat.h"
 #include "mythdb.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "libmythupnp/httprequest.h"    // for TestMimeType()
 #include "mythsystem.h"
 #include "exitcodes.h"

diff --git a/mythtv/libs/libmythtv/visualisations/videovisual.h b/mythtv/libs/libmythtv/visualisations/videovisual.h
@@ -7,7 +7,7 @@
 #include <QList>
 #include <QDateTime>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "visual.h"
 #include "mythpainter.h"
 #include "videovisualdefs.h"

diff --git a/mythtv/libs/libmythui/AppleRemote.cpp b/mythtv/libs/libmythui/AppleRemote.cpp
@@ -17,7 +17,6 @@
 
 #include <sstream>
 
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 AppleRemote*      AppleRemote::_instance = 0;

diff --git a/mythtv/libs/libmythui/DisplayRes.cpp b/mythtv/libs/libmythui/DisplayRes.cpp
@@ -1,7 +1,7 @@
 
 #include "DisplayRes.h"
 #include "config.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 #ifdef USING_XRANDR

diff --git a/mythtv/libs/libmythui/DisplayResX.cpp b/mythtv/libs/libmythui/DisplayResX.cpp
@@ -4,7 +4,7 @@
 
 #include <cmath>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "mythdisplay.h"
 #include "mythxdisplay.h"

diff --git a/mythtv/libs/libmythui/jsmenu.cpp b/mythtv/libs/libmythui/jsmenu.cpp
@@ -43,7 +43,6 @@
 #include <linux/joystick.h>
 
 // Myth headers
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 // Mythui headers

diff --git a/mythtv/libs/libmythui/lirc.cpp b/mythtv/libs/libmythui/lirc.cpp
@@ -19,7 +19,6 @@ using namespace std;
 #include <QStringList>
 
 // MythTV headers
-#include "mythverbose.h"
 #include "mythdb.h"
 #include "mythsystem.h"
 #include "lircevent.h"

diff --git a/mythtv/libs/libmythui/mythdialogbox.cpp b/mythtv/libs/libmythui/mythdialogbox.cpp
@@ -7,7 +7,7 @@
 #include <QStringList>
 #include <QTimer>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "mythmainwindow.h"
 #include "mythfontproperties.h"

diff --git a/mythtv/libs/libmythui/mythfontmanager.cpp b/mythtv/libs/libmythui/mythfontmanager.cpp
@@ -5,7 +5,7 @@
 #include <QMutexLocker>
 
 #include "mythfontmanager.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 static MythFontManager *gFontManager = NULL;
 

diff --git a/mythtv/libs/libmythui/mythfontproperties.cpp b/mythtv/libs/libmythui/mythfontproperties.cpp
@@ -6,13 +6,12 @@
 #include <QFontInfo>
 #include <QRect>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 #include "mythuihelper.h"
 #include "mythmainwindow.h"
 #include "xmlparsebase.h"
-#include "mythverbose.h"
 
 #define LOC      QString("MythFontProperties: ")
 #define LOC_WARN QString("MythFontProperties, Warning: ")

diff --git a/mythtv/libs/libmythui/mythgenerictree.cpp b/mythtv/libs/libmythui/mythgenerictree.cpp
@@ -4,7 +4,7 @@
 #include "mythuibuttonlist.h"
 
 // Myth headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 class SortableMythGenericTreeList : public QList<MythGenericTree*>
 {

diff --git a/mythtv/libs/libmythui/mythimage.cpp b/mythtv/libs/libmythui/mythimage.cpp
@@ -14,7 +14,7 @@
 
 // Mythdb headers
 #include "mythdownloadmanager.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Myth headers
 #include "remotefile.h"

diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -37,7 +37,7 @@ using namespace std;
 
 // libmythbase headers
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythevent.h"
 #include "mythdirs.h"
 #include "compat.h"

diff --git a/mythtv/libs/libmythui/mythpainter.cpp b/mythtv/libs/libmythui/mythpainter.cpp
@@ -5,7 +5,7 @@
 #include <QPainter>
 
 // libmythbase headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // libmythui headers
 #include "mythfontproperties.h"

diff --git a/mythtv/libs/libmythui/mythpainter_d3d9.cpp b/mythtv/libs/libmythui/mythpainter_d3d9.cpp
@@ -4,7 +4,7 @@
 #include <QMutex>
 
 // Mythdb headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Mythui headers
 #include "mythpainter_d3d9.h"

diff --git a/mythtv/libs/libmythui/mythpainter_ogl.cpp b/mythtv/libs/libmythui/mythpainter_ogl.cpp
@@ -7,7 +7,7 @@
 #include <QGLWidget>
 
 // libmythbase headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Mythui headers
 #include "mythrender_opengl.h"

diff --git a/mythtv/libs/libmythui/mythpainter_qimage.cpp b/mythtv/libs/libmythui/mythpainter_qimage.cpp
@@ -8,7 +8,7 @@
 
 // MythDB headers
 #include "compat.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 MythQImagePainter::MythQImagePainter() :
     MythPainter(), painter(NULL), copy(false)

diff --git a/mythtv/libs/libmythui/mythpainter_qt.cpp b/mythtv/libs/libmythui/mythpainter_qt.cpp
@@ -10,7 +10,7 @@
 
 // MythDB headers
 #include "compat.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 class MythQtImage : public MythImage
 {

diff --git a/mythtv/libs/libmythui/mythpainter_vdpau.cpp b/mythtv/libs/libmythui/mythpainter_vdpau.cpp
@@ -8,7 +8,7 @@
 #include <QX11Info>
 
 // Mythdb headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Mythui headers
 #include "mythrender_vdpau.h"

diff --git a/mythtv/libs/libmythui/mythpainter_yuva.cpp b/mythtv/libs/libmythui/mythpainter_yuva.cpp
@@ -3,7 +3,7 @@
 
 #include "mythpainter_yuva.h"
 #include "mythfontproperties.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define MAX_FONT_CACHE 32
 

diff --git a/mythtv/libs/libmythui/mythprogressdialog.cpp b/mythtv/libs/libmythui/mythprogressdialog.cpp
@@ -1,6 +1,6 @@
 // MythTV headers
 #include "mythprogressdialog.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 QEvent::Type ProgressUpdateEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();

diff --git a/mythtv/libs/libmythui/mythrender_d3d9.cpp b/mythtv/libs/libmythui/mythrender_d3d9.cpp
@@ -8,7 +8,7 @@ using std::min;
 #include <QMap>
 #include <QMutex>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythrender_d3d9.h"
 
 #define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097)

diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 using namespace std;
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythrender_opengl.h"
 #include "mythxdisplay.h"
 

diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
@@ -18,7 +18,7 @@
 #endif
 
 #include "mythuiexp.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythrender_base.h"
 #include "mythrender_opengl_defs.h"
 

diff --git a/mythtv/libs/libmythui/mythrender_vdpau.cpp b/mythtv/libs/libmythui/mythrender_vdpau.cpp
@@ -3,7 +3,7 @@
 #include <QSize>
 #include <QThread>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythmainwindow.h"
 #include "mythrender_vdpau.h"
 

diff --git a/mythtv/libs/libmythui/mythscreentype.cpp b/mythtv/libs/libmythui/mythscreentype.cpp
@@ -6,7 +6,6 @@
 #include <QRunnable>
 #include <QThreadPool>
 
-#include "mythverbose.h"
 #include "mythobservable.h"
 
 #include "mythscreenstack.h"

diff --git a/mythtv/libs/libmythui/myththemedmenu.cpp b/mythtv/libs/libmythui/myththemedmenu.cpp
@@ -22,7 +22,7 @@
 #include "mythcorecontext.h"
 
 // libmythbase headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "mythdirs.h"
 #include "mythmedia.h"

diff --git a/mythtv/libs/libmythui/mythudplistener.cpp b/mythtv/libs/libmythui/mythudplistener.cpp
@@ -3,7 +3,7 @@
 #include <QDomDocument>
 
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythmainwindow.h"
 #include "mythudplistener.h"
 

diff --git a/mythtv/libs/libmythui/mythuibutton.cpp b/mythtv/libs/libmythui/mythuibutton.cpp
@@ -7,7 +7,7 @@
 #include <QCoreApplication>
 
 // Myth headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // MythUI headers
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuibuttonlist.cpp b/mythtv/libs/libmythui/mythuibuttonlist.cpp
@@ -7,7 +7,7 @@
 #include <QDomDocument>
 
 // libmyth headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // mythui headers
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuibuttontree.cpp b/mythtv/libs/libmythui/mythuibuttontree.cpp
@@ -6,7 +6,7 @@
 #include <QDomDocument>
 
 // Mythdb headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Mythui Headers
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuicheckbox.cpp b/mythtv/libs/libmythui/mythuicheckbox.cpp
@@ -3,7 +3,7 @@
 #include "mythuicheckbox.h"
 
 // Myth headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // MythUI headers
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuiclock.cpp b/mythtv/libs/libmythui/mythuiclock.cpp
@@ -8,7 +8,7 @@
 #include "mythmainwindow.h"
 #include "mythfontproperties.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 MythUIClock::MythUIClock(MythUIType *parent, const QString &name)

diff --git a/mythtv/libs/libmythui/mythuieditbar.cpp b/mythtv/libs/libmythui/mythuieditbar.cpp
@@ -1,4 +1,4 @@
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythuieditbar.h"
 
 MythUIEditBar::MythUIEditBar(MythUIType *parent, const QString &name)

diff --git a/mythtv/libs/libmythui/mythuifilebrowser.cpp b/mythtv/libs/libmythui/mythuifilebrowser.cpp
@@ -6,7 +6,7 @@
 #include <QTimer>
 #include <QUrl>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "mythdialogbox.h"
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuiguidegrid.cpp b/mythtv/libs/libmythui/mythuiguidegrid.cpp
@@ -16,7 +16,7 @@ using namespace std;
 #include "mythfontproperties.h"
 #include "mythuihelper.h"
 #include "x11colors.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythimage.h"
 #include "mythuitype.h"
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuihelper.cpp b/mythtv/libs/libmythui/mythuihelper.cpp
@@ -18,7 +18,7 @@
 #include <QFile>
 
 #include "mythdirs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdownloadmanager.h"
 #include "oldsettings.h"
 #include "screensaver.h"

diff --git a/mythtv/libs/libmythui/mythuiimage.cpp b/mythtv/libs/libmythui/mythuiimage.cpp
@@ -19,7 +19,6 @@
 #include <QCoreApplication>
 
 // libmythbase
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 // Mythui

diff --git a/mythtv/libs/libmythui/mythuiprogressbar.cpp b/mythtv/libs/libmythui/mythuiprogressbar.cpp
@@ -7,7 +7,7 @@
 #include <QDomDocument>
 
 // MythDB
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // MythUI
 

diff --git a/mythtv/libs/libmythui/mythuishape.cpp b/mythtv/libs/libmythui/mythuishape.cpp
@@ -13,7 +13,7 @@ using namespace std;
 #include <QColor>
 
 // myth
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythpainter.h"
 #include "mythimage.h"
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythui/mythuitext.cpp b/mythtv/libs/libmythui/mythuitext.cpp
@@ -8,7 +8,7 @@
 #include <QString>
 #include <QHash>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "mythuihelper.h"
 #include "mythpainter.h"

diff --git a/mythtv/libs/libmythui/mythuitextedit.cpp b/mythtv/libs/libmythui/mythuitextedit.cpp
@@ -10,7 +10,7 @@
 #include <QDomDocument>
 
 // libmythbase headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 // MythUI headers

diff --git a/mythtv/libs/libmythui/mythuitype.cpp b/mythtv/libs/libmythui/mythuitype.cpp
@@ -8,7 +8,7 @@
 #include <QDomDocument>
 
 // Mythdb headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // MythUI headers
 #include "mythgesture.h"

diff --git a/mythtv/libs/libmythui/mythuiutils.cpp b/mythtv/libs/libmythui/mythuiutils.cpp
@@ -6,7 +6,7 @@
 #include <QString>
 
 // libmythbase headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 bool ETPrintWarning::Child(const QString &container_name,
                            const QString &child_name)

diff --git a/mythtv/libs/libmythui/mythuivideo.cpp b/mythtv/libs/libmythui/mythuivideo.cpp
@@ -6,7 +6,7 @@
 #include <QDomDocument>
 
 // libmythbase
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Mythui
 #include "mythpainter.h"

diff --git a/mythtv/libs/libmythui/mythuiwebbrowser.cpp b/mythtv/libs/libmythui/mythuiwebbrowser.cpp
@@ -26,7 +26,7 @@
 #include "mythimage.h"
 #include "mythmainwindow.h"
 #include "mythfontproperties.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "mythdirs.h"
 #include "mythuihelper.h"

diff --git a/mythtv/libs/libmythui/mythvirtualkeyboard.cpp b/mythtv/libs/libmythui/mythvirtualkeyboard.cpp
@@ -12,7 +12,7 @@
 
 // myth
 #include "mythmainwindow.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythfontproperties.h"
 #include "mythuihelper.h"
 #include "mythuibutton.h"

diff --git a/mythtv/libs/libmythui/mythxdisplay.cpp b/mythtv/libs/libmythui/mythxdisplay.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "config.h" // for CONFIG_DARWIN
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythuihelper.h"
 
 #ifdef USING_X11

diff --git a/mythtv/libs/libmythui/screensaver-x11.cpp b/mythtv/libs/libmythui/screensaver-x11.cpp
@@ -8,7 +8,7 @@
 #include <QX11Info>
 
 // Mythdb headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 // Mythui headers

diff --git a/mythtv/libs/libmythui/themeinfo.cpp b/mythtv/libs/libmythui/themeinfo.cpp
@@ -9,7 +9,7 @@
 #include <QDomElement>
 
 // MythTV headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdownloadmanager.h"
 
 #define LOC      QString("ThemeInfo: ")

diff --git a/mythtv/libs/libmythui/util-nvctrl.cpp b/mythtv/libs/libmythui/util-nvctrl.cpp
@@ -1,7 +1,7 @@
 
 #include "util-nvctrl.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythdb.h"
 
 #include <stdio.h>

diff --git a/mythtv/libs/libmythui/xmlparsebase.cpp b/mythtv/libs/libmythui/xmlparsebase.cpp
@@ -13,7 +13,7 @@
 #include <QLinearGradient>
 
 // libmyth headers
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Mythui headers
 #include "mythmainwindow.h"

diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
@@ -26,7 +26,7 @@
 #include "mythtimer.h"
 #include "bufferedsocketdevice.h"
 #include "upnputil.h"
-#include "mythverbose.h"  // for VERBOSE
+#include "mythlogging.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/mythtv/libs/libmythupnp/configuration.cpp b/mythtv/libs/libmythupnp/configuration.cpp
@@ -28,7 +28,7 @@
 #include <QTextStream>
 
 #include "configuration.h"
-#include "mythverbose.h"  // for VERBOSE and GetConfDir()
+#include "mythlogging.h"
 #include "mythdb.h"
 #include "mythdirs.h"
 

diff --git a/mythtv/libs/libmythupnp/eventing.cpp b/mythtv/libs/libmythupnp/eventing.cpp
@@ -30,7 +30,7 @@
 #include "upnp.h"
 #include "eventing.h"
 #include "upnptaskevent.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/mythtv/libs/libmythupnp/htmlserver.cpp b/mythtv/libs/libmythupnp/htmlserver.cpp
@@ -21,7 +21,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "htmlserver.h"
 
 #include <QFileInfo>

diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp
@@ -48,7 +48,7 @@
 #include "upnp.h"
 
 #include "compat.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include "serializers/xmlSerializer.h"
 #include "serializers/soapSerializer.h"

diff --git a/mythtv/libs/libmythupnp/httpserver.cpp b/mythtv/libs/libmythupnp/httpserver.cpp
@@ -40,7 +40,7 @@
 #include "upnp.h" // only needed for Config... remove once config is moved.
 #include "compat.h"
 #include "mythdirs.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "htmlserver.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/mythtv/libs/libmythupnp/mbroadcastsocketdevice.h b/mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
@@ -27,7 +27,7 @@
 #include <QString>
 
 #include "msocketdevice.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // Broadcast Socket is used for XBox (original) since Multicast is not supported

diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp b/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
@@ -39,7 +39,7 @@
 
 // MythTV headers
 #include "mmulticastsocketdevice.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define LOC      (QString("MMulticastSocketDevice(%1:%2): ") \
                   .arg(m_address.toString()).arg(socket()))

diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.h b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h
@@ -36,7 +36,7 @@
 
 // MythTV headers
 #include "msocketdevice.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "compat.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/mythtv/libs/libmythupnp/mythxmlclient.cpp b/mythtv/libs/libmythupnp/mythxmlclient.cpp
@@ -22,10 +22,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "mythxmlclient.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include <QObject>
-#include "mythverbose.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/mythtv/libs/libmythupnp/serverSideScripting.cpp b/mythtv/libs/libmythupnp/serverSideScripting.cpp
@@ -25,7 +25,7 @@
 #include <QFileInfo>
 
 #include "serverSideScripting.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 QScriptValue formatStr(QScriptContext *context, QScriptEngine *interpreter);
 

diff --git a/mythtv/libs/libmythupnp/servicehost.cpp b/mythtv/libs/libmythupnp/servicehost.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomDocument>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "servicehost.h"
 #include "wsdl.h"
 

diff --git a/mythtv/libs/libmythupnp/soapclient.cpp b/mythtv/libs/libmythupnp/soapclient.cpp
@@ -25,7 +25,7 @@
 
 #include "soapclient.h"
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "httprequest.h"
 
 #define LOC      QString("SOAPClient: ")

diff --git a/mythtv/libs/libmythupnp/ssdp.cpp b/mythtv/libs/libmythupnp/ssdp.cpp
@@ -24,7 +24,6 @@
 #include <algorithm>
 
 #include "upnp.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #include "upnptasksearch.h"

diff --git a/mythtv/libs/libmythupnp/ssdpcache.cpp b/mythtv/libs/libmythupnp/ssdpcache.cpp
@@ -23,7 +23,7 @@
 
 #include "upnp.h"
 #include "mythevent.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "upnptaskcache.h"
 
 SSDPCache* SSDPCache::g_pSSDPCache = NULL;

diff --git a/mythtv/libs/libmythupnp/taskqueue.cpp b/mythtv/libs/libmythupnp/taskqueue.cpp
@@ -22,7 +22,6 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "taskqueue.h"
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 #include <QDateTime>

diff --git a/mythtv/libs/libmythupnp/threadpool.cpp b/mythtv/libs/libmythupnp/threadpool.cpp
@@ -28,7 +28,6 @@ using namespace std;
 
 #include "threadpool.h"
 #include "upnp.h"    // only needed for Config... remove once config is moved.
-#include "mythverbose.h"
 #include "mythlogging.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/mythtv/libs/libmythupnp/upnp.cpp b/mythtv/libs/libmythupnp/upnp.cpp
@@ -22,7 +22,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "upnptaskcache.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "upnp.h"
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/mythtv/libs/libmythupnp/upnpcds.cpp b/mythtv/libs/libmythupnp/upnpcds.cpp
@@ -26,7 +26,7 @@
 #include "upnp.h"
 #include "upnpcds.h"
 #include "upnputil.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #define DIDL_LITE_BEGIN "<DIDL-Lite xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\" xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\">"
 #define DIDL_LITE_END   "</DIDL-Lite>";

diff --git a/mythtv/libs/libmythupnp/upnpcmgr.cpp b/mythtv/libs/libmythupnp/upnpcmgr.cpp
@@ -23,7 +23,7 @@
 
 #include "upnp.h"
 #include "upnpcmgr.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/mythtv/libs/libmythupnp/upnpdevice.cpp b/mythtv/libs/libmythupnp/upnpdevice.cpp
@@ -24,7 +24,7 @@
 #include "upnp.h"
 #include "upnpdevice.h"
 #include "httpcomms.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // MythDB
 #include "mythdb.h"

diff --git a/mythtv/libs/libmythupnp/upnpmsrr.cpp b/mythtv/libs/libmythupnp/upnpmsrr.cpp
@@ -7,7 +7,7 @@
 
 #include "upnp.h"
 #include "upnpmsrr.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 #include <cmath>
 #include <QRegExp>

diff --git a/mythtv/libs/libmythupnp/upnpsubscription.cpp b/mythtv/libs/libmythupnp/upnpsubscription.cpp
@@ -11,7 +11,7 @@ QObject::customEvent to receive event notifications for subscribed services.
 #include <QTextCodec>
 
 #include "mythcorecontext.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "upnpsubscription.h"
 
 // default requested time for subscription (actual is dictated by server)

diff --git a/mythtv/libs/libmythupnp/upnptaskcache.h b/mythtv/libs/libmythupnp/upnptaskcache.h
@@ -26,7 +26,7 @@
 
 #include <QString>
 
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "upnp.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/mythtv/libs/libmythupnp/upnptaskevent.cpp b/mythtv/libs/libmythupnp/upnptaskevent.cpp
@@ -22,7 +22,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "upnptaskevent.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

diff --git a/mythtv/libs/libmythupnp/upnptasknotify.cpp b/mythtv/libs/libmythupnp/upnptasknotify.cpp
@@ -31,7 +31,7 @@
 
 // MythTV headers
 #include "mmulticastsocketdevice.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "compat.h"
 #include "upnp.h"
 

diff --git a/mythtv/libs/libmythupnp/upnputil.cpp b/mythtv/libs/libmythupnp/upnputil.cpp
@@ -34,7 +34,7 @@
 #include "upnp.h"
 #include "compat.h"
 #include "mythconfig.h" // for HAVE_GETIFADDRS
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // POSIX headers 2, needs to be after compat.h for OS X
 #ifndef USING_MINGW

diff --git a/mythtv/programs/mythavtest/main.cpp b/mythtv/programs/mythavtest/main.cpp
@@ -14,7 +14,6 @@ using namespace std;
 
 #include "exitcodes.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
 #include "mythversion.h"
 #include "mythdbcon.h"
 #include "compat.h"
@@ -56,7 +55,7 @@ int main(int argc, char *argv[])
     QString filename = "";
 
     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;
 
@@ -65,8 +64,8 @@ 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");
         }
     }
 

diff --git a/mythtv/programs/mythbackend/main.cpp b/mythtv/programs/mythbackend/main.cpp
@@ -21,7 +21,7 @@
 #include "storagegroup.h"
 #include "housekeeper.h"
 #include "mediaserver.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythversion.h"
 #include "programinfo.h"
 #include "autoexpire.h"
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
     pidfile = cmdline.toString("pidfile");
 
     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;
 
@@ -99,8 +99,8 @@ 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");
         }
     }
 

diff --git a/mythtv/programs/mythbackend/main_helpers.cpp b/mythtv/programs/mythbackend/main_helpers.cpp
@@ -37,7 +37,6 @@
 #include "housekeeper.h"
 
 #include "mythcontext.h"
-#include "mythverbose.h"
 #include "mythversion.h"
 #include "mythdb.h"
 #include "exitcodes.h"
@@ -430,7 +429,7 @@ int handle_command(const MythBackendCommandLineParser &cmdline)
             sched->FillRecordListFromDB();
         }
 
-        print_verbose_messages |= VB_SCHEDULE;
+        verboseMask |= VB_SCHEDULE;
         sched->PrintList(true);
         return GENERIC_EXIT_OK;
     }

diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -41,7 +41,6 @@ using namespace std;
 #include "previewgeneratorqueue.h"
 #include "exitcodes.h"
 #include "mythcontext.h"
-#include "mythverbose.h"
 #include "mythversion.h"
 #include "mythdb.h"
 #include "mainserver.h"
@@ -5024,9 +5023,9 @@ void MainServer::HandleSetVerbose(QStringList &slist, PlaybackSock *pbs)
     int len=newverbose.length();
     if (len > 12)
     {
-        parse_verbose_arg(newverbose.right(len-12));
+        verboseArgParse(newverbose.right(len-12));
 
-        VERBOSE(VB_IMPORTANT, QString("Verbose level changed, new level is: %1")
+        VERBOSE(VB_IMPORTANT, QString("Verbose mask changed, new mask is: %1")
                                       .arg(verboseString));
 
         retlist << "OK";

diff --git a/mythtv/programs/mythcommflag/CannyEdgeDetector.cpp b/mythtv/programs/mythcommflag/CannyEdgeDetector.cpp
@@ -4,7 +4,7 @@
 // MythTV headers
 #include "mythplayer.h"
 #include "frame.h"          // VideoFrame
-#include "mythverbose.h"
+#include "mythlogging.h"
 
 // Commercial Flagging headers
 #include "pgm.h"

diff --git a/mythtv/programs/mythcommflag/CommDetector2.cpp b/mythtv/programs/mythcommflag/CommDetector2.cpp
@@ -16,7 +16,7 @@ using namespace std;
 // MythTV headers
 #include "compat.h"
 #include "mythdb.h"
-#include "mythverbose.h"
+#include "mythlogging.h"
 #include "mythplayer.h"
 #include "programinfo.h"
 #include "channelutil.h"