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/session_process.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/session_process.cc')
-rw-r--r-- | libs/ardour/session_process.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 596f656fbc..342ae5c8a8 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -233,11 +233,11 @@ Session::get_track_statistics () void Session::process_with_events (nframes_t nframes) { - SessionEvent* ev; + SessionEvent* ev; nframes_t this_nframes; - nframes_t end_frame; + framepos_t end_frame; bool session_needs_butler = false; - nframes_t stop_limit; + framepos_t stop_limit; framecnt_t frames_moved; /* make sure the auditioner is silent */ @@ -316,13 +316,13 @@ Session::process_with_events (nframes_t nframes) } if (actively_recording()) { - stop_limit = max_frames; + stop_limit = max_framepos; } else { if (Config->get_stop_at_session_end()) { stop_limit = current_end_frame(); } else { - stop_limit = max_frames; + stop_limit = max_framepos; } } @@ -722,16 +722,16 @@ Session::follow_slave_silently (nframes_t nframes, float slave_speed) } else { increment_transport_position (frames_moved); } - - nframes_t stop_limit; + + framepos_t stop_limit; if (actively_recording()) { - stop_limit = max_frames; + stop_limit = max_framepos; } else { if (Config->get_stop_at_session_end()) { stop_limit = current_end_frame(); } else { - stop_limit = max_frames; + stop_limit = max_framepos; } } @@ -743,7 +743,7 @@ void Session::process_without_events (nframes_t nframes) { bool session_needs_butler = false; - nframes_t stop_limit; + framepos_t stop_limit; framecnt_t frames_moved; if (!process_can_proceed()) { @@ -767,12 +767,12 @@ Session::process_without_events (nframes_t nframes) } if (actively_recording()) { - stop_limit = max_frames; + stop_limit = max_framepos; } else { if (Config->get_stop_at_session_end()) { stop_limit = current_end_frame(); } else { - stop_limit = max_frames; + stop_limit = max_framepos; } } |