X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.h;h=afe2f4a97da934dffd622ec786082eca2dcd7d68;hb=eed6d13b60ccba041ad710798832efa86ae39d12;hp=7329c6facc02c3b18379acf35b48bb63fa275a8b;hpb=91a34c596d1bb72f33ccaa17d6ebfa3a435f629c;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 7329c6facc..afe2f4a97d 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -122,7 +122,7 @@ 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); @@ -223,8 +223,8 @@ public: */ void begin_resizing(bool at_front); - void update_resizing (NoteBase*, bool, double, bool, double); - void commit_resizing (NoteBase*, bool, double, bool, double); + 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,27 +250,18 @@ public: /** Snap a region relative pixel coordinate to pixel units. * @param x a pixel coordinate relative to region start + * @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); - - /** Snap a region relative pixel coordinate to pixel units explicitly (no magnetic snap). - * @param x a pixel coordinate relative to region start - * @return the explicitly snapped pixel coordinate relative to region start - */ - double snap_to_pixel_no_magnets (double x); + 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 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); - - /** Explicitly snap a region relative pixel coordinate to frame units (no magnetic snap). - * @param x a pixel coordinate relative to region start - * @return the explicitly snapped framepos_t coordinate relative to region start - */ - framepos_t snap_pixel_to_sample_no_magnets (double x); + 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; @@ -318,7 +309,7 @@ public: Selection selection () const { return _selection; } - + void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false); void enable_display (bool); @@ -337,10 +328,18 @@ public: */ void create_note_at (framepos_t t, double y, Evoral::Beats length, bool snap_t); - void clear_selection (bool signal = true) { clear_selection_except (0, signal); } + /** An external request to clear the note selection, remove MRV from editor + * selection. + */ + void clear_selection (); + + 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&); @@ -356,19 +355,6 @@ 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 EditNoteDialog; /** Play the NoteOn event of the given note immediately @@ -378,7 +364,13 @@ 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); @@ -396,13 +388,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; @@ -410,7 +403,7 @@ 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; @@ -480,9 +473,6 @@ private: 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; @@ -511,6 +501,7 @@ private: void mouse_mode_changed (); void enter_internal (); void leave_internal (); + void hide_verbose_cursor (); framecnt_t _last_display_zoom; @@ -518,11 +509,12 @@ private: double _last_event_y; bool _grabbed_keyboard; bool _entered; + bool _note_entered; bool _mouse_changed_selection; framepos_t snap_frame_to_grid_underneath (framepos_t p, framecnt_t &) const; - + PBD::ScopedConnection _mouse_mode_connection; boost::shared_ptr _press_cursor_ctx;