Remove references to connection manager from the build.

[ardour.git] / gtk2_ardour / midi_streamview.cc

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index d581e662677fa954d36c62da1e915ca51b93fad8..0d2abb04fd12329e27bbdae199b3bcdada34b871 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -67,7 +67,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
        else
                stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();
 
-       use_rec_regions = tv.editor.show_waveforms_recording ();
+       use_rec_regions = tv.editor().show_waveforms_recording ();
 
        /* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
        midi_underlay_group = new ArdourCanvas::Group (*canvas_group);
@@ -75,14 +75,14 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 
        /* put the note lines in the timeaxisview's group, so it 
           can be put below ghost regions from MIDI underlays*/
-       _note_lines = new ArdourCanvas::Lineset(*canvas_group, ArdourCanvas::Lineset::Horizontal);
+       _note_lines = new ArdourCanvas::LineSet(*canvas_group, ArdourCanvas::LineSet::Horizontal);
 
        _note_lines->property_x1() = 0;
        _note_lines->property_y1() = 0;
-       _note_lines->property_x2() = trackview().editor.frame_to_pixel (max_frames);
+       _note_lines->property_x2() = trackview().editor().frame_to_pixel (max_frames);
        _note_lines->property_y2() = 0;
 
-       _note_lines->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), _note_lines, &_trackview));
+       _note_lines->signal_event().connect (bind (mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), _note_lines, &_trackview));
        _note_lines->lower_to_bottom();
 
        ColorsChanged.connect(mem_fun(*this, &MidiStreamView::draw_note_lines));
@@ -177,8 +177,9 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
 
        boost::shared_ptr<MidiSource> source(region_view->midi_region()->midi_source(0));
 
-       if (load_model)
+       if (load_model) {
                source->load_model();
+       }
 
        _range_dirty = update_data_note_range(
                        source->model()->lowest_note(),
@@ -457,7 +458,7 @@ MidiStreamView::setup_rec_box ()
                        boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
                        boost::shared_ptr<MidiDiskstream> ds = mt->midi_diskstream();
                        jack_nframes_t frame_pos = ds->current_capture_start ();
-                       gdouble xstart = _trackview.editor.frame_to_pixel (frame_pos);
+                       gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos);
                        gdouble xend;
                        uint32_t fill_color;
 
@@ -595,7 +596,7 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t
 
                                                /* also update rect */
                                                ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
-                                               gdouble xend = _trackview.editor.frame_to_pixel (region->position() + region->length());
+                                               gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
                                                rect->property_x2() = xend;
 
                                                /* draw events */
@@ -604,7 +605,7 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t
 
                                                        // FIXME: slooooooooow!
 
-                                                       const boost::shared_ptr<Evoral::Note> note = data->note_at(i);
+                                                       const boost::shared_ptr<MidiRegionView::NoteType> note = data->note_at(i);
                                                        
                                                        if (note->length() > 0 && note->end_time() + region->position() > start)
                                                                mrv->resolve_note(note->note(), note->end_time());