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_midi.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_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 2ce3310f47..c5efb1f3f8 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -270,7 +270,7 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc) return; } - nframes_t target_frame; + framepos_t target_frame; Timecode::Time timecode; timecode.hours = mmc_tc[0] & 0xf; @@ -283,8 +283,8 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc) // Also takes timecode offset into account: timecode_to_sample( timecode, target_frame, true /* use_offset */, false /* use_subframes */ ); - if (target_frame > max_frames) { - target_frame = max_frames; + if (target_frame > max_framepos) { + target_frame = max_framepos; } /* Some (all?) MTC/MMC devices do not send a full MTC frame |