X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsmf_source.cc;h=686fb96af3e9c409dadb04e8e45a1729135541a0;hb=874f3bbf8b4b8bb3e92f31c96623b1bcb4dd5c8a;hp=0bc02f39981e1a208a8c0d9b35144bcb90c4bacd;hpb=7852cc219cddcc86f747fed6616195f5a7642041;p=ardour.git

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 0bc02f3998..686fb96af3 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -137,7 +137,7 @@ SMFSource::init (string pathstr, bool must_exist)
 int
 SMFSource::open()
 {
-	cerr << "Opening SMF file " << path() << " writeable: " << writable() << endl;
+	//cerr << "Opening SMF file " << path() << " writeable: " << writable() << endl;
 
 	assert(writable()); // FIXME;
 
@@ -149,7 +149,7 @@ SMFSource::open()
 		uint32_t track_size_be = 0;
 		fread(&track_size_be, 4, 1, _fd);
 		_track_size = GUINT32_FROM_BE(track_size_be);
-		cerr << "SMF - read track size " << _track_size << endl;
+		//cerr << "SMF - read track size " << _track_size << endl;
 
 	// We're making a new file
 	} else {
@@ -176,7 +176,7 @@ SMFSource::flush_header ()
 {
 	// FIXME: write timeline position somehow?
 	
-	cerr << "SMF Flushing header\n";
+	//cerr << "SMF Flushing header\n";
 
 	assert(_fd);
 
@@ -205,7 +205,7 @@ SMFSource::flush_header ()
 int
 SMFSource::flush_footer()
 {
-	cerr << "SMF - Writing EOT\n";
+	//cerr << "SMF - Writing EOT\n";
 
 	fseek(_fd, 0, SEEK_END);
 	write_var_len(1); // whatever...
@@ -250,7 +250,7 @@ SMFSource::find_first_event_after(nframes_t start)
  * skipped (eg a meta event), or -1 on EOF (or end of track).
  */
 int
-SMFSource::read_event(MidiEvent& ev) const
+SMFSource::read_event(jack_midi_event_t& ev) const
 {
 	// - 4 is for the EOT event, which we don't actually want to read
 	//if (feof(_fd) || ftell(_fd) >= _header_size + _track_size - 4) {
@@ -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,21 @@ SMFSource::read_event(MidiEvent& ev) const
 			return 0;
 		}
 	}
+	
+	size_t event_size = midi_event_size((unsigned char)status) + 1;
+	
+	// Make sure we have enough scratch buffer
+	if (ev.size < event_size)
+		ev.buffer = (Byte*)realloc(ev.buffer, event_size);
+	
+	ev.time = delta_time;
+	ev.size = event_size;
+
+	/*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);
@@ -300,15 +311,14 @@ SMFSource::read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, n
 
 	_read_data_count = 0;
 
-	// FIXME: ugh
-	unsigned char ev_buf[MidiBuffer::max_event_size()];
-	MidiEvent ev;
+	jack_midi_event_t ev; // time in SMF ticks
 	ev.time = 0;
-	ev.size = MidiBuffer::max_event_size();
-	ev.buffer = ev_buf;
+	ev.size = 0;
+	ev.buffer = NULL; // read_event will allocate scratch as needed
 
-	// FIXME: it would be an impressive feat to actually make this any slower :)
-	
+	size_t scratch_size = 0; // keep track of scratch and minimize reallocs
+
+	// FIXME: don't seek to start every read
 	fseek(_fd, _header_size, 0);
 	
 	// FIXME: assumes tempo never changes after start
@@ -344,6 +354,11 @@ SMFSource::read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, n
 		}
 
 		_read_data_count += ev.size;
+
+		if (ev.size > scratch_size)
+			scratch_size = ev.size;
+		else
+			ev.size = scratch_size;
 	}
 	
 	return cnt;
@@ -365,12 +380,12 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
 	const double frames_per_beat = _session.tempo_map().tempo_at(_timeline_position).frames_per_beat(
 			_session.engine().frame_rate());
 	
-	for (size_t i=0; i < buf.size(); ++i) {
-		MidiEvent& ev = buf[i];
-		assert(ev.time >= _timeline_position);
-		ev.time -= _timeline_position;
-		assert(ev.time >= _last_ev_time);
-		const uint32_t delta_time = (uint32_t)(ev.time - _last_ev_time) / frames_per_beat * _ppqn;
+	for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
+		MidiEvent& ev = *i;
+		assert(ev.time() >= _timeline_position);
+		ev.time() -= _timeline_position;
+		assert(ev.time() >= _last_ev_time);
+		const uint32_t delta_time = (uint32_t)((ev.time() - _last_ev_time) / frames_per_beat * _ppqn);
 		
 		/*printf("SMF - writing event, delta = %u, size = %zu, data = ",
 			delta_time, ev.size);
@@ -380,12 +395,12 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
 		printf("\n");
 		*/
 		size_t stamp_size = write_var_len(delta_time);
-		fwrite(ev.buffer, 1, ev.size, _fd);
+		fwrite(ev.buffer(), 1, ev.size(), _fd);
 
-		_track_size += stamp_size + ev.size;
-		_write_data_count += ev.size;
+		_track_size += stamp_size + ev.size();
+		_write_data_count += ev.size();
 		
-		_last_ev_time = ev.time;
+		_last_ev_time = ev.time();
 	}
 
 	fflush(_fd);
@@ -393,7 +408,12 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
 	const nframes_t oldlen = _length;
 	update_length(oldlen, cnt);
 
-	_model.append(buf);
+	if (_model) {
+		if ( ! _model->currently_writing()) {
+			_model->start_write();
+		}
+		_model->append(buf);
+	}
 
 	ViewDataRangeReady (buf_ptr, oldlen, cnt); /* EMIT SIGNAL */
 	
@@ -448,6 +468,8 @@ SMFSource::mark_for_remove ()
 void
 SMFSource::mark_streaming_write_completed ()
 {
+	MidiSource::mark_streaming_write_completed();
+
 	if (!writable()) {
 		return;
 	}
@@ -675,7 +697,7 @@ SMFSource::set_allow_remove_if_empty (bool yn)
 }
 
 int
-SMFSource::set_name (string newname, bool destructive)
+SMFSource::set_source_name (string newname, bool destructive)
 {
 	//Glib::Mutex::Lock lm (_lock); FIXME
 	string oldpath = _path;
@@ -772,31 +794,70 @@ SMFSource::read_var_len() const
 }
 
 void
-SMFSource::load_model(bool lock)
+SMFSource::load_model(bool lock, bool force_reload)
 {
+	if (_writing)
+		return;
+
 	if (lock)
 		Glib::Mutex::Lock lm (_lock);
 
-	_model.clear();
-	
+	if (_model && _model_loaded && ! force_reload) {
+		assert(_model);
+		return;
+	}
+
+	if (! _model) {
+		_model = boost::shared_ptr<MidiModel>(new MidiModel(_session));
+	} else {
+		cerr << "SMFSource: Reloading model." << endl;
+		_model->clear();
+	}
+
+	_model->start_write();
+
 	fseek(_fd, _header_size, 0);
 
-	double    time = 0;
-	MidiEvent ev;
+	uint64_t time = 0; /* in SMF ticks */
+	jack_midi_event_t ev;
+	ev.time = 0;
+	ev.size = 0;
+	ev.buffer = NULL;
+	
+	size_t scratch_size = 0; // keep track of scratch and minimize reallocs
+	
+	// FIXME: assumes tempo never changes after start
+	const double frames_per_beat = _session.tempo_map().tempo_at(_timeline_position).frames_per_beat(
+			_session.engine().frame_rate());
 	
 	int ret;
 	while ((ret = read_event(ev)) >= 0) {
+		
 		time += ev.time;
-		ev.time = time;
+		
+		const double ev_time = (double)(time * frames_per_beat / (double)_ppqn); // in frames
+
 		if (ret > 0) { // didn't skip (meta) event
-			_model.append(ev);
+			_model->append(ev_time, ev.size, ev.buffer);
 		}
+
+		if (ev.size > scratch_size)
+			scratch_size = ev.size;
+		else
+			ev.size = scratch_size;
 	}
+	
+	_model->end_write(false); /* FIXME: delete stuck notes iff percussion? */
+
+	free(ev.buffer);
+
+	_model_loaded = true;
 }
 
+
 void
 SMFSource::destroy_model()
 {
-	_model.clear();
+	_model.reset();
 }