X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.h;h=781ef35036917ef28d8555fd1f3f904642431484;hb=95bb346926e237b903059c83a70e58ed9253eaca;hp=29ad2f78213c55dc6a5d9c9a26010682462d4a2b;hpb=ded4a143db069785aa33eeb6dc9da02770e3ae8e;p=ardour.git

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 29ad2f7821..781ef35036 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -149,6 +149,9 @@ class MidiRegionView : public RegionView
 	 */
 	void alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch);
 
+	void move_program_change (PCEvent, double);
+	void delete_program_change (ArdourCanvas::CanvasProgramChange *);
+
 	/** Alter a given program to the new given one.
 	 * (Called on context menu select on CanvasProgramChange)
 	 */
@@ -180,11 +183,11 @@ class MidiRegionView : public RegionView
 
 	void display_model(boost::shared_ptr<ARDOUR::MidiModel> 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<NoteType> 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<NoteType> note, bool selected, bool show_velocity = false);
+	void note_diff_remove_note (ArdourCanvas::CanvasNoteEvent* ev);
 
 	void apply_diff();
 	void apply_diff_as_subcommand();
@@ -223,8 +226,8 @@ class MidiRegionView : public RegionView
 	 */
 	void begin_resizing(bool at_front);
 
-	void update_resizing (ArdourCanvas::CanvasNote *, bool, double, bool);
-	void commit_resizing (ArdourCanvas::CanvasNote *, bool, double, bool);
+	void update_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool);
+	void commit_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool);
 
 	/** Change the channel of the selection.
 	 * @param channel - the channel number of the new channel, zero-based
@@ -282,6 +285,9 @@ class MidiRegionView : public RegionView
 	void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false);
 
 	void enable_display (bool);
+
+	void trim_front_starting ();
+	void trim_front_ending ();
         
   protected:
 	/** Allows derived types to specify their visibility requirements
@@ -317,7 +323,6 @@ class MidiRegionView : public RegionView
 	bool play_midi_note_off(boost::shared_ptr<NoteType> note);
 
 	void clear_events();
-	void switch_source(boost::shared_ptr<ARDOUR::Source> src);
 
 	bool canvas_event(GdkEvent* ev);
 	bool note_canvas_event(GdkEvent* ev);
@@ -361,7 +366,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;
@@ -374,6 +379,11 @@ class MidiRegionView : public RegionView
         Evoral::MusicalTime                  _step_edit_cursor_width;
         Evoral::MusicalTime                  _step_edit_cursor_position;
 
+	/** A group used to temporarily reparent _note_group to during start trims, so
+	 *  that the notes don't move with the parent region view.
+	 */
+	ArdourCanvas::Group*                 _temporary_note_group;
+
 	MouseState _mouse_state;
 	int _pressed_button;
 
@@ -396,14 +406,14 @@ class MidiRegionView : public RegionView
 
 	std::vector<NoteResizeData *> _resize_data;
 
-	/* connection used to connect to model's ContentChanged signal */
+	/** connection used to connect to model's ContentChanged signal */
 	PBD::ScopedConnection content_connection;
 
 	ArdourCanvas::CanvasNoteEvent* find_canvas_note (boost::shared_ptr<NoteType>);
 	Events::iterator _optimization_iterator;
 
 	void update_note (ArdourCanvas::CanvasNote*);
-	void update_hit (ArdourCanvas::CanvasHit*);
+	double update_hit (ArdourCanvas::CanvasHit *);
 	void create_ghost_note (double, double);
 	void update_ghost_note (double, double);
 
@@ -433,6 +443,16 @@ class MidiRegionView : public RegionView
 
 	void display_program_changes_on_channel (uint8_t);
 
+	void connect_to_diskstream ();
+	void data_recorded (boost::shared_ptr<ARDOUR::MidiBuffer>, boost::weak_ptr<ARDOUR::MidiSource>);
+
+	void remove_ghost_note ();
+	void mouse_mode_changed ();
+	double _last_event_x;
+	double _last_event_y;
+
+	PBD::ScopedConnection _mouse_mode_connection;
+
         Gdk::Cursor* pre_enter_cursor;
 };