smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

* fixed bug: MIDI region did not sound if its position was less than its start offset

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3239 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2008-04-08 23:57:59 +00:00
parent 9228d5dc23
commit f39606f985
7 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/midi_model.h
View file

@ -72,7 +72,7 @@ public:
bool writing() const { return _writing; } bool writing() const { return _writing; }
void end_write(bool delete_stuck=false); void end_write(bool delete_stuck=false);
size_t read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset) const; size_t read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset, nframes_t negative_stamp_offset) const;
/** Resizes vector if necessary (NOT realtime safe) */ /** Resizes vector if necessary (NOT realtime safe) */
void append(const MIDI::Event& ev); void append(const MIDI::Event& ev);

4
libs/ardour/ardour/midi_source.h
View file

@ -55,7 +55,7 @@ class MidiSource : public Source
virtual uint32_t n_channels () const { return 1; } virtual uint32_t n_channels () const { return 1; }
// FIXME: integrate this with the Readable::read interface somehow // FIXME: integrate this with the Readable::read interface somehow
virtual nframes_t midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const; virtual nframes_t midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const;
virtual nframes_t midi_write (MidiRingBuffer& src, nframes_t cnt); virtual nframes_t midi_write (MidiRingBuffer& src, nframes_t cnt);
virtual void append_event_unlocked(EventTimeUnit unit, const MIDI::Event& ev) = 0; virtual void append_event_unlocked(EventTimeUnit unit, const MIDI::Event& ev) = 0;
@ -98,7 +98,7 @@ class MidiSource : public Source
virtual int flush_header() = 0; virtual int flush_header() = 0;
virtual int flush_footer() = 0; virtual int flush_footer() = 0;
virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const = 0; virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const = 0;
virtual nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt) = 0; virtual nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt) = 0;
mutable Glib::Mutex _lock; mutable Glib::Mutex _lock;

2
libs/ardour/ardour/smf_source.h
View file

@ -102,7 +102,7 @@ class SMFSource : public MidiSource {
int init (string idstr, bool must_exist); int init (string idstr, bool must_exist);
nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cn, nframes_t stamp_offset) const; nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cn, nframes_t stamp_offset, nframes_t negative_stamp_offset) const;
nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt); nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt);
bool find (std::string path, bool must_exist, bool& is_new); bool find (std::string path, bool must_exist, bool& is_new);

6
libs/ardour/midi_model.cc
View file

@ -292,9 +292,9 @@ MidiModel::MidiModel(Session& s, size_t size)
* \return number of events written to \a dst * \return number of events written to \a dst
*/ */
size_t size_t
MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset) const MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset, nframes_t negative_stamp_offset) const
{ {
cerr << this << " MM::read @ " << start << " * " << nframes << " + " << stamp_offset << endl; cerr << this << " MM::read @ " << start << " frames: " << nframes << " -> " << stamp_offset << endl;
cerr << this << " MM # notes: " << n_notes() << endl; cerr << this << " MM # notes: " << n_notes() << endl;
size_t read_events = 0; size_t read_events = 0;
@ -310,7 +310,7 @@ MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes
while (_read_iter != end() && _read_iter->time() < start + nframes) { while (_read_iter != end() && _read_iter->time() < start + nframes) {
assert(_read_iter->size() > 0); assert(_read_iter->size() > 0);
dst.write(_read_iter->time() + stamp_offset, _read_iter->size(), _read_iter->buffer()); dst.write(_read_iter->time() + stamp_offset - negative_stamp_offset, _read_iter->size(), _read_iter->buffer());
cerr << this << " MM::read event @ " << _read_iter->time() cerr << this << " MM::read event @ " << _read_iter->time()
<< " type: " << hex << int(_read_iter->type()) << dec << " type: " << hex << int(_read_iter->type()) << dec
<< " note: " << int(_read_iter->note()) << " note: " << int(_read_iter->note())

18
libs/ardour/midi_region.cc
View file

@ -131,7 +131,8 @@ MidiRegion::master_read_at (MidiRingBuffer& out, nframes_t position, nframes_t d
nframes_t nframes_t
MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
{ {
//cerr << _name << "._read_at(" << position << ") - " << _position << " duration: " << dur << endl; cerr << "reading from region " << _name << " position: " << _position << " start: " << _start << endl;
cerr << _name << "._read_at(" << position << ") - " << position << " duration: " << dur << endl;
nframes_t internal_offset = 0; nframes_t internal_offset = 0;
nframes_t src_offset = 0; nframes_t src_offset = 0;
@ -171,6 +172,17 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t pos
boost::shared_ptr<MidiSource> src = midi_source(chan_n); boost::shared_ptr<MidiSource> src = midi_source(chan_n);
src->set_note_mode(mode); src->set_note_mode(mode);
nframes_t output_buffer_position = 0;
nframes_t negative_output_buffer_position = 0;
if(_position >= _start) {
// handle resizing of beginnings of regions correctly
output_buffer_position = _position - _start;
} else {
// when _start is greater than _position, we have to subtract
// _start from the note times in the midi source
negative_output_buffer_position = _start;
}
if (src->midi_read ( if (src->midi_read (
// the destination buffer // the destination buffer
dst, dst,
@ -179,7 +191,9 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t pos
// how many bytes // how many bytes
to_read, to_read,
// the offset in the output buffer // the offset in the output buffer
_position - _start output_buffer_position,
// what to substract from note times written in the output buffer
negative_output_buffer_position
) != to_read) { ) != to_read) {
return 0; /* "read nothing" */ return 0; /* "read nothing" */
} }

6
libs/ardour/midi_source.cc
View file

@ -101,15 +101,15 @@ MidiSource::set_state (const XMLNode& node)
} }
nframes_t nframes_t
MidiSource::midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const MidiSource::midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const
{ {
Glib::Mutex::Lock lm (_lock); Glib::Mutex::Lock lm (_lock);
if (_model) { if (_model) {
const size_t n_events = _model->read(dst, start, cnt, stamp_offset); const size_t n_events = _model->read(dst, start, cnt, stamp_offset, negative_stamp_offset);
cout << "Read " << n_events << " events from model." << endl; cout << "Read " << n_events << " events from model." << endl;
return cnt; return cnt;
} else { } else {
return read_unlocked (dst, start, cnt, stamp_offset); return read_unlocked (dst, start, cnt, stamp_offset, negative_stamp_offset);
} }
} }

4
libs/ardour/smf_source.cc
View file

@ -331,7 +331,7 @@ SMFSource::read_event(uint32_t* delta_t, uint32_t* size, Byte** buf) const
/** All stamps in audio frames */ /** All stamps in audio frames */
nframes_t nframes_t
SMFSource::read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const SMFSource::read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const
{ {
cerr << "SMF read_unlocked " << name() << " read " << start << ", count=" << cnt << ", offset=" << stamp_offset << endl; cerr << "SMF read_unlocked " << name() << " read " << start << ", count=" << cnt << ", offset=" << stamp_offset << endl;
@ -377,7 +377,7 @@ SMFSource::read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, n
((time / (double)_ppqn) * frames_per_beat)) + stamp_offset; ((time / (double)_ppqn) * frames_per_beat)) + stamp_offset;
if (ev_frame_time <= start + cnt) if (ev_frame_time <= start + cnt)
dst.write(ev_frame_time, ev_size, ev_buffer); dst.write(ev_frame_time - negative_stamp_offset, ev_size, ev_buffer);
else else
break; break;
} }