Add namespace qualifiers for some occurrences of 'Gtk::CheckMenuItem' (Windows alread...

[ardour.git] / gtk2_ardour / midi_streamview.cc

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 51988412916661999b68a1c56c0dd0d29dfadf23..a1e1269468ada724f5c7b2829b42bcc66293ac67 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -108,7 +108,7 @@ MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, b
        }
 
        RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
-                                                     _frames_per_pixel, region_color);
+                                                     _samples_per_pixel, region_color);
 
        region_view->init (region_color, false);
 
@@ -116,11 +116,11 @@ MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, b
 }
 
 RegionView*
-MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd, bool recording)
+MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_data, bool recording)
 {
        boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (r);
 
-       if (region == 0) {
+       if (!region) {
                return 0;
        }
 
@@ -131,13 +131,13 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
 
                        (*i)->set_valid (true);
 
-                       display_region(dynamic_cast<MidiRegionView*>(*i), wfd);
+                       display_region(dynamic_cast<MidiRegionView*>(*i), wait_for_data);
 
                        return 0;
                }
        }
 
-       MidiRegionView* region_view = dynamic_cast<MidiRegionView*> (create_region_view (r, wfd, recording));
+       MidiRegionView* region_view = dynamic_cast<MidiRegionView*> (create_region_view (r, wait_for_data, recording));
        if (region_view == 0) {
                return 0;
        }
@@ -151,7 +151,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
        }
 
        /* display events and find note range */
-       display_region (region_view, wfd);
+       display_region (region_view, wait_for_data);
 
        /* fit note range if we are importing */
        if (_trackview.session()->operation_in_progress (Operations::insert_file)) {
@@ -174,7 +174,7 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
                return;
        }
 
-       region_view->enable_display(true);
+       region_view->enable_display (true);
 
        boost::shared_ptr<MidiSource> source(region_view->midi_region()->midi_source(0));
 
@@ -191,6 +191,7 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
        region_view->display_model(source->model());
 }
 
+
 void
 MidiStreamView::display_track (boost::shared_ptr<Track> tr)
 {
@@ -285,7 +286,7 @@ MidiStreamView::draw_note_lines()
        }
 
        double y;
-       double prev_y = contents_height();
+       double prev_y = 0;
        uint32_t color;
 
        _note_lines->clear();
@@ -295,10 +296,23 @@ MidiStreamView::draw_note_lines()
                return;
        }
 
-       for (int i = lowest_note(); i <= highest_note(); ++i) {
-               y = floor(note_to_y(i));
+       /* do this is order of highest ... lowest since that matches the
+        * coordinate system in which y=0 is at the top
+        */
+
+       for (int i = highest_note(); i >= lowest_note(); --i) {
+
+               y = note_to_y (i);
+
+               /* this is the line actually corresponding to the division
+                * between notes
+                */
 
-               _note_lines->add (prev_y, 1.0, ARDOUR_UI::config()->canvasvar_PianoRollBlackOutline.get());
+               _note_lines->add (y, 1.0, ARDOUR_UI::config()->get_canvasvar_PianoRollBlackOutline());
+
+               /* now add a thicker line/bar which covers the entire vertical
+                * height of this note.
+                */
 
                switch (i % 12) {
                case 1:
@@ -306,17 +320,18 @@ MidiStreamView::draw_note_lines()
                case 6:
                case 8:
                case 10:
-                       color = ARDOUR_UI::config()->canvasvar_PianoRollBlack.get();
+                       color = ARDOUR_UI::config()->get_canvasvar_PianoRollBlack();
                        break;
                default:
-                       color = ARDOUR_UI::config()->canvasvar_PianoRollWhite.get();
+                       color = ARDOUR_UI::config()->get_canvasvar_PianoRollWhite();
                        break;
                }
 
-               if (i == highest_note()) {
-                       _note_lines->add (y, prev_y - y, color);
-               } else {
-                       _note_lines->add (y + 1.0, prev_y - y - 1.0, color);
+               double h = y - prev_y;
+               double mid = y + (h/2.0);
+                               
+               if (height > 1.0) {
+                       _note_lines->add (mid, h, color);
                }
 
                prev_y = y;
@@ -479,15 +494,15 @@ MidiStreamView::setup_rec_box ()
 
                        boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
                        framepos_t const frame_pos = mt->current_capture_start ();
-                       gdouble const xstart = _trackview.editor().frame_to_pixel (frame_pos);
+                       gdouble const xstart = _trackview.editor().sample_to_pixel (frame_pos);
                        gdouble const xend = xstart;
                        uint32_t fill_color;
 
-                       fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+                       fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
 
                        ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
                        rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->canvasvar_RecordingRect.get());
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
                        rec_rect->set_fill_color (fill_color);
                        rec_rect->lower_to_bottom();
 
@@ -560,9 +575,9 @@ MidiStreamView::color_handler ()
        draw_note_lines ();
 
        if (_trackview.is_midi_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_MidiTrackBase.get());
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MidiTrackBase());
        } else {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_MidiBusBase.get());
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MidiBusBase());
        }
 }
 
@@ -642,9 +657,11 @@ void
 MidiStreamView::resume_updates ()
 {
        _updates_suspended = false;
-
+       
        draw_note_lines ();
        apply_note_range_to_regions ();
+
+       _canvas_group->redraw ();
 }
 
 void