Ticket #2130: myth-logging.patch

libs/libmythtv/logging.h

@@ +1 @@
+extern unsigned int print_verbose_messages;
+
+/// This MAP is for the various VERBOSITY flags, used to select which
+/// messages we want printed to the console.
+///
+/// The 5 fields are:
+///     enum
+///     enum value
+///     "-v" arg string
+///     additive flag (explicit = 0, additive = 1)
+///     help text for "-v help"
+///
+/// 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
+/// "-v help" is used.
+
+#define VERBOSE_MAP(F) \
+    F(VB_ALL,       0xffffffff, "all",       0,  \
+      "ALL available debug output")              \
+    F(VB_IMPORTANT, 0x00000001, "important", 0,  \
+      "Errors or other very important messages") \
+    F(VB_GENERAL,   0x00000002, "general",   1,  \
+      "General info")                            \
+    F(VB_RECORD,    0x00000004, "record",    1,  \
+      "Recording related messages")              \
+    F(VB_PLAYBACK,  0x00000008, "playback",  1,  \
+      "Playback related messages")               \
+    F(VB_CHANNEL,   0x00000010, "channel",   1,  \
+      "Channel related messages")                \
+    F(VB_OSD,       0x00000020, "osd",       1,  \
+      "On-Screen Display related messages")      \
+    F(VB_FILE,      0x00000040, "file",      1,  \
+      "File and AutoExpire related messages")    \
+    F(VB_SCHEDULE,  0x00000080, "schedule",  1,  \
+      "Scheduling related messages")             \
+    F(VB_NETWORK,   0x00000100, "network",   1,  \
+      "Network protocol related messages")       \
+    F(VB_COMMFLAG,  0x00000200, "commflag",  1,  \
+      "Commercial Flagging related messages")    \
+    F(VB_AUDIO,     0x00000400, "audio",     1,  \
+      "Audio related messages")                  \
+    F(VB_LIBAV,     0x00000800, "libav",     1,  \
+      "Enables libav debugging")                 \
+    F(VB_JOBQUEUE,  0x00001000, "jobqueue",  1,  \
+      "JobQueue related messages")               \
+    F(VB_SIPARSER,  0x00002000, "siparser",  1,  \
+      "Siparser related messages")               \
+    F(VB_EIT,       0x00004000, "eit",       1,  \
+      "EIT related messages")                    \
+    F(VB_VBI,       0x00008000, "vbi",       1,  \
+      "VBI related messages")                    \
+    F(VB_DATABASE,  0x00010000, "database",  1,  \
+      "Display all SQL commands executed")       \
+    F(VB_DSMCC,     0x00020000, "dsmcc",     1,  \
+      "DSMCC carousel related messages")         \
+    F(VB_MHEG,      0x00040000, "mheg",      1,  \
+      "MHEG debugging messages")                 \
+    F(VB_UPNP,      0x00080000, "upnp",      1,  \
+      "upnp debugging messages")                 \
+    F(VB_SOCKET,    0x00100000, "socket",    1,  \
+      "socket debugging messages")               \
+    F(VB_TIMESTAMP, 0x80000000, "timestamp", 1,  \
+      "Conditional data driven messages")        \
+    F(VB_NONE,      0x00000000, "none",      0,  \
+      "NO debug output")
+
+enum VerboseMask
+{
+#define VERBOSE_ENUM(ARG_ENUM, ARG_VALUE, ARG_STRING, ARG_ADDITIVE, ARG_HELP)\
+    ARG_ENUM = ARG_VALUE ,
+    VERBOSE_MAP(VERBOSE_ENUM)
+};
+
+#define VERBOSE(mask,args...) \
+do { \
+        if ( (print_verbose_messages&(mask)) == (mask)) \
+        { \
+                char _pbuf[256]; \
+                struct tm *_tp; \
+                struct timeval _tv; \
+\
+                gettimeofday(&_tv,NULL); \
+                _tp = localtime(&_tv.tv_sec); \
+                snprintf(_pbuf,sizeof(_pbuf),args ); \
+                printf("%4d-%02d-%02d %2d:%02d:%02d.%03d " __FILE__ ": %s\n",1900+_tp->tm_year,1+_tp->tm_mon,_tp->tm_mday,_tp->tm_hour,_tp->tm_min,_tp->tm_sec,_tv.tv_usec/10000,_pbuf); \
+        }\
+} while (0)

libs/libavformat/utils.c

@@ -19 +19 @@
 #include "avformat.h"
 #include "allformats.h"
 #include "mpegts.h"
+#include "logging.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -1904 +1905 @@
         AVStream *st;
         for(i = 0;i < ic->nb_streams; i++) {
             st = ic->streams[i];
-        printf("%d: start_time: %0.3f duration: %0.3f\n", 
+        VERBOSE(VB_PLAYBACK,"%d: start_time: %0.3f duration: %0.3f",
                i, (double)st->start_time / AV_TIME_BASE, 
                (double)st->duration / AV_TIME_BASE);
         }
-        printf("stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n", 
+        VERBOSE(VB_PLAYBACK,"stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s",
                (double)ic->start_time / AV_TIME_BASE, 
                (double)ic->duration / AV_TIME_BASE,
                ic->bit_rate / 1000);