X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.h;h=afe2f4a97da934dffd622ec786082eca2dcd7d68;hb=727613b4b744658b6a32916a82af2717cd54c11d;hp=219d07f37615cf482900cbfb4294b2ba1fa734c7;hpb=b550a6e85bdb43e342f4955f4e16ffbc47fb06cb;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 219d07f376..afe2f4a97d 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -21,13 +21,7 @@ #include #include - -#ifdef interface -#undef interface -#endif - -#include -#include +#include #include "pbd/signals.h" @@ -40,12 +34,6 @@ #include "time_axis_view_item.h" #include "automation_line.h" #include "enums.h" -#include "canvas.h" -#include "canvas-hit.h" -#include "canvas-note.h" -#include "canvas-note-event.h" -#include "canvas_patch_change.h" -#include "canvas-sysex.h" namespace ARDOUR { class MidiRegion; @@ -59,6 +47,10 @@ namespace MIDI { }; }; +class SysEx; +class NoteBase; +class Note; +class Hit; class MidiTimeAxisView; class GhostRegion; class AutomationTimeAxisView; @@ -66,26 +58,37 @@ class AutomationRegionView; class MidiCutBuffer; class MidiListEditor; class EditNoteDialog; -class NotePlayer; +class PatchChange; +class ItemCounts; +class CursorContext; class MidiRegionView : public RegionView { public: - typedef Evoral::Note NoteType; - typedef Evoral::Sequence::Notes Notes; + typedef Evoral::Note NoteType; + typedef Evoral::Sequence::Notes Notes; + + MidiRegionView (ArdourCanvas::Container* parent, + RouteTimeAxisView& tv, + boost::shared_ptr r, + double samples_per_pixel, + uint32_t basic_color); + + MidiRegionView (ArdourCanvas::Container* parent, + RouteTimeAxisView& tv, + boost::shared_ptr r, + double samples_per_pixel, + uint32_t basic_color, + bool recording, + Visibility visibility); - MidiRegionView (ArdourCanvas::Group *, - RouteTimeAxisView&, - boost::shared_ptr, - double initial_samples_per_unit, - Gdk::Color const & basic_color); MidiRegionView (const MidiRegionView& other); MidiRegionView (const MidiRegionView& other, boost::shared_ptr); ~MidiRegionView (); - virtual void init (Gdk::Color const & basic_color, bool wfd); + void init (bool wfd); const boost::shared_ptr midi_region() const; @@ -96,30 +99,31 @@ public: { 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); inline ARDOUR::ColorMode color_mode() const { return midi_view()->color_mode(); } - void set_frame_color(); + 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 note, bool visible); - void resolve_note(uint8_t note_num, double end_time); + NoteBase* add_note(const boost::shared_ptr note, bool visible); + void resolve_note(uint8_t note_num, Evoral::Beats end_time); void cut_copy_clear (Editing::CutCopyOp); - void paste (framepos_t pos, float times, const MidiCutBuffer&); + 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); @@ -129,7 +133,7 @@ public: * @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 (double 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 */ @@ -139,26 +143,21 @@ public: * @param old_patch the canvas patch change which is to be altered * @param new_patch new patch */ - void change_patch_change (ArdourCanvas::CanvasPatchChange& old_patch, const MIDI::Name::PatchPrimaryKey& new_patch); - void change_patch_change (ARDOUR::MidiModel::PatchChangePtr, Evoral::PatchChange const &); - - void add_patch_change (framecnt_t, Evoral::PatchChange const &); - void move_patch_change (ArdourCanvas::CanvasPatchChange &, Evoral::MusicalTime); - void delete_patch_change (ArdourCanvas::CanvasPatchChange *); - void edit_patch_change (ArdourCanvas::CanvasPatchChange *); + void change_patch_change (PatchChange& old_patch, const MIDI::Name::PatchPrimaryKey& new_patch); + void change_patch_change (ARDOUR::MidiModel::PatchChangePtr, Evoral::PatchChange const &); - void delete_sysex (ArdourCanvas::CanvasSysEx*); + void add_patch_change (framecnt_t, Evoral::PatchChange const &); + void move_patch_change (PatchChange &, Evoral::Beats); + void delete_patch_change (PatchChange *); + void edit_patch_change (PatchChange *); - /** Alter a given patch to be its predecessor in the MIDNAM file. - */ - void previous_patch (ArdourCanvas::CanvasPatchChange &); + void delete_sysex (SysEx*); - /** Alters a given patch to be its successor in the MIDNAM file. + /** Change a patch to the next or previous bank/program. + * @param bank If true, step bank, otherwise, step program. + * @param delta Amount to adjust number. */ - void next_patch (ArdourCanvas::CanvasPatchChange &); - - void previous_bank (ArdourCanvas::CanvasPatchChange &); - void next_bank (ArdourCanvas::CanvasPatchChange &); + void step_patch (PatchChange& patch, bool bank, int delta); /** Displays all patch change events in the region as flags on the canvas. */ @@ -175,24 +174,24 @@ public: void display_model(boost::shared_ptr model); void start_note_diff_command (std::string name = "midi edit"); - void note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, uint8_t val); - void note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, Evoral::MusicalTime val); + 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::Beats val); void note_diff_add_note (const boost::shared_ptr note, bool selected, bool show_velocity = false); - void note_diff_remove_note (ArdourCanvas::CanvasNoteEvent* ev); + void note_diff_remove_note (NoteBase* ev); void apply_diff (bool as_subcommand = false); void abort_command(); - void note_entered(ArdourCanvas::CanvasNoteEvent* ev); - void note_left(ArdourCanvas::CanvasNoteEvent* ev); - void patch_entered (ArdourCanvas::CanvasPatchChange *); - void patch_left (ArdourCanvas::CanvasPatchChange *); - void sysex_entered (ArdourCanvas::CanvasSysEx* p); - void sysex_left (ArdourCanvas::CanvasSysEx* p); + void note_entered(NoteBase* ev); + void note_left(NoteBase* ev); + void patch_entered (PatchChange *); + void patch_left (PatchChange *); + void sysex_entered (SysEx* p); + void sysex_left (SysEx* p); void note_mouse_position (float xfraction, float yfraction, bool can_set_cursor=true); - void unique_select(ArdourCanvas::CanvasNoteEvent* ev); - void note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend=false); - void note_deselected(ArdourCanvas::CanvasNoteEvent* ev); + void unique_select(NoteBase* ev); + void note_selected(NoteBase* ev, bool add, bool extend=false); + void note_deselected(NoteBase* ev); void delete_selection(); void delete_note (boost::shared_ptr); size_t selection_size() { return _selection.size(); } @@ -201,8 +200,9 @@ public: void invert_selection (); void move_selection(double dx, double dy, double cumulative_dy); - void note_dropped (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::frameoffset_t, int8_t d_note); + void note_dropped (NoteBase* ev, ARDOUR::frameoffset_t, int8_t d_note); + 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 +223,8 @@ public: */ void begin_resizing(bool at_front); - void update_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool); - void commit_resizing (ArdourCanvas::CanvasNoteEvent*, 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. @@ -243,86 +243,104 @@ public: MouseState mouse_state() const { return _mouse_state; } - void note_button_release (); - struct NoteResizeData { - ArdourCanvas::CanvasNote *canvas_note; - ArdourCanvas::SimpleRect *resize_rect; + 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_frame(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(double 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(double 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) */ - double 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(double 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(double 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*/ - double 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; + } + + ARDOUR::BeatsFramesConverter const & source_relative_time_converter () const { + 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); + void nudge_notes (bool forward, bool fine); void channel_edit (); void velocity_edit (); void show_list_editor (); - typedef std::set Selection; + typedef std::set Selection; Selection selection () const { return _selection; } - + void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false); void enable_display (bool); - void set_channel_selector_scoped_note(ArdourCanvas::CanvasNoteEvent* note){ _channel_selection_scoped_note = note; } - ArdourCanvas::CanvasNoteEvent* channel_selector_scoped_note(){ return _channel_selection_scoped_note; } + void set_channel_selector_scoped_note(NoteBase* note){ _channel_selection_scoped_note = note; } + NoteBase* channel_selector_scoped_note(){ return _channel_selection_scoped_note; } void trim_front_starting (); void trim_front_ending (); - void create_note_at (framepos_t, double, double, bool); - - void clear_selection (bool signal = true) { clear_selection_except (0, signal); } + /** Add a note to the model, and the view, at a canvas (click) coordinate. + * \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. + */ + void create_note_at (framepos_t t, double y, Evoral::Beats length, bool snap_t); - ARDOUR::InstrumentInfo& instrument_info() const; - -protected: - /** Allows derived types to specify their visibility requirements - * to the TimeAxisViewItem parent class. + /** An external request to clear the note selection, remove MRV from editor + * selection. */ - MidiRegionView (ArdourCanvas::Group *, - RouteTimeAxisView&, - boost::shared_ptr, - double samples_per_unit, - Gdk::Color& basic_color, - TimeAxisViewItem::Visibility); + 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; + +protected: void region_resized (const PBD::PropertyChange&); void set_flags (XMLNode *); @@ -337,14 +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 *); - friend class EditNoteDialog; /** Play the NoteOn event of the given note immediately @@ -354,9 +364,15 @@ 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_event(GdkEvent* ev); + bool canvas_group_event(GdkEvent* ev); bool note_canvas_event(GdkEvent* ev); void midi_channel_mode_changed (); @@ -364,56 +380,62 @@ private: void instrument_settings_changed (); PBD::ScopedConnection _instrument_changed_connection; - void change_note_channel (ArdourCanvas::CanvasNoteEvent *, int8_t, bool relative=false); - void change_note_velocity(ArdourCanvas::CanvasNoteEvent* ev, int8_t vel, bool relative=false); - void change_note_note(ArdourCanvas::CanvasNoteEvent* ev, int8_t note, bool relative=false); - void change_note_time(ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::TimeType, bool relative=false); - void change_note_length (ArdourCanvas::CanvasNoteEvent *, ARDOUR::MidiModel::TimeType); - void trim_note(ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::TimeType start_delta, + void change_note_channel (NoteBase *, int8_t, bool relative=false); + void change_note_velocity(NoteBase* ev, int8_t vel, bool relative=false); + void change_note_note(NoteBase* ev, int8_t note, bool relative=false); + void change_note_time(NoteBase* ev, ARDOUR::MidiModel::TimeType, bool relative=false); + void change_note_length (NoteBase *, ARDOUR::MidiModel::TimeType); + void trim_note(NoteBase* ev, ARDOUR::MidiModel::TimeType start_delta, ARDOUR::MidiModel::TimeType end_delta); - void clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal = true); - void update_drag_selection (double last_x, double x, double last_y, double y, bool extend); + 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 (ArdourCanvas::CanvasNoteEvent*); - void remove_from_selection (ArdourCanvas::CanvasNoteEvent*); + 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; + uint8_t get_velocity_for_add (ARDOUR::MidiModel::TimeType time) const; + 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 std::list Events; + typedef std::vector< boost::shared_ptr > PatchChanges; + typedef std::vector< boost::shared_ptr > SysExes; + + ARDOUR::BeatsFramesConverter _region_relative_time_converter; + ARDOUR::BeatsFramesConverter _source_relative_time_converter; + ARDOUR::DoubleBeatsFramesConverter _region_relative_time_converter_double; boost::shared_ptr _model; Events _events; PatchChanges _patch_changes; SysExes _sys_exes; - ArdourCanvas::CanvasNote** _active_notes; - ArdourCanvas::Group* _note_group; + Note** _active_notes; + ArdourCanvas::Container* _note_group; ARDOUR::MidiModel::NoteDiffCommand* _note_diff_command; - ArdourCanvas::CanvasNote* _ghost_note; + NoteBase* _ghost_note; double _last_ghost_x; double _last_ghost_y; - ArdourCanvas::SimpleRect* _step_edit_cursor; - Evoral::MusicalTime _step_edit_cursor_width; - Evoral::MusicalTime _step_edit_cursor_position; - ArdourCanvas::CanvasNoteEvent* _channel_selection_scoped_note; - + ArdourCanvas::Rectangle* _step_edit_cursor; + 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::Group* _temporary_note_group; + ArdourCanvas::Container* _temporary_note_group; MouseState _mouse_state; int _pressed_button; - /** Currently selected CanvasNoteEvents */ + /** Currently selected NoteBase objects */ Selection _selection; bool _sort_needed; @@ -425,6 +447,9 @@ private: * when they appear after the command is applied. */ 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; + /** 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 > _marked_for_velocity; @@ -434,20 +459,20 @@ private: /** connection used to connect to model's ContentChanged signal */ PBD::ScopedConnection content_connection; - ArdourCanvas::CanvasNoteEvent* find_canvas_note (boost::shared_ptr); + NoteBase* find_canvas_note (boost::shared_ptr); + NoteBase* find_canvas_note (NoteType); Events::iterator _optimization_iterator; - void update_note (ArdourCanvas::CanvasNote *, bool update_ghost_regions = true); - double update_hit (ArdourCanvas::CanvasHit *); + 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); MidiListEditor* _list_editor; bool _no_sound_notes; - PBD::ScopedConnection note_delete_connection; - void maybe_remove_deleted_note_from_selection (ArdourCanvas::CanvasNoteEvent*); - void snap_changed (); PBD::ScopedConnection snap_changed_connection; @@ -462,26 +487,37 @@ private: void drop_down_keys (); void maybe_select_by_position (GdkEventButton* ev, double x, double y); - void get_events (Events& e, Evoral::Sequence::NoteOperator op, uint8_t val, int chan_mask = 0); + void get_events (Events& e, Evoral::Sequence::NoteOperator op, uint8_t val, int chan_mask = 0); void display_patch_changes_on_channel (uint8_t, bool); void connect_to_diskstream (); void data_recorded (boost::weak_ptr); + /** Get grid type as beats, or default to 1 if not snapped to beats. */ + Evoral::Beats get_grid_beats(framepos_t pos) const; + void remove_ghost_note (); void mouse_mode_changed (); + void enter_internal (); + 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; + + bool _mouse_changed_selection; framepos_t snap_frame_to_grid_underneath (framepos_t p, framecnt_t &) const; - - PBD::ScopedConnection _mouse_mode_connection; - Gdk::Cursor* pre_enter_cursor; - Gdk::Cursor* pre_press_cursor; + PBD::ScopedConnection _mouse_mode_connection; - NotePlayer* _note_player; + boost::shared_ptr _press_cursor_ctx; ARDOUR::ChannelMode get_channel_mode() const; uint16_t get_selected_channels () const;