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/track.cc | |
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/track.cc')
-rw-r--r-- | libs/ardour/track.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 2e7290b77a..ff1f6f78ed 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -480,9 +480,9 @@ Track::set_pending_overwrite (bool o) } int -Track::seek (nframes_t s, bool complete_refill) +Track::seek (framepos_t p, bool complete_refill) { - return _diskstream->seek (s, complete_refill); + return _diskstream->seek (p, complete_refill); } bool @@ -492,15 +492,15 @@ Track::hidden () const } int -Track::can_internal_playback_seek (nframes_t d) +Track::can_internal_playback_seek (framepos_t p) { - return _diskstream->can_internal_playback_seek (d); + return _diskstream->can_internal_playback_seek (p); } int -Track::internal_playback_seek (nframes_t d) +Track::internal_playback_seek (framepos_t p) { - return _diskstream->internal_playback_seek (d); + return _diskstream->internal_playback_seek (p); } void @@ -510,7 +510,7 @@ Track::non_realtime_input_change () } void -Track::non_realtime_locate (nframes_t p) +Track::non_realtime_locate (framepos_t p) { _diskstream->non_realtime_locate (p); } @@ -527,7 +527,7 @@ Track::overwrite_existing_buffers () return _diskstream->overwrite_existing_buffers (); } -nframes_t +framecnt_t Track::get_captured_frames (uint32_t n) { return _diskstream->get_captured_frames (n); @@ -540,9 +540,9 @@ Track::set_loop (Location* l) } void -Track::transport_looped (nframes_t f) +Track::transport_looped (framepos_t p) { - _diskstream->transport_looped (f); + _diskstream->transport_looped (p); } bool @@ -587,7 +587,7 @@ Track::n_channels () return _diskstream->n_channels (); } -nframes_t +framepos_t Track::get_capture_start_frame (uint32_t n) { return _diskstream->get_capture_start_frame (n); @@ -599,13 +599,13 @@ Track::alignment_style () const return _diskstream->alignment_style (); } -nframes_t +framepos_t Track::current_capture_start () const { return _diskstream->current_capture_start (); } -nframes_t +framepos_t Track::current_capture_end () const { return _diskstream->current_capture_end (); |