diff options
| -rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/debug.h | 6 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/midi_region.cc | 11 |
4 files changed, 11 insertions, 12 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index afa842e4f5..9fb72fb57f 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -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:. diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h index afaf7c221a..bc0fefb428 100644 --- a/libs/ardour/ardour/debug.h +++ b/libs/ardour/ardour/debug.h @@ -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 diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 6cd6d0ea16..73b390b64a 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -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 diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index b95f35f726..b06f18c1aa 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -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); |