diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-03 23:28:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-03 23:28:57 +0000 |
| commit | a8da89d745c6a7e7d4c20dfcfb16b2537d767428 (patch) | |
| tree | 06fb6cc1795ef89a7ed847395c550b6215e253df /libs/ardour/ardour/midi_region.h | |
| parent | 5a1ca70f07aeb999ba3f0f09dbd49f1d50505f3c (diff) | |
optimize some performance bottlenecks; remove jack_nframes_t that crept back into the code
git-svn-id: svn://localhost/ardour2/branches/midi@1779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_region.h')
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 2fa39a37df..200599541e 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -50,16 +50,16 @@ class MidiRegion : public Region boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const; - jack_nframes_t read_at (MidiRingBuffer& dst, - jack_nframes_t position, - jack_nframes_t dur, + nframes_t read_at (MidiRingBuffer& dst, + nframes_t position, + nframes_t dur, uint32_t chan_n = 0, - jack_nframes_t read_frames = 0, - jack_nframes_t skip_frames = 0) const; + nframes_t read_frames = 0, + nframes_t skip_frames = 0) const; - jack_nframes_t master_read_at (MidiRingBuffer& dst, - jack_nframes_t position, - jack_nframes_t dur, + nframes_t master_read_at (MidiRingBuffer& dst, + nframes_t position, + nframes_t dur, uint32_t chan_n=0) const; XMLNode& state (bool); @@ -72,10 +72,10 @@ class MidiRegion : public Region private: friend class RegionFactory; - MidiRegion (boost::shared_ptr<MidiSource>, jack_nframes_t start, jack_nframes_t length); - MidiRegion (boost::shared_ptr<MidiSource>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); - MidiRegion (SourceList &, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); - MidiRegion (boost::shared_ptr<const MidiRegion>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + MidiRegion (boost::shared_ptr<MidiSource>, nframes_t start, nframes_t length); + MidiRegion (boost::shared_ptr<MidiSource>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + MidiRegion (SourceList &, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + MidiRegion (boost::shared_ptr<const MidiRegion>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); MidiRegion (boost::shared_ptr<const MidiRegion>); MidiRegion (boost::shared_ptr<MidiSource>, const XMLNode&); MidiRegion (SourceList &, const XMLNode&); @@ -84,12 +84,12 @@ class MidiRegion : public Region friend class Playlist; private: - jack_nframes_t _read_at (const SourceList&, MidiRingBuffer& dst, - jack_nframes_t position, - jack_nframes_t dur, + nframes_t _read_at (const SourceList&, MidiRingBuffer& dst, + nframes_t position, + nframes_t dur, uint32_t chan_n = 0, - jack_nframes_t read_frames = 0, - jack_nframes_t skip_frames = 0) const; + nframes_t read_frames = 0, + nframes_t skip_frames = 0) const; void recompute_at_start (); void recompute_at_end (); |