- 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

1 files changed, 3 insertions, 2 deletions

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 31e9c2205d..5c3fdcfec9 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -70,6 +70,7 @@ class SMFSource : public MidiSource {
 
 	int update_header (jack_nframes_t when, struct tm&, time_t);
 	int flush_header ();
+	int flush_footer ();
 
 	int move_to_trash (const string trash_dir_name);
 
@@ -89,7 +90,7 @@ class SMFSource : public MidiSource {
 
 	int init (string idstr, bool must_exist);
 
-	jack_nframes_t read_unlocked (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cn) const;
+	jack_nframes_t read_unlocked (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cn, jack_nframes_t stamp_offset) const;
 	jack_nframes_t write_unlocked (MidiRingBuffer& dst, jack_nframes_t cnt);
 
 	bool find (std::string path, bool must_exist, bool& is_new);
@@ -113,7 +114,7 @@ class SMFSource : public MidiSource {
 	FILE*          _fd;
 	jack_nframes_t _last_ev_time; // last frame time written, relative to source start
 	uint32_t       _track_size;
-	uint32_t       _header_size;
+	uint32_t       _header_size; // size of SMF header, including MTrk chunk header
 
 	static string _search_path;
 };