various work waveview amplitude mgmt; fix playhead cursor drag from timebar click

[ardour.git] / gtk2_ardour / midi_region_view.cc

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index ed1708a7a9048f28b0cbef43ad0209df0203b298..08211b6e840da2a2059b1fba834e9e67a1f0913d 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -530,7 +530,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
                                        group->canvas_to_item (event_x, event_y);
 
                                        bool success;
-                                       Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
+                                       Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_sample (event_x));
 
                                        if (!success) {
                                                beats = 1;
@@ -541,7 +541,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
                                        */
                                        beats -= 1.0 / Timecode::BBT_Time::ticks_per_beat;
 
-                                       create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true);
+                                       create_note_at (editor.pixel_to_sample (event_x), event_y, beats, true);
                                }
 
                                break;
@@ -549,7 +549,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
                case MouseDraw:
                        {
                                bool success;
-                               Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
+                               Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_sample (event_x));
 
                                if (!success) {
                                        beats = 1;
@@ -560,7 +560,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
                                */
                                beats -= 1.0 / Timecode::BBT_Time::ticks_per_beat;
                                
-                               create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true);
+                               create_note_at (editor.pixel_to_sample (event_x), event_y, beats, true);
 
                                break;
                        }
@@ -1118,6 +1118,8 @@ MidiRegionView::redisplay_model()
        MidiModel::Notes& notes (_model->notes());
        _optimization_iterator = _events.begin();
 
+       bool empty_when_starting = !_events.empty();
+
        for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
 
                boost::shared_ptr<NoteType> note (*n);
@@ -1126,7 +1128,7 @@ MidiRegionView::redisplay_model()
 
                if (note_in_region_range (note, visible)) {
 
-                       if ((cne = find_canvas_note (note)) != 0) {
+                       if (empty_when_starting && (cne = find_canvas_note (note)) != 0) {
 
                                cne->validate ();
 
@@ -1152,7 +1154,7 @@ MidiRegionView::redisplay_model()
 
                } else {
 
-                       if ((cne = find_canvas_note (note)) != 0) {
+                       if (empty_when_starting && (cne = find_canvas_note (note)) != 0) {
                                cne->validate ();
                                cne->hide ();
                        }
@@ -1162,21 +1164,23 @@ MidiRegionView::redisplay_model()
 
        /* remove note items that are no longer valid */
 
-       for (Events::iterator i = _events.begin(); i != _events.end(); ) {
-               if (!(*i)->valid ()) {
-
-                       for (vector<GhostRegion*>::iterator j = ghosts.begin(); j != ghosts.end(); ++j) {
-                               MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*j);
-                               if (gr) {
-                                       gr->remove_note (*i);
+       if (empty_when_starting) {
+               for (Events::iterator i = _events.begin(); i != _events.end(); ) {
+                       if (!(*i)->valid ()) {
+                               
+                               for (vector<GhostRegion*>::iterator j = ghosts.begin(); j != ghosts.end(); ++j) {
+                                       MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*j);
+                                       if (gr) {
+                                               gr->remove_note (*i);
+                                       }
                                }
+                               
+                               delete *i;
+                               i = _events.erase (i);
+                               
+                       } else {
+                               ++i;
                        }
-                       
-                       delete *i;
-                       i = _events.erase (i);
-                       
-               } else {
-                       ++i;
                }
        }
 
@@ -1290,7 +1294,7 @@ MidiRegionView::display_sysexes()
                }
                string text = str.str();
 
-               const double x = trackview.editor().frame_to_pixel(source_beats_to_region_frames(time));
+               const double x = trackview.editor().sample_to_pixel(source_beats_to_region_frames(time));
 
                double height = midi_stream_view()->contents_height();
 
@@ -1360,16 +1364,13 @@ MidiRegionView::reset_width_dependent_items (double pixel_width)
                redisplay_model();
        }
 
-// CAIROCANVAS
-#if 0
        for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
-               if ((*x)->width() >= _pixel_width) {
+               if ((*x)->canvas_item()->width() >= _pixel_width) {
                        (*x)->hide();
                } else {
                        (*x)->show();
                }
        }
-#endif
 
        move_step_edit_cursor (_step_edit_cursor_position);
        set_step_edit_cursor_width (_step_edit_cursor_width);
@@ -1387,8 +1388,8 @@ MidiRegionView::set_height (double height)
                         midi_stream_view()->highest_note(),
                         height != old_height + FUDGE);
 
-       if (name_pixbuf) {
-               name_pixbuf->raise_to_top();
+       if (name_text) {
+               name_text->raise_to_top();
        }
 
        for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
@@ -1451,7 +1452,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv)
 {
        Note* note;
 
-       double unit_position = _region->position () / frames_per_pixel;
+       double unit_position = _region->position () / samples_per_pixel;
        MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&tv);
        MidiGhostRegion* ghost;
 
@@ -1471,7 +1472,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv)
        }
 
        ghost->set_height ();
-       ghost->set_duration (_region->length() / frames_per_pixel);
+       ghost->set_duration (_region->length() / samples_per_pixel);
        ghosts.push_back (ghost);
 
        GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
@@ -1524,7 +1525,7 @@ MidiRegionView::resolve_note(uint8_t note, double end_time)
                */
                const framepos_t end_time_frames = region_beats_to_region_frames(end_time);
 
-               _active_notes[note]->set_x1 (trackview.editor().frame_to_pixel(end_time_frames));
+               _active_notes[note]->set_x1 (trackview.editor().sample_to_pixel(end_time_frames));
                _active_notes[note]->set_outline_what (0xf);
                _active_notes[note] = 0;
        }
@@ -1542,7 +1543,7 @@ MidiRegionView::extend_active_notes()
 
        for (unsigned i=0; i < 128; ++i) {
                if (_active_notes[i]) {
-                       _active_notes[i]->set_x1 (trackview.editor().frame_to_pixel(_region->length()));
+                       _active_notes[i]->set_x1 (trackview.editor().sample_to_pixel(_region->length()));
                }
        }
 }
@@ -1631,7 +1632,7 @@ void
 MidiRegionView::update_note (Note* ev, bool update_ghost_regions)
 {
        boost::shared_ptr<NoteType> note = ev->note();
-       const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (note->time()));
+       const double x = trackview.editor().sample_to_pixel (source_beats_to_region_frames (note->time()));
        const double y0 = midi_stream_view()->note_to_y(note->note());
 
        ev->set_x0 (x);
@@ -1641,9 +1642,9 @@ MidiRegionView::update_note (Note* ev, bool update_ghost_regions)
 
        if (note->length() > 0) {
                const framepos_t note_end_frames = min (source_beats_to_region_frames (note->end_time()), _region->length());
-               ev->set_x1 (trackview.editor().frame_to_pixel (note_end_frames));
+               ev->set_x1 (trackview.editor().sample_to_pixel (note_end_frames));
        } else {
-               ev->set_x1 (trackview.editor().frame_to_pixel (_region->length()));
+               ev->set_x1 (trackview.editor().sample_to_pixel (_region->length()));
        }
 
        ev->set_y1 (y0 + floor(midi_stream_view()->note_height()));
@@ -1683,7 +1684,7 @@ MidiRegionView::update_hit (Hit* ev)
        boost::shared_ptr<NoteType> note = ev->note();
 
        const framepos_t note_start_frames = source_beats_to_region_frames(note->time());
-       const double x = trackview.editor().frame_to_pixel(note_start_frames);
+       const double x = trackview.editor().sample_to_pixel(note_start_frames);
        const double diamond_size = midi_stream_view()->note_height() / 2.0;
        const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
 
@@ -1805,7 +1806,7 @@ void
 MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext, bool /*active_channel*/)
 {
        framecnt_t region_frames = source_beats_to_region_frames (patch->time());
-       const double x = trackview.editor().frame_to_pixel (region_frames);
+       const double x = trackview.editor().sample_to_pixel (region_frames);
 
        double const height = midi_stream_view()->contents_height();
 
@@ -2471,10 +2472,10 @@ MidiRegionView::note_dropped(NoteBase *, frameoffset_t dt, int8_t dnote)
  *  @return Snapped frame relative to the region position.
  */
 framepos_t
-MidiRegionView::snap_pixel_to_frame(double x)
+MidiRegionView::snap_pixel_to_sample(double x)
 {
        PublicEditor& editor (trackview.editor());
-       return snap_frame_to_frame (editor.pixel_to_frame (x));
+       return snap_frame_to_frame (editor.pixel_to_sample (x));
 }
 
 /** @param x Pixel relative to the region position.
@@ -2483,21 +2484,21 @@ MidiRegionView::snap_pixel_to_frame(double x)
 double
 MidiRegionView::snap_to_pixel(double x)
 {
-       return (double) trackview.editor().frame_to_pixel(snap_pixel_to_frame(x));
+       return (double) trackview.editor().sample_to_pixel(snap_pixel_to_sample(x));
 }
 
 double
 MidiRegionView::get_position_pixels()
 {
        framepos_t region_frame = get_position();
-       return trackview.editor().frame_to_pixel(region_frame);
+       return trackview.editor().sample_to_pixel(region_frame);
 }
 
 double
 MidiRegionView::get_end_position_pixels()
 {
        framepos_t frame = get_position() + get_duration ();
-       return trackview.editor().frame_to_pixel(frame);
+       return trackview.editor().sample_to_pixel(frame);
 }
 
 framepos_t
@@ -2553,7 +2554,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
 
                        // calculate the colors: get the color settings
                        uint32_t fill_color = UINT_RGBA_CHANGE_A(
-                               ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(),
+                               ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(),
                                128);
 
                        // make the resize preview notes more transparent and bright
@@ -2566,7 +2567,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
                                0.85));
 
                        resize_rect->set_outline_color (NoteBase::calculate_outline (
-                                                               ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get()));
+                                                               ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected()));
 
                        resize_data->resize_rect = resize_rect;
                        _resize_data.push_back(resize_data);
@@ -2618,7 +2619,7 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
                if (!cursor_set) {
                        double beats;
 
-                       beats = snap_pixel_to_frame (current_x);
+                       beats = snap_pixel_to_sample (current_x);
                        beats = region_frames_to_region_beats (beats);
 
                        double len;
@@ -2682,7 +2683,7 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_
                }
 
                /* Convert that to a frame within the source */
-               current_x = snap_pixel_to_frame (current_x) + _region->start ();
+               current_x = snap_pixel_to_sample (current_x) + _region->start ();
 
                /* and then to beats */
                current_x = region_frames_to_region_beats (current_x);
@@ -3204,9 +3205,9 @@ MidiRegionView::set_frame_color()
        }
 
        if (_selected) {
-               f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
+               f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
        } else if (high_enough_for_name) {
-               f= ARDOUR_UI::config()->canvasvar_MidiFrameBase.get();
+               f= ARDOUR_UI::config()->get_canvasvar_MidiFrameBase();
        } else {
                f = fill_color;
        }
@@ -3494,7 +3495,7 @@ MidiRegionView::update_ghost_note (double x, double y)
 
        PublicEditor& editor = trackview.editor ();
        
-       framepos_t const unsnapped_frame = editor.pixel_to_frame (x);
+       framepos_t const unsnapped_frame = editor.pixel_to_sample (x);
        framecnt_t grid_frames;
        framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames);
 
@@ -3635,7 +3636,7 @@ MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos)
        _step_edit_cursor_position = pos;
 
        if (_step_edit_cursor) {
-               double pixel = trackview.editor().frame_to_pixel (region_beats_to_region_frames (pos));
+               double pixel = trackview.editor().sample_to_pixel (region_beats_to_region_frames (pos));
                _step_edit_cursor->set_x0 (pixel);
                set_step_edit_cursor_width (_step_edit_cursor_width);
        }
@@ -3655,7 +3656,7 @@ MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
        _step_edit_cursor_width = beats;
 
        if (_step_edit_cursor) {
-               _step_edit_cursor->set_x1 (_step_edit_cursor->x0() + trackview.editor().frame_to_pixel (region_beats_to_region_frames (beats)));
+               _step_edit_cursor->set_x1 (_step_edit_cursor->x0() + trackview.editor().sample_to_pixel (region_beats_to_region_frames (beats)));
        }
 }
 
@@ -3820,6 +3821,7 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double
 {
        double wx, wy;
 
+       trackview.editor().verbose_cursor()->set_text (text);
        trackview.editor().get_pointer_position (wx, wy);
 
        wx += xoffset;
@@ -3827,13 +3829,17 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double
 
        /* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */
 
-       ArdourCanvas::Rect bb = trackview.editor().verbose_cursor()->item().bounding_box().get();
+       boost::optional<ArdourCanvas::Rect> bbo = trackview.editor().verbose_cursor()->item().bounding_box();
+
+       assert (bbo);
+       
+       ArdourCanvas::Rect bb = bbo.get();
 
        if ((wy + bb.y1 - bb.y0) > trackview.editor().visible_canvas_height()) {
                wy -= (bb.y1 - bb.y0) + 2 * yoffset;
        }
 
-       trackview.editor().verbose_cursor()->set (text, wx, wy);
+       trackview.editor().verbose_cursor()->set_position (wx, wy);
        trackview.editor().verbose_cursor()->show ();
 }