diff options
author | Taybin Rutkin <taybin@taybin.com> | 2009-12-06 04:35:48 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2009-12-06 04:35:48 +0000 |
commit | 3fdcba185980896366cc0d3d14f6dfd6bbaf1d0a (patch) | |
tree | 65226b3a1077c0949b1c72c1222a0bb9312def8d /libs/ardour/session_midi.cc | |
parent | 4a8baf26f19a2658e6de947b76a6bd843cbdae3d (diff) |
Merged revisions 6293,6296-6306,6308 via svnmerge from
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes
........
r6293 | trutkin | 2009-12-05 08:49:37 -0500 (Sat, 05 Dec 2009) | 2 lines
fix if-statement in build script
........
r6296 | trutkin | 2009-12-05 09:30:19 -0500 (Sat, 05 Dec 2009) | 5 lines
rearrange GTKOSX and darwin dependencies
- moved some GTKOSX include paths to generic darwin
- made GTKOSX dependent on being on darwin anyways
........
r6297 | trutkin | 2009-12-05 09:35:09 -0500 (Sat, 05 Dec 2009) | 2 lines
move coreaudio and audiounit handling to darwin section
........
r6298 | trutkin | 2009-12-05 09:53:40 -0500 (Sat, 05 Dec 2009) | 3 lines
use True/False instead of 1/0
fix another if-statement where it should be an elif-statement
........
r6299 | trutkin | 2009-12-05 14:11:09 -0500 (Sat, 05 Dec 2009) | 10 lines
fixes to get libardour building
- can't cast away volatile, so copy _transport_frame before emitting it.
- const_reverse_iterator::operator!=() isn't defined in this version of gcc.
- removed annoying HERE WE ARE CAAudioFile.h #warning.
- removed unnecessary include of sndfile.h in session.h.
- we don't want to set -march=i686 on the mac, so indent this if-statement so
it's only run on linux.
- DEBUG_STR() fails in the NDEBUG case, so wrap its use in an #ifndef NDEBUG
........
r6300 | trutkin | 2009-12-05 15:48:29 -0500 (Sat, 05 Dec 2009) | 2 lines
remove old scons-style CXXFLAGS_FOO in favor of just CXXFLAGS
........
r6301 | trutkin | 2009-12-05 16:01:10 -0500 (Sat, 05 Dec 2009) | 8 lines
clean up configure flags
- removed useless --aubio and --syslibs flags. The syslibs value is ignored
as we don't bring our own libraries with us anymoreand we use aubio
automatically if it's available
- added ways to turn off fpu_optimization and NLS
- fixed compiling on the mac without fpu_optimization
........
r6302 | trutkin | 2009-12-05 18:12:46 -0500 (Sat, 05 Dec 2009) | 5 lines
go back to prior uselib method for COREAUDIO, AUDIOUNIT, and GTKOSX
- fixed compile of CoreAudioSource
- re-did inclusion of coremidi_midiport.cc to depend on COREAUDIO presence
........
r6303 | trutkin | 2009-12-05 18:59:02 -0500 (Sat, 05 Dec 2009) | 5 lines
fixed compiler warnings about classes with virtual member functions, but no virtual destructor.
- Changed Metering to not use foo() = 0; to indicate it shouldn't be instantiated, but
private: Metering(), which is more idiomatic.
........
r6304 | trutkin | 2009-12-05 19:25:41 -0500 (Sat, 05 Dec 2009) | 2 lines
TOP_MENUBAR isn't used when building ardour.menus. Removed.
........
r6305 | trutkin | 2009-12-05 19:46:11 -0500 (Sat, 05 Dec 2009) | 5 lines
fix some AudioUnit compile errors
- update AudioUnit to use ChanCount
- fix some namespacing issues in audio_unit.h
........
r6306 | trutkin | 2009-12-05 20:08:48 -0500 (Sat, 05 Dec 2009) | 2 lines
make --extra-warn useful
........
r6308 | trutkin | 2009-12-05 22:59:42 -0500 (Sat, 05 Dec 2009) | 10 lines
fix compiling/linking with --coreaudio
- rearrange ardour_ui.h header in editor.cc to avoid conflict
- midi++ depends on OSX as well as COREAUDIO
- fixed including frameworks
- tweaked --extra-warn again. it's kinda redundent with --strict
- improved indentation in wscript
- use #ifdef HAVE_COREMIDI, not #if HAVE_COREMIDI. #if isn't interchangable
with #ifdef and won't work if HAVE_COREMIDI is defined with no value.
........
git-svn-id: svn://localhost/ardour2/branches/3.0@6310 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
-rw-r--r-- | libs/ardour/session_midi.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index fe332b71c2..15777aa642 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -891,10 +891,12 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes) return -1; } +#ifndef NDEBUG DEBUG_STR_SET(foo,"sending "); DEBUG_STR(foo) << transmitting_timecode_time; DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send, out_stamp)); +#endif // Increment quarter frame counter next_quarter_frame_to_send++; @@ -1252,9 +1254,11 @@ Session::midi_thread_work () for (int p = 1; p < nfds; ++p) { +#ifndef NDEBUG DEBUG_STR_SET(foo, "port #%1 revents = "); DEBUG_STR(foo) << hex << pfd[p].revents << dec << endl; DEBUG_TRACE (DEBUG::MidiIO, string_compose (DEBUG_STR(foo).str(), p)); +#endif if ((pfd[p].revents & ~POLLIN)) { // error << string_compose(_("Transport: error polling MIDI port %1 (revents =%2%3%4"), p, &hex, pfd[p].revents, &dec) << endmsg; |