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/audioengine.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/audioengine.cc')
| -rw-r--r-- | libs/ardour/audioengine.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index bfdd9acd26..7a3c279705 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -76,7 +76,7 @@ AudioEngine::AudioEngine (string client_name, string session_uuid) _running = false; _has_run = false; last_monitor_check = 0; - monitor_check_interval = max_frames; + monitor_check_interval = INT32_MAX; _processed_frames = 0; _usecs_per_cycle = 0; _jack = 0; @@ -463,8 +463,8 @@ AudioEngine::process_callback (nframes_t nframes) /* handle wrap around of total frames counter */ - if (max_frames - _processed_frames < nframes) { - next_processed_frames = nframes - (max_frames - _processed_frames); + if (max_framepos - _processed_frames < nframes) { + next_processed_frames = nframes - (max_framepos - _processed_frames); } else { next_processed_frames = _processed_frames + nframes; } |