ardour/livetrax
13
0
Fork 0
Code

search $TOP/build/default/gtk2_ardour BEFORE ../gtk2_ardour when looking for bindings files etc ; make debug tracing show the "debug option" the output relates to as a prefix

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5915 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-10-25 20:36:10 +00:00
parent e3d162a4ad
commit cd1c58e031
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardev_common.sh.in
View File

@ -4,7 +4,7 @@ TOP=`dirname "$0"`/..
libs=$TOP/@LIBS@
export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/gtk2_ardour:$TOP/build/default/gtk2_ardour:.
export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/build/default/gtk2_ardour:$TOP/gtk2_ardour:.
export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
export ARDOUR_DATA_PATH=$TOP/gtk2_ardour:build/default/gtk2_ardour:.

6
libs/ardour/ardour/debug.h
View File

@ -20,12 +20,14 @@
#ifndef __ardour_debug_h__
#define __ardour_debug_h__
#include <stdint.h>
#include <sstream>
namespace ARDOUR {
extern uint64_t debug_bits;
void debug_print (std::string str);
void debug_print (const char* prefix, std::string str);
void set_debug_bits (uint64_t bits);
namespace DEBUG {
@ -42,7 +44,7 @@ namespace ARDOUR {
}
#ifndef NDEBUG
#define DEBUG_TRACE(bits,str) if ((bits) & ARDOUR::debug_bits) { ARDOUR::debug_print (str); }
#define DEBUG_TRACE(bits,str) if ((bits) & ARDOUR::debug_bits) { ARDOUR::debug_print (# bits, str); }
#define DEBUG_STR_SET(id,s) std::stringstream __debug_str ## id; __debug_str ## id << s;
#define DEBUG_STR(id) __debug_str ## id
#else

4
libs/ardour/globals.cc
View File

@ -112,9 +112,9 @@ mix_buffers_no_gain_t ARDOUR::mix_buffers_no_gain = 0;
sigc::signal<void,std::string> ARDOUR::BootMessage;
void
ARDOUR::debug_print (std::string str)
ARDOUR::debug_print (const char* prefix, std::string str)
{
cerr << str;
cerr << prefix << ": " << str;
}
void

11
libs/ardour/midi_region.cc
View File

@ -153,6 +153,10 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink<nframes_t>&
assert(chan_n == 0);
if (muted()) {
return 0; /* read nothing */
}
if (position < _position) {
internal_offset = 0;
src_offset = _position - position;
@ -170,13 +174,6 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink<nframes_t>&
return 0; /* read nothing */
}
// FIXME: non-opaque MIDI regions not yet supported
assert(opaque());
if (muted()) {
return 0; /* read nothing */
}
_read_data_count = 0;
boost::shared_ptr<MidiSource> src = midi_source(chan_n);