Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc

Conflicts (hopefully resolved):
	gtk2_ardour/wscript
	libs/ardour/ardour/audioregion.h
	libs/ardour/ardour/debug.h
	libs/ardour/ardour/directory_names.h
	libs/ardour/ardour/filesystem_paths.h
	libs/ardour/ardour/session_event.h
	libs/gtkmm2ext/gtkmm2ext/utils.h
	libs/panners/1in2out/wscript
	libs/panners/2in2out/wscript
	libs/panners/vbap/wscript
	libs/pbd/pbd/debug.h
	libs/pbd/pbd/file_utils.h
	libs/pbd/pbd/pathexpand.h
	libs/pbd/pbd/ringbuffer.h
	libs/pbd/pbd/ringbufferNPT.h
	libs/pbd/pbd/search_path.h
	libs/pbd/pbd/stacktrace.h
	libs/pbd/pbd/uuid.h
	libs/pbd/pbd/uuid_boost.h
	libs/surfaces/control_protocol/control_protocol/basic_ui.h
	libs/surfaces/control_protocol/control_protocol/control_protocol.h
This commit is contained in:
John Emmas 2013-10-18 10:03:22 +01:00
commit b855e5f322
421 changed files with 2167 additions and 1150 deletions

View file

@ -24,25 +24,27 @@
#include <sstream>
#include "pbd/libpbd_visibility.h"
namespace PBD {
extern uint64_t debug_bits;
uint64_t new_debug_bit (const char* name);
void debug_print (const char* prefix, std::string str);
void set_debug_bits (uint64_t bits);
int parse_debug_options (const char* str);
void list_debug_options ();
LIBPBD_API extern uint64_t debug_bits;
LIBPBD_API uint64_t new_debug_bit (const char* name);
LIBPBD_API void debug_print (const char* prefix, std::string str);
LIBPBD_API void set_debug_bits (uint64_t bits);
LIBPBD_API int parse_debug_options (const char* str);
LIBPBD_API void list_debug_options ();
namespace DEBUG {
/* this namespace is so that we can write DEBUG::bit_name */
extern uint64_t Stateful;
extern uint64_t Properties;
extern uint64_t FileManager;
extern uint64_t Pool;
extern uint64_t EventLoop;
extern uint64_t AbstractUI;
LIBPBD_API extern uint64_t Stateful;
LIBPBD_API extern uint64_t Properties;
LIBPBD_API extern uint64_t FileManager;
LIBPBD_API extern uint64_t Pool;
LIBPBD_API extern uint64_t EventLoop;
LIBPBD_API extern uint64_t AbstractUI;
extern uint64_t FileUtils;
}
}