diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-15 14:13:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-15 14:13:47 +0000 |
| commit | 5ea9dee73b75b01e6db3a5a97c5a02493b358b00 (patch) | |
| tree | 76674e0ecbb06b87c54dd7b50e1ccf1a66ce6829 /libs/ardour/ardour | |
| parent | e313838485697033d1b7366105968d789ea4228e (diff) | |
mike taht's patch to remove all use of gettimeofday() in favor of ARDOUR::get_microseconds() which now uses JACK's usec clock
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3355 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/ardour.h | 9 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 22e79e1c12..cab4601d07 100644 --- 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; @@ -63,7 +65,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; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index ea89ab84ec..e5750e8a5b 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -889,7 +889,7 @@ class Session : public PBD::StatefulDestructible void reset_playback_load_min (); void reset_capture_load_min (); - float read_data_rate () const; + float read_data_rate () const; // in usec float write_data_rate () const; /* ranges */ |