Make SMFSource suck significantly less.

[ardour.git] / gtk2_ardour / midi_streamview.cc

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index c81cce65d6753777dda3ae3a4baf08042f7d6e94..21eae23f908020e9a028bf97e5df13652563efa8 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -240,7 +240,6 @@ MidiStreamView::draw_note_separators()
                        _note_lines[i]->property_y1() = note_to_y(i);
                        _note_lines[i]->property_y2() = note_to_y(i);
                        _note_lines[i]->show();
-                       _note_lines[i]->raise_to_top();
                } else {
                        _note_lines[i]->hide();
                }
@@ -411,7 +410,7 @@ MidiStreamView::setup_rec_box ()
 }
 
 void
-MidiStreamView::update_rec_regions (boost::shared_ptr<MidiBuffer> data, nframes_t start, nframes_t dur)
+MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t start, nframes_t dur)
 {
        ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur));
 
@@ -468,11 +467,24 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiBuffer> data, nframes_
 
                                                /* draw events */
                                                MidiRegionView* mrv = (MidiRegionView*)iter->second;
-                                               for (MidiBuffer::iterator i = data->begin(); i != data->end(); ++i) {
-                                                       const MidiEvent& ev = *i;
-                                                       mrv->add_event(ev);
-                                                       mrv->extend_active_notes();
+                                               // FIXME: slow
+                                               for (size_t i=0; i < data->n_notes(); ++i) {
+                                                       const MidiModel::Note& note = data->note_at(i);
+                                                       if (note.time() > start + dur)
+                                                               break;
+
+                                                       if (note.time() >= start)
+                                                               if (data->note_mode() == Percussive || note.duration() > 0)
+                                                                       mrv->add_note(note);
+                                                               else
+                                                                       mrv->add_event(note.on_event());
+
+                                                       if (note.duration() > 0 && note.end_time() >= start)
+                                                               mrv->add_event(note.off_event());
+
                                                }
+                                               
+                                               mrv->extend_active_notes();
 
                                        }
                                }
@@ -509,18 +521,18 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiBuffer> data, nframes_
 }
 
 void
-MidiStreamView::rec_data_range_ready (boost::shared_ptr<MidiBuffer> data, jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<Source> weak_src)
+MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<Source> weak_src)
 {
        // this is called from the butler thread for now
        
-       ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), data, start, dur, weak_src));
+       ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), start, dur, weak_src));
        
        boost::shared_ptr<SMFSource> src (boost::dynamic_pointer_cast<SMFSource>(weak_src.lock()));
        
        //cerr << src.get() << " MIDI READY: " << start << " * " << dur
        //      << " -- " << data->size() << " events!" << endl;
        
-       this->update_rec_regions (data, start, dur);
+       this->update_rec_regions (src->model(), start, dur);
 }
 
 void