From d95f3e089619d35873acdad4b79e3f7e0f6ccf15 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 8 Jan 2011 15:28:48 +0000
Subject: Fix configuration header define names to not stomp on global
 namespace.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2794 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/OSCClientReceiver.cpp |  2 +-
 src/engine/OSCEngineReceiver.cpp |  2 +-
 src/engine/internals/Note.cpp    | 20 ++++++++++----------
 src/engine/internals/Trigger.cpp |  2 +-
 src/shared/OSCSender.cpp         |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index 134a939d..bbf4f882 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -39,7 +39,7 @@ OSCClientReceiver::OSCClientReceiver(int listen_port, SharedPtr<Shared::ClientIn
 	, _listen_port(listen_port)
 	, _st(NULL)
 {
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	start(true);
 #else
 	start(false); // true = dump, false = shutup
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 6074fdca..c4eca6db 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -76,7 +76,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
 		free(lo_url);
 	}
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	lo_server_add_method(_server, NULL, NULL, generic_cb, NULL);
 #endif
 
diff --git a/src/engine/internals/Note.cpp b/src/engine/internals/Note.cpp
index d6a473c4..c00c2a3c 100644
--- a/src/engine/internals/Note.cpp
+++ b/src/engine/internals/Note.cpp
@@ -147,7 +147,7 @@ NoteNode::process(ProcessContext& context)
 	for (midi_in->rewind(); midi_in->get_event(&frames, &subframes, &type, &size, &buf);
 			midi_in->increment()) {
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 		LOG(debug) << "EVENT TYPE " << type << " @ " << frames << "." << subframes << ": ";
 		for (uint16_t i = 0; i < size; ++i)
 			debug << (int)((char)buf[i]) << " ";
@@ -216,7 +216,7 @@ NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, F
 	uint32_t voice_num = 0;
 
 	if (key->state != Key::OFF) {
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 		LOG(debug) << "Double midi note received" << endl;
 #endif
 		return;
@@ -247,7 +247,7 @@ NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, F
 	assert(voice != NULL);
 	assert(voice == &(*_voices)[voice_num]);
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	LOG(debug) << "Note " << (int)note_num << " on @ " << time
 		<< ". Voice " << voice_num << " / " << _polyphony << endl;
 #endif
@@ -257,7 +257,7 @@ NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, F
 		assert(_keys[voice->note].state == Key::ON_ASSIGNED);
 		assert(_keys[voice->note].voice == voice_num);
 		_keys[voice->note].state = Key::Key::ON_UNASSIGNED;
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 		LOG(debug) << "Stole voice " << voice_num << endl;
 #endif
 	}
@@ -302,7 +302,7 @@ NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
 
 	Key* key = &_keys[note_num];
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	debug << "Note " << (int)note_num << " off @ " << time << endl;
 #endif
 
@@ -312,19 +312,19 @@ NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
 			assert((*_voices)[key->voice].note == note_num);
 
 			if ( ! _sustain) {
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 				debug << "Free voice " << key->voice << endl;
 #endif
 				free_voice(context, key->voice, time);
 			} else {
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 				debug << "Hold voice " << key->voice << endl;
 #endif
 				(*_voices)[key->voice].state = Voice::HOLDING;
 			}
 
 		} else {
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 			debug << "WARNING: Assigned key, but voice not active" << endl;
 #endif
 		}
@@ -366,7 +366,7 @@ NoteNode::free_voice(ProcessContext& context, uint32_t voice, FrameTime time)
 		(*_voices)[voice].state = Voice::ACTIVE;
 	} else {
 		// No new note for voice, deactivate (set gate low)
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 		LOG(debug) << "Note off: key " << (*_voices)[voice].note << " voice " << voice << endl;
 #endif
 		((AudioBuffer*)_gate_port->buffer(voice).get())->set_value(0.0f, context.start(), time);
@@ -380,7 +380,7 @@ NoteNode::all_notes_off(ProcessContext& context, FrameTime time)
 {
 	assert(time >= context.start() && time <= context.end());
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	LOG(debug) << "All notes off @ " << time << endl;
 #endif
 
diff --git a/src/engine/internals/Trigger.cpp b/src/engine/internals/Trigger.cpp
index 33a138c3..7461ec3a 100644
--- a/src/engine/internals/Trigger.cpp
+++ b/src/engine/internals/Trigger.cpp
@@ -143,7 +143,7 @@ TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity
 		_learning = false;
 	}
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	LOG(debug) << path() << " note " << (int)note_num << " on @ " << time << endl;
 #endif
 
diff --git a/src/shared/OSCSender.cpp b/src/shared/OSCSender.cpp
index 73113daa..bbe4c03e 100644
--- a/src/shared/OSCSender.cpp
+++ b/src/shared/OSCSender.cpp
@@ -84,7 +84,7 @@ OSCSender::send(const char *path, const char *types, ...)
 	if (!_enabled)
 		return 0;
 
-#ifdef LOG_DEBUG
+#ifdef RAUL_LOG_DEBUG
 	info << "[OSCSender] " << path << " (" << types << ")" << endl;
 #endif
 
-- 
cgit v1.2.1