ardour/livetrax
13
0
Fork 0
Code

Shrink exposed SMF API.

Browse Source 
Fix warning.


git-svn-id: svn://localhost/ardour2/branches/3.0@4507 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-09 21:11:32 +00:00
parent b0f94c111b
commit 03fe04cc2a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/midi_diskstream.cc
View File

@ -1489,13 +1489,13 @@ MidiDiskstream::get_playback(MidiBuffer& dst, nframes_t start, nframes_t end, nf
MidiBuffer::iterator this_cycle_start = dst.end();
// Translates stamps to be relative to start, but add offset.
const size_t events_read = _playback_buf->read(dst, start, end, offset);
gint32 frames_read = end - start;
/*cout << "frames read = " << frames_read << " events read = " << events_read
/*const size_t events_read = _playback_buf->read(dst, start, end, offset);
cout << "frames read = " << frames_read << " events read = " << events_read
<< " end = " << end << " start = " << start << " offset = " << offset
<< " readspace " << _playback_buf->read_space()
<< " writespace " << _playback_buf->write_space() << endl;*/
gint32 frames_read = end - start;
g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read);
// Feed the data through the MidiStateTracker

5
libs/evoral/evoral/SMF.hpp
View File

@ -56,6 +56,9 @@ protected:
int open(const std::string& path);
void close();
int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const;
private:
/** Used by flush_footer() to find the position to write the footer */
void seek_to_footer_position();
@ -66,9 +69,7 @@ protected:
void write_chunk(const char id[4], uint32_t length, void* data);
size_t write_var_len(uint32_t val);
uint32_t read_var_len() const;
int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const;
private:
static const uint16_t _ppqn = 19200;
FILE* _fd;