class MidiCutBuffer;
class MidiListEditor;
class EditNoteDialog;
-class NotePlayer;
class PatchChange;
class ItemCounts;
class CursorContext;
class MidiRegionView : public RegionView
{
public:
- typedef Evoral::Note<Evoral::MusicalTime> NoteType;
- typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes;
+ typedef Evoral::Note<Evoral::Beats> NoteType;
+ typedef Evoral::Sequence<Evoral::Beats>::Notes Notes;
MidiRegionView (ArdourCanvas::Container* parent,
RouteTimeAxisView& tv,
{ return midi_view()->midi_view(); }
void step_add_note (uint8_t channel, uint8_t number, uint8_t velocity,
- Evoral::MusicalTime pos, Evoral::MusicalTime len);
- void step_sustain (Evoral::MusicalTime beats);
+ Evoral::Beats pos, Evoral::Beats len);
+ void step_sustain (Evoral::Beats beats);
void set_height (double);
void apply_note_range(uint8_t lowest, uint8_t highest, bool force=false);
uint32_t get_fill_color() const;
void color_handler ();
- void show_step_edit_cursor (Evoral::MusicalTime pos);
- void move_step_edit_cursor (Evoral::MusicalTime pos);
+ void show_step_edit_cursor (Evoral::Beats pos);
+ void move_step_edit_cursor (Evoral::Beats pos);
void hide_step_edit_cursor ();
- void set_step_edit_cursor_width (Evoral::MusicalTime beats);
+ void set_step_edit_cursor_width (Evoral::Beats beats);
void redisplay_model();
GhostRegion* add_ghost (TimeAxisView&);
- void add_note(const boost::shared_ptr<NoteType> note, bool visible);
- void resolve_note(uint8_t note_num, Evoral::MusicalTime end_time);
+ NoteBase* add_note(const boost::shared_ptr<NoteType> note, bool visible);
+ 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);
* @key a reference to an instance of MIDI::Name::PatchPrimaryKey whose fields will
* will be set according to the result of the lookup
*/
- void get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const;
+ void get_patch_key_at (Evoral::Beats time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const;
/** Convert a given PatchChange into a PatchPrimaryKey
*/
* @param new_patch new patch
*/
void change_patch_change (PatchChange& old_patch, const MIDI::Name::PatchPrimaryKey& new_patch);
- void change_patch_change (ARDOUR::MidiModel::PatchChangePtr, Evoral::PatchChange<Evoral::MusicalTime> const &);
+ void change_patch_change (ARDOUR::MidiModel::PatchChangePtr, Evoral::PatchChange<Evoral::Beats> const &);
- void add_patch_change (framecnt_t, Evoral::PatchChange<Evoral::MusicalTime> const &);
- void move_patch_change (PatchChange &, Evoral::MusicalTime);
+ void add_patch_change (framecnt_t, Evoral::PatchChange<Evoral::Beats> const &);
+ void move_patch_change (PatchChange &, Evoral::Beats);
void delete_patch_change (PatchChange *);
void edit_patch_change (PatchChange *);
void start_note_diff_command (std::string name = "midi edit");
void note_diff_add_change (NoteBase* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, uint8_t val);
- void note_diff_add_change (NoteBase* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, Evoral::MusicalTime val);
+ void note_diff_add_change (NoteBase* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, Evoral::Beats val);
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 move_selection(double dx, double dy, double cumulative_dy);
void note_dropped (NoteBase* ev, ARDOUR::frameoffset_t, int8_t d_note);
+ 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);
*/
void begin_resizing(bool at_front);
- void update_resizing (NoteBase*, bool, double, bool);
- void commit_resizing (NoteBase*, bool, double, bool);
+ 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.
MouseState mouse_state() const { return _mouse_state; }
- void note_button_release ();
-
struct NoteResizeData {
Note *note;
ArdourCanvas::Rectangle *resize_rect;
/** 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);
+ 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);
+ 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::MusicalTime beats) const;
+ framepos_t region_beats_to_region_frames(Evoral::Beats beats) const;
/** Convert a timestamp in beats into absolute frames */
- framepos_t region_beats_to_absolute_frames(Evoral::MusicalTime beats) const {
+ framepos_t region_beats_to_absolute_frames(Evoral::Beats beats) const {
return _region->position() + region_beats_to_region_frames (beats);
}
/** Convert a timestamp in frames to beats (both relative to region position) */
- Evoral::MusicalTime region_frames_to_region_beats(framepos_t) const;
+ Evoral::Beats region_frames_to_region_beats(framepos_t) const;
+ double region_frames_to_region_beats_double(framepos_t) const;
/** Convert a timestamp in beats measured from source start into absolute frames */
- framepos_t source_beats_to_absolute_frames(Evoral::MusicalTime beats) const;
+ framepos_t source_beats_to_absolute_frames(Evoral::Beats beats) const;
/** Convert a timestamp in beats measured from source start into region-relative frames */
- framepos_t source_beats_to_region_frames(Evoral::MusicalTime beats) const {
+ framepos_t source_beats_to_region_frames(Evoral::Beats beats) const {
return source_beats_to_absolute_frames (beats) - _region->position();
}
/** Convert a timestamp in absolute frames to beats measured from source start*/
- Evoral::MusicalTime absolute_frames_to_source_beats(framepos_t) const;
+ Evoral::Beats absolute_frames_to_source_beats(framepos_t) const;
ARDOUR::BeatsFramesConverter const & region_relative_time_converter () const {
return _region_relative_time_converter;
return _source_relative_time_converter;
}
+ ARDOUR::DoubleBeatsFramesConverter const & region_relative_time_converter_double () const {
+ return _region_relative_time_converter_double;
+ }
+
void goto_previous_note (bool add_to_selection);
void goto_next_note (bool add_to_selection);
- void change_note_lengths (bool, bool, Evoral::MusicalTime beats, bool start, bool end);
+ 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 transpose (bool up, bool fine, bool allow_smush);
void nudge_notes (bool forward, bool fine);
Selection selection () const {
return _selection;
}
-
+
void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false);
void enable_display (bool);
* \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::MusicalTime 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.
+ */
+ void clear_selection ();
+
+ ARDOUR::InstrumentInfo& instrument_info() const;
- void clear_selection (bool signal = true) { clear_selection_except (0, signal); }
+ void note_deleted (NoteBase*);
+
+ void show_verbose_cursor_for_new_note_value(boost::shared_ptr<NoteType> current_note,
+ uint8_t new_note) const;
- ARDOUR::InstrumentInfo& instrument_info() const;
-
protected:
void region_resized (const PBD::PropertyChange&);
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<void, MidiRegionView*> 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 NoteCreateDrag;
+ friend class HitCreateDrag;
friend class EditNoteDialog;
void start_playing_midi_note (boost::shared_ptr<NoteType> note);
void start_playing_midi_chord (std::vector<boost::shared_ptr<NoteType> > 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 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<NoteType> note, uint8_t note_value) const;
+
void show_verbose_cursor (std::string const &, double, double) const;
void show_verbose_cursor (boost::shared_ptr<NoteType>) const;
+ uint8_t get_velocity_for_add (ARDOUR::MidiModel::TimeType time) const;
+
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;
ARDOUR::BeatsFramesConverter _region_relative_time_converter;
ARDOUR::BeatsFramesConverter _source_relative_time_converter;
+ ARDOUR::DoubleBeatsFramesConverter _region_relative_time_converter_double;
boost::shared_ptr<ARDOUR::MidiModel> _model;
Events _events;
Note** _active_notes;
ArdourCanvas::Container* _note_group;
ARDOUR::MidiModel::NoteDiffCommand* _note_diff_command;
- Note* _ghost_note;
+ NoteBase* _ghost_note;
double _last_ghost_x;
double _last_ghost_y;
ArdourCanvas::Rectangle* _step_edit_cursor;
- Evoral::MusicalTime _step_edit_cursor_width;
- Evoral::MusicalTime _step_edit_cursor_position;
+ Evoral::Beats _step_edit_cursor_width;
+ 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;
* when they appear after the command is applied. */
std::set< boost::shared_ptr<NoteType> > _marked_for_selection;
+ /** Notes that should be selected when the model is redisplayed. */
+ 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. */
std::set< boost::shared_ptr<NoteType> > _marked_for_velocity;
PBD::ScopedConnection content_connection;
NoteBase* find_canvas_note (boost::shared_ptr<NoteType>);
+ NoteBase* find_canvas_note (Evoral::event_id_t id);
Events::iterator _optimization_iterator;
- void update_note (Note *, bool update_ghost_regions = true);
- void update_hit (Hit *);
- void create_ghost_note (double, double);
- void update_ghost_note (double, double);
+ 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, 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;
void drop_down_keys ();
void maybe_select_by_position (GdkEventButton* ev, double x, double y);
- void get_events (Events& e, Evoral::Sequence<Evoral::MusicalTime>::NoteOperator op, uint8_t val, int chan_mask = 0);
+ void get_events (Events& e, Evoral::Sequence<Evoral::Beats>::NoteOperator op, uint8_t val, int chan_mask = 0);
void display_patch_changes_on_channel (uint8_t, bool);
void data_recorded (boost::weak_ptr<ARDOUR::MidiSource>);
/** Get grid type as beats, or default to 1 if not snapped to beats. */
- Evoral::MusicalTime get_grid_beats(framepos_t pos) const;
+ Evoral::Beats get_grid_beats(framepos_t pos) const;
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;
+
+ Evoral::Beats snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, bool shift_snap) const;
- framepos_t snap_frame_to_grid_underneath (framepos_t p, framecnt_t &) const;
-
PBD::ScopedConnection _mouse_mode_connection;
boost::shared_ptr<CursorContext> _press_cursor_ctx;
- NotePlayer* _note_player;
-
ARDOUR::ChannelMode get_channel_mode() const;
uint16_t get_selected_channels () const;
};
projects / ardour.git / blobdiff