fixes for various consistency/settings issues in monitor section; minor edit to PACKA...

[ardour.git] / libs / ardour / ardour / debug.h

diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index b151c5fdeadb62b3ded5fecde7e63243285c381f..e2f3ff2c4944e25af481dd0bd6653b4e82e5a274 100644 (file)
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -20,35 +20,33 @@
 #ifndef __ardour_debug_h__
 #define __ardour_debug_h__
 
-#include <sstream>
+#include <stdint.h>
 
-namespace ARDOUR {
+#include <sstream>
 
-       extern uint64_t debug_bits;
-       void debug_print (std::string str);
-       void set_debug_bits (uint64_t bits);
+#include "pbd/debug.h"
 
+namespace PBD {
        namespace DEBUG {
-
-               /* this namespace is so that we can write DEBUG::bit_name */
-
-               enum DebugBits {
-                       MidiSourceIO = 0x1,
-                       MidiPlaylistIO = 0x2
-               };
+                extern uint64_t MidiSourceIO;
+                extern uint64_t MidiPlaylistIO;
+                extern uint64_t MidiDiskstreamIO;
+                extern uint64_t SnapBBT;
+                extern uint64_t Configuration;
+                extern uint64_t Latency;
+                extern uint64_t Processors;
+                extern uint64_t Graph;
+                extern uint64_t Destruction;
+                extern uint64_t MTC;
+                extern uint64_t Transport;
+                extern uint64_t Slave;
+                extern uint64_t SessionEvents;
+                extern uint64_t MidiIO;
+                extern uint64_t MackieControl;
+                extern uint64_t MidiClock;
+                extern uint64_t Monitor;
        }
-
 }
 
-#ifndef NDEBUG
-#define DEBUG_TRACE(bits,str) if ((bits) & ARDOUR::debug_bits) { ARDOUR::debug_print (str); }
-#define DEBUG_STR_SET(id,s) std::stringstream __debug_str ## id; __debug_str ## id << s;
-#define DEBUG_STR(id) __debug_str ## id
-#else
-#define DEBUG_TRACE(bits,fmt,...) /*empty*/
-#define DEBUG_STR_SET(a,b) /* empty */
-#define DEBUG_STR(a) /* empty */
-#endif
-
 #endif /* __ardour_debug_h__ */