From 5c23faaa0d86b2d1b18d4f03565bad55c410fb7a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 9 Dec 2010 21:34:46 +0000 Subject: Allow trim of midi regions to before the start of the source (better, this time). Fixes #3156. git-svn-id: svn://localhost/ardour2/branches/3.0@8229 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/midi_region_view.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/midi_region_view.h') diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 88fb431805..4d1252fab4 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -180,11 +180,11 @@ class MidiRegionView : public RegionView void display_model(boost::shared_ptr model); - void start_diff_command(std::string name = "midi edit"); - void diff_add_change(ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::DiffCommand::Property, uint8_t val); - void diff_add_change(ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::DiffCommand::Property, Evoral::MusicalTime val); - void diff_add_note(const boost::shared_ptr note, bool selected, bool show_velocity=false); - void diff_remove_note(ArdourCanvas::CanvasNoteEvent* ev); + void start_note_diff_command (std::string name = "midi edit"); + void note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, uint8_t val); + void note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, Evoral::MusicalTime val); + void note_diff_add_note (const boost::shared_ptr note, bool selected, bool show_velocity = false); + void note_diff_remove_note (ArdourCanvas::CanvasNoteEvent* ev); void apply_diff(); void apply_diff_as_subcommand(); @@ -363,7 +363,7 @@ class MidiRegionView : public RegionView SysExes _sys_exes; ArdourCanvas::CanvasNote** _active_notes; ArdourCanvas::Group* _note_group; - ARDOUR::MidiModel::DiffCommand* _diff_command; + ARDOUR::MidiModel::NoteDiffCommand* _note_diff_command; ArdourCanvas::CanvasNote* _ghost_note; double _last_ghost_x; double _last_ghost_y; -- cgit v1.2.3