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

Fixed MIDI crash bug.

Browse source 
Added some asserts to gtkmm2ext that hopefully may catch a bug I might have possibly seen once or twice, probably.
Fixed uninitialized value in time_axis_view.cc.


git-svn-id: svn://localhost/ardour2/trunk@1958 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-06-07 02:07:49 +00:00
parent ca40990444
commit 9091ba932d
8 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libs/ardour/smf_source.cc
View file

@ -259,6 +259,7 @@ SMFSource::read_event(MidiEvent& ev) const
}
uint32_t delta_time = read_var_len();
assert(!feof(_fd));
int status = fgetc(_fd);
assert(status != EOF); // FIXME die gracefully
if (status == 0xFF) {
@ -273,11 +274,15 @@ SMFSource::read_event(MidiEvent& ev) const
return 0;
}
}
ev.time = delta_time;
ev.size = midi_event_size((unsigned char)status) + 1;
if (ev.buffer == NULL)
ev.buffer = (Byte*)malloc(sizeof(Byte) * ev.size);
ev.buffer[0] = (unsigned char)status;
ev.size = midi_event_size(ev.buffer[0]) + 1;
fread(ev.buffer+1, 1, ev.size - 1, _fd);
ev.time = delta_time;
/*printf("SMF - read event, delta = %u, size = %zu, data = ",
delta_time, ev.size);
@ -393,7 +398,7 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
const nframes_t oldlen = _length;
update_length(oldlen, cnt);
_model.append(buf);
_model->append(buf);
ViewDataRangeReady (buf_ptr, oldlen, cnt); /* EMIT SIGNAL */
@ -777,8 +782,9 @@ SMFSource::load_model(bool lock)
if (lock)
Glib::Mutex::Lock lm (_lock);
_model.clear();
destroy_model();
_model = new MidiModel();
fseek(_fd, _header_size, 0);
nframes_t time = 0;
@ -789,14 +795,17 @@ SMFSource::load_model(bool lock)
time += ev.time;
ev.time = time;
if (ret > 0) { // didn't skip (meta) event
_model.append(ev);
cerr << "ADDING EVENT TO MODEL: " << ev.time << endl;
_model->append(ev);
}
}
}
void
SMFSource::destroy_model()
{
_model.clear();
delete _model;
_model = NULL;
}