resolve merge with master (?)

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

diff --git a/libs/pbd/pbd/debug.h b/libs/pbd/pbd/debug.h
index a45a867bd2d9b0a28c2debc2f99606269947a0e3..704c9d0dadd2c680f26a30faa7f13110b0b5e0c9 100644 (file)
--- a/libs/pbd/pbd/debug.h
+++ b/libs/pbd/pbd/debug.h
@@ -39,6 +39,11 @@ namespace PBD {
                 
                 extern uint64_t Stateful;
                 extern uint64_t Properties;
+               extern uint64_t FileManager;
+               extern uint64_t Pool;
+               extern uint64_t EventLoop;
+               extern uint64_t AbstractUI;
+               extern uint64_t FileUtils;
        }
 }
 
@@ -47,10 +52,12 @@ namespace PBD {
 #define DEBUG_STR_DECL(id) std::stringstream __debug_str ## id;
 #define DEBUG_STR(id) __debug_str ## id
 #define DEBUG_STR_APPEND(id,s) __debug_str ## id << s;
+#define DEBUG_ENABLED(bits) ((bits) & PBD::debug_bits)
 #else
 #define DEBUG_TRACE(bits,fmt,...) /*empty*/
 #define DEBUG_STR(a) /* empty */
 #define DEBUG_STR_APPEND(a,b) /* empty */
+#define DEBUG_ENABLED(b) (0)
 #endif
 
 #endif /* __libpbd_debug_h__ */