summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/midi_source.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-08-23 04:30:57 +0000
committerDavid Robillard <d@drobilla.net>2006-08-23 04:30:57 +0000
commitea71de278461b2bc0240515b82bb56ef68f5eee3 (patch)
treecbc615b5f4aa0d01f2d479abc214f6798fd67862 /libs/ardour/ardour/midi_source.h
parent50baf0382f1f98793dff151bd0a940a4d140d6c0 (diff)
- Fixes for some recording bugs
- Working MIDI playback - Various SMF fixes - Loading of MIDI containing sessions w/o clobbering .mid files - Varispeed MIDI fixes (still no reverse though) - Fix for crazy rec-region sizes - Throttled MIDI diskstream flush based on time passed (related to rec-region fix) - Fixed playback of MIDI regions not positioned at origin (time stamp translation) - Commented/removed old debug print statements (though some still remain) git-svn-id: svn://localhost/ardour2/branches/midi@844 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_source.h')
-rw-r--r--libs/ardour/ardour/midi_source.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index f1ede9c842..757e33f70e 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -46,8 +46,8 @@ class MidiSource : public Source
MidiSource (string name);
MidiSource (const XMLNode&);
virtual ~MidiSource ();
-
- virtual jack_nframes_t read (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cnt) const;
+
+ virtual jack_nframes_t read (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cnt, jack_nframes_t stamp_offset) const;
virtual jack_nframes_t write (MidiRingBuffer& src, jack_nframes_t cnt);
virtual void mark_for_remove() = 0;
@@ -70,7 +70,7 @@ class MidiSource : public Source
int set_state (const XMLNode&);
protected:
- virtual jack_nframes_t read_unlocked (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cnt) const = 0;
+ virtual jack_nframes_t read_unlocked (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cnt, jack_nframes_t stamp_offset) const = 0;
virtual jack_nframes_t write_unlocked (MidiRingBuffer& dst, jack_nframes_t cnt) = 0;
mutable Glib::Mutex _lock;