More debug removal. Also fix ghost note position on non-zero-start regions (#4337).
authorCarl Hetherington <carl@carlh.net>
Wed, 28 Sep 2011 00:47:37 +0000 (00:47 +0000)
committerCarl Hetherington <carl@carlh.net>
Wed, 28 Sep 2011 00:47:37 +0000 (00:47 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@10152 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/midi_region_view.cc

index 995a8d194fe931aea1e2bfaaf8aff0ab51506711..958fa885d51e39d588b42b984d25fcf8f5daf17e 100644 (file)
@@ -1562,8 +1562,6 @@ MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions)
                ev->property_x2() = trackview.editor().frame_to_pixel (_region->length());
        }
 
-       cerr << ev->property_x2() << endl;
-
        ev->property_y2() = y1 + floor(midi_stream_view()->note_height());
 
        if (note->length() == 0) {
@@ -3332,9 +3330,9 @@ MidiRegionView::update_ghost_note (double x, double y)
        double length = region_frames_to_region_beats (snap_frame_to_frame (f + grid_frames) - f);
 
        /* note that this sets the time of the ghost note in beats relative to
-          the start of the region.
+          the start of the source; that is how all note times are stored.
        */
-       _ghost_note->note()->set_time (region_frames_to_region_beats (f));
+       _ghost_note->note()->set_time (absolute_frames_to_source_beats (f + _region->position ()));
        _ghost_note->note()->set_length (length);
        _ghost_note->note()->set_note (midi_stream_view()->y_to_note (y));
        _ghost_note->note()->set_channel (mtv->get_channel_for_add ());