merge from 2.0-ongoing @ 3581

[ardour.git] / libs / ardour / ardour / ardour.h

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index fecd0fcf4eb3b5947481d3f99cd4d30bfb40a3df..fd873f9a6ffad4c06cfb6a2610e1d0b814af34ea 100644 (file)
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -32,6 +32,8 @@
 #include <ardour/configuration.h>
 #include <ardour/types.h>
 
+// #include <jack/jack.h> need this to inline jack_get_microseconds
+
 namespace MIDI {
        class MachineControl;
        class Port;
@@ -57,7 +59,12 @@ namespace ARDOUR {
        const layer_t max_layer = UCHAR_MAX;
 
        microseconds_t get_microseconds ();
-
+/*     {
+        JACK has exported this functionality for a long time now 
+       but inlining this causes problems
+        return (microseconds_t) jack_get_time();
+       }
+*/
        Change new_change ();
 
        extern Change StartChanged;