diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
| commit | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (patch) | |
| tree | 5e6fd6a2e69e972ada31018cbe6761e5ec5c77a7 /libs/ardour/ardour/slave.h | |
| parent | e84c3fe5552bc5cf2ed23812c41e7e3b19fbdb84 (diff) | |
megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/slave.h')
| -rw-r--r-- | libs/ardour/ardour/slave.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index d2b0e49c45..111564cc23 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -249,13 +249,13 @@ class MTC_Slave : public Slave { static const int frame_tolerance; SafeTime current; - nframes_t mtc_frame; /* current time */ - nframes_t last_inbound_frame; /* when we got it; audio clocked */ + framepos_t mtc_frame; /* current time */ + framepos_t last_inbound_frame; /* when we got it; audio clocked */ MIDI::byte last_mtc_fps_byte; - nframes64_t window_begin; - nframes64_t window_end; - nframes64_t last_mtc_timestamp; - nframes64_t last_mtc_frame; + framepos_t window_begin; + framepos_t window_end; + framepos_t last_mtc_timestamp; + framepos_t last_mtc_frame; bool did_reset_tc_format; TimecodeFormat saved_tc_format; size_t speed_accumulator_size; |