From d95f3e089619d35873acdad4b79e3f7e0f6ccf15 Mon Sep 17 00:00:00 2001 From: David Robillard 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 +- wscript | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) 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, SharedPtrrewind(); 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 diff --git a/wscript b/wscript index c1ad7422..e79e44db 100644 --- a/wscript +++ b/wscript @@ -84,7 +84,7 @@ def configure(conf): build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1 autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION) - autowaf.define(conf, 'BUILD_INGEN_GUI', int(build_gui)) + autowaf.define(conf, 'INGEN_BUILD_GUI', int(build_gui)) autowaf.define(conf, 'HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1)) if conf.env['BUNDLE']: autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIRNAME'], 'ingen')) @@ -94,7 +94,7 @@ def configure(conf): autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIR']) if Options.options.log_debug: - autowaf.define(conf, 'LOG_DEBUG', 1) + autowaf.define(conf, 'RAUL_LOG_DEBUG', 1) if Options.options.liblo_bundles: autowaf.define(conf, 'LIBLO_BUNDLES', 1) @@ -106,7 +106,7 @@ def configure(conf): autowaf.display_msg(conf, "HTTP", str(conf.env['HAVE_SOUP'] == 1)) autowaf.display_msg(conf, "LV2", str(conf.env['HAVE_SLV2'] == 1)) autowaf.display_msg(conf, "LADSPA", str(conf.env['HAVE_LADSPA_H'] == 1)) - autowaf.display_msg(conf, "GUI", str(conf.env['BUILD_INGEN_GUI'] == 1)) + autowaf.display_msg(conf, "GUI", str(conf.env['INGEN_BUILD_GUI'] == 1)) print def build(bld): @@ -125,7 +125,7 @@ def build(bld): bld.add_subdirs('src/shared') bld.add_subdirs('src/client') - if bld.env['BUILD_INGEN_GUI']: + if bld.env['INGEN_BUILD_GUI']: bld.add_subdirs('src/gui') # Program -- cgit v1.2.1