X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.h;h=20a1ee5b25f85260a2cd4f3839d9e23e1860f8d8;hb=f614d10994df1e8923c70311ebc9da17a79b8b8b;hp=c79227d5a995f3b2d6f9ab8ca3932d60f1c10582;hpb=c0f89e99a26c6c7b4f172632862c4e22dfdd80cc;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index c79227d5a9..20a1ee5b25 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -126,6 +126,7 @@ public: void paste_internal (framepos_t pos, unsigned paste_count, float times, const MidiCutBuffer&); void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext, bool); + void remove_canvas_patch_change (PatchChange* pc); /** Look up the given time and channel in the 'automation' and set keys accordingly. * @param time the time of the patch change event @@ -179,7 +180,7 @@ public: void note_diff_add_note (const boost::shared_ptr note, bool selected, bool show_velocity = false); void note_diff_remove_note (NoteBase* ev); - void apply_diff (bool as_subcommand = false); + void apply_diff (bool as_subcommand = false, bool was_copy = false); void abort_command(); void note_entered(NoteBase* ev); @@ -199,10 +200,13 @@ public: void select_range(framepos_t start, framepos_t end); void invert_selection (); + Evoral::Beats earliest_in_selection (); void move_selection(double dx, double dy, double cumulative_dy); - void note_dropped (NoteBase* ev, ARDOUR::frameoffset_t, int8_t d_note); + void note_dropped (NoteBase* ev, double d_qn, int8_t d_note, bool copy); + NoteBase* copy_selection (NoteBase* primary); + void move_copies(double dx_qn, double dy, double cumulative_dy); - void select_notes (std::list >); + void select_notes (std::list); void select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend); void toggle_matching_notes (uint8_t notenum, uint16_t channel_mask); @@ -294,10 +298,12 @@ public: return _region_relative_time_converter_double; } + double session_relative_qn (double qn) const; + void goto_previous_note (bool add_to_selection); void goto_next_note (bool add_to_selection); void change_note_lengths (bool, bool, Evoral::Beats beats, bool start, bool end); - void change_velocities (bool up, bool fine, bool allow_smush, bool all_together); + void change_velocities (bool up, bool fine, bool allow_smush, bool all_together); void transpose (bool up, bool fine, bool allow_smush); void nudge_notes (bool forward, bool fine); void channel_edit (); @@ -325,8 +331,9 @@ public: * \param y vertical position in pixels * \param length duration of the note in beats * \param state the keyboard modifier mask for the canvas event (click). + * \param shift_snap true alters snap behavior to round down always (false if the gui has already done that). */ - void create_note_at (framepos_t t, double y, Evoral::Beats length, uint32_t state); + void create_note_at (framepos_t t, double y, Evoral::Beats length, uint32_t state, bool shift_snap); /** An external request to clear the note selection, remove MRV from editor * selection. @@ -354,6 +361,10 @@ private: friend class MidiRubberbandSelectDrag; friend class MidiVerticalSelectDrag; + friend class NoteDrag; + friend class NoteCreateDrag; + friend class HitCreateDrag; + friend class MidiGhostRegion; friend class EditNoteDialog; @@ -376,7 +387,7 @@ private: bool note_canvas_event(GdkEvent* ev); void midi_channel_mode_changed (); - PBD::ScopedConnection _channel_mode_changed_connection; + PBD::ScopedConnection _channel_mode_changed_connection; void instrument_settings_changed (); PBD::ScopedConnection _instrument_changed_connection; @@ -404,9 +415,10 @@ private: uint8_t _current_range_min; uint8_t _current_range_max; - typedef std::list Events; - typedef std::vector< boost::shared_ptr > PatchChanges; - typedef std::vector< boost::shared_ptr > SysExes; + typedef boost::unordered_map, NoteBase*> Events; + typedef boost::unordered_map > PatchChanges; + typedef boost::unordered_map > SysExes; + typedef std::vector CopyDragEvents; ARDOUR::BeatsFramesConverter _region_relative_time_converter; ARDOUR::BeatsFramesConverter _source_relative_time_converter; @@ -414,6 +426,7 @@ private: boost::shared_ptr _model; Events _events; + CopyDragEvents _copy_drag_events; PatchChanges _patch_changes; SysExes _sys_exes; Note** _active_notes; @@ -433,9 +446,6 @@ private: /** Currently selected NoteBase objects */ Selection _selection; - bool _sort_needed; - void time_sort_events (); - MidiCutBuffer* selection_as_cut_buffer () const; /** New notes (created in the current command) which should be selected @@ -443,7 +453,7 @@ private: std::set< boost::shared_ptr > _marked_for_selection; /** Notes that should be selected when the model is redisplayed. */ - std::set< boost::shared_ptr > _pending_note_selection; + std::set _pending_note_selection; /** New notes (created in the current command) which should have visible velocity * when they appear after the command is applied. */ @@ -455,9 +465,12 @@ private: PBD::ScopedConnection content_connection; NoteBase* find_canvas_note (boost::shared_ptr); - NoteBase* find_canvas_note (NoteType); + NoteBase* find_canvas_note (Evoral::event_id_t id); Events::iterator _optimization_iterator; + boost::shared_ptr find_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr p); + boost::shared_ptr find_canvas_sys_ex (ARDOUR::MidiModel::SysExPtr s); + void update_note (NoteBase*, bool update_ghost_regions = true); void update_sustained (Note *, bool update_ghost_regions = true); void update_hit (Hit *, bool update_ghost_regions = true); @@ -500,22 +513,32 @@ private: framecnt_t _last_display_zoom; - double _last_event_x; - double _last_event_y; - bool _grabbed_keyboard; - bool _entered; - bool _note_entered; + double _last_event_x; + double _last_event_y; + bool _grabbed_keyboard; + bool _entered; + NoteBase* _entered_note; bool _mouse_changed_selection; - Evoral::Beats snap_frame_to_grid_underneath (framepos_t p, int32_t divisions) const; + Gtkmm2ext::Color _patch_change_outline; + Gtkmm2ext::Color _patch_change_fill; + + Evoral::Beats snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, bool shift_snap) const; PBD::ScopedConnection _mouse_mode_connection; boost::shared_ptr _press_cursor_ctx; - ARDOUR::ChannelMode get_channel_mode() const; - uint16_t get_selected_channels () const; + ARDOUR::ChannelMode get_channel_mode() const; + uint16_t get_selected_channels () const; + + inline double contents_height() const { return (_height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); } + inline double contents_note_range () const { return (double)(_current_range_max - _current_range_min + 1); } + inline double note_height() const { return contents_height() / contents_note_range(); } + + double note_to_y (uint8_t note) const; + uint8_t y_to_note (double y) const; };