X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.h;h=635307d4dd7d71345e54b87f66ccad38dad5329a;hb=b04f89be519b6c3257cbe5707992b514771bce63;hp=9c39fa157609ceae95f0e1dc4572ba0f17a67459;hpb=784abd03e0d0d5ff38dbe2c97c8cce157c39e1d1;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 9c39fa1576..635307d4dd 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -122,10 +122,11 @@ public: void resolve_note(uint8_t note_num, Evoral::Beats end_time); void cut_copy_clear (Editing::CutCopyOp); - bool paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx); + bool paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t sub_num); 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); @@ -200,9 +201,11 @@ public: void invert_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, ARDOUR::frameoffset_t, int8_t d_note, bool copy); + NoteBase* copy_selection (); + void move_copies(double dx, 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); @@ -223,8 +226,8 @@ public: */ void begin_resizing(bool at_front); - void update_resizing (NoteBase*, bool, double, bool, double, guint); - void commit_resizing (NoteBase*, bool, double, bool, double, guint); + void update_resizing (NoteBase* primary, bool at_front, double delta_x, bool relative, double snap_delta, bool with_snap); + void commit_resizing (NoteBase* primary, bool at_front, double delat_x, bool relative, double snap_delta, bool with_snap); void abort_resizing (); /** Change the channel of the selection. @@ -250,17 +253,18 @@ public: /** Snap a region relative pixel coordinate to pixel units. * @param x a pixel coordinate relative to region start - * @param explicitly do not use magnetic snap (required for snap delta calculation) + * @param ensure_snap do not use magnetic snap (required for snap delta calculation) * @return the snapped pixel coordinate relative to region start */ - double snap_to_pixel(double x, bool explicitly = false); + double snap_to_pixel(double x, bool ensure_snap = false); /** Snap a region relative pixel coordinate to frame units. * @param x a pixel coordinate relative to region start - * @param explicitly do not use magnetic snap (required for snap delta calculation) + * @param ensure_snap ignore SnapOff and magnetic snap. + * Required for inverting snap logic with modifier keys and snap delta calculation. * @return the snapped framepos_t coordinate relative to region start */ - framepos_t snap_pixel_to_sample(double x, bool explicitly = false); + framepos_t snap_pixel_to_sample(double x, bool ensure_snap = false); /** Convert a timestamp in beats into frames (both relative to region position) */ framepos_t region_beats_to_region_frames(Evoral::Beats beats) const; @@ -308,7 +312,7 @@ public: Selection selection () const { return _selection; } - + void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false); void enable_display (bool); @@ -323,14 +327,23 @@ public: * \param t time in frames relative to the position of the region * \param y vertical position in pixels * \param length duration of the note in beats - * \param snap_t true to snap t to the grid, otherwise false. + * \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, bool shift_snap); + + /** An external request to clear the note selection, remove MRV from editor + * selection. */ - void create_note_at (framepos_t t, double y, Evoral::Beats length, bool snap_t); + void clear_selection (); - void clear_selection (bool signal = true) { clear_selection_except (0, signal); } + ARDOUR::InstrumentInfo& instrument_info() const; + + void note_deleted (NoteBase*); + + void show_verbose_cursor_for_new_note_value(boost::shared_ptr current_note, + uint8_t new_note) const; - ARDOUR::InstrumentInfo& instrument_info() const; - protected: void region_resized (const PBD::PropertyChange&); @@ -345,19 +358,10 @@ private: friend class MidiRubberbandSelectDrag; friend class MidiVerticalSelectDrag; - - /** Emitted when the selection has been cleared in one MidiRegionView, - * with the expectation that others will clear their selections in - * sympathy. - */ - static PBD::Signal1 SelectionCleared; - PBD::ScopedConnection _selection_cleared_connection; - void selection_cleared (MidiRegionView *); - - /** this handles the case when the "external" world wants us to clear our internal selections - */ - PBD::ScopedConnection _clear_midi_selection_connection; - void clear_midi_selection () { clear_selection(); } + friend class NoteDrag; + friend class NoteCreateDrag; + friend class HitCreateDrag; + friend class MidiGhostRegion; friend class EditNoteDialog; @@ -368,13 +372,19 @@ private: void start_playing_midi_note (boost::shared_ptr note); void start_playing_midi_chord (std::vector > notes); - void clear_events (bool with_selection_signal = true); + /** Clear the note selection of just this midi region + */ + void clear_selection_internal (); + + void clear_editor_note_selection (); + + void clear_events (); bool canvas_group_event(GdkEvent* ev); 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; @@ -386,13 +396,14 @@ private: void trim_note(NoteBase* ev, ARDOUR::MidiModel::TimeType start_delta, ARDOUR::MidiModel::TimeType end_delta); - void clear_selection_except (NoteBase* ev, bool signal = true); void update_drag_selection (framepos_t start, framepos_t end, double y0, double y1, bool extend); void update_vertical_drag_selection (double last_y, double y, bool extend); void add_to_selection (NoteBase*); void remove_from_selection (NoteBase*); + std::string get_note_name (boost::shared_ptr note, uint8_t note_value) const; + void show_verbose_cursor (std::string const &, double, double) const; void show_verbose_cursor (boost::shared_ptr) const; @@ -400,10 +411,11 @@ 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 std::vector< boost::shared_ptr > SysExes; + typedef std::vector CopyDragEvents; ARDOUR::BeatsFramesConverter _region_relative_time_converter; ARDOUR::BeatsFramesConverter _source_relative_time_converter; @@ -411,6 +423,7 @@ private: boost::shared_ptr _model; Events _events; + CopyDragEvents _copy_drag_events; PatchChanges _patch_changes; SysExes _sys_exes; Note** _active_notes; @@ -424,20 +437,12 @@ private: Evoral::Beats _step_edit_cursor_position; NoteBase* _channel_selection_scoped_note; - /** 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::Container* _temporary_note_group; - MouseState _mouse_state; int _pressed_button; /** 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 @@ -445,7 +450,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. */ @@ -457,22 +462,21 @@ 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); + 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); - void create_ghost_note (double, double); - void update_ghost_note (double, double); + void create_ghost_note (double, double, uint32_t state); + void update_ghost_note (double, double, uint32_t state); MidiListEditor* _list_editor; bool _no_sound_notes; - PBD::ScopedConnection note_delete_connection; - void maybe_remove_deleted_note_from_selection (NoteBase*); - void snap_changed (); PBD::ScopedConnection snap_changed_connection; @@ -499,26 +503,38 @@ private: void remove_ghost_note (); void mouse_mode_changed (); - void enter_internal (); + void enter_internal (uint32_t state); void leave_internal (); + void hide_verbose_cursor (); framecnt_t _last_display_zoom; - double _last_event_x; - double _last_event_y; - bool _grabbed_keyboard; - bool _entered; + double _last_event_x; + double _last_event_y; + bool _grabbed_keyboard; + bool _entered; + NoteBase* _entered_note; bool _mouse_changed_selection; - framepos_t snap_frame_to_grid_underneath (framepos_t p, framecnt_t &) const; - + ArdourCanvas::Color _patch_change_outline; + ArdourCanvas::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; };