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, const int32_t& sub_num);
+ 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
void note_diff_add_note (const boost::shared_ptr<NoteType> 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);
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<boost::shared_ptr<NoteType> >);
+ void select_notes (std::list<Evoral::event_id_t>);
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);
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 ();
* \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, bool snap_t);
+ 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.
friend class MidiRubberbandSelectDrag;
friend class MidiVerticalSelectDrag;
+ friend class NoteDrag;
+ friend class NoteCreateDrag;
+ friend class HitCreateDrag;
+ friend class MidiGhostRegion;
friend class EditNoteDialog;
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;
uint8_t _current_range_min;
uint8_t _current_range_max;
- typedef std::list<NoteBase*> Events;
- typedef std::vector< boost::shared_ptr<PatchChange> > PatchChanges;
- typedef std::vector< boost::shared_ptr<SysEx> > SysExes;
+ typedef boost::unordered_map<boost::shared_ptr<NoteType>, NoteBase*> Events;
+ typedef boost::unordered_map<ARDOUR::MidiModel::PatchChangePtr, boost::shared_ptr<PatchChange> > PatchChanges;
+ typedef boost::unordered_map<ARDOUR::MidiModel::constSysExPtr, boost::shared_ptr<SysEx> > SysExes;
+ typedef std::vector<NoteBase*> CopyDragEvents;
ARDOUR::BeatsFramesConverter _region_relative_time_converter;
ARDOUR::BeatsFramesConverter _source_relative_time_converter;
boost::shared_ptr<ARDOUR::MidiModel> _model;
Events _events;
+ CopyDragEvents _copy_drag_events;
PatchChanges _patch_changes;
SysExes _sys_exes;
Note** _active_notes;
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
std::set< boost::shared_ptr<NoteType> > _marked_for_selection;
/** Notes that should be selected when the model is redisplayed. */
- std::set< boost::shared_ptr<NoteType> > _pending_note_selection;
+ std::set<Evoral::event_id_t> _pending_note_selection;
/** New notes (created in the current command) which should have visible velocity
* when they appear after the command is applied. */
PBD::ScopedConnection content_connection;
NoteBase* find_canvas_note (boost::shared_ptr<NoteType>);
- NoteBase* find_canvas_note (NoteType);
+ NoteBase* find_canvas_note (Evoral::event_id_t id);
Events::iterator _optimization_iterator;
+ boost::shared_ptr<PatchChange> find_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr p);
+ boost::shared_ptr<SysEx> 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);
- 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;
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;
- bool _note_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;
+ 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<CursorContext> _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;
};
projects / ardour.git / blobdiff