#include "canvas-hit.h"
#include "canvas-note.h"
#include "canvas-note-event.h"
-#include "canvas-program-change.h"
+#include "canvas_patch_change.h"
#include "canvas-sysex.h"
namespace ARDOUR {
void cut_copy_clear (Editing::CutCopyOp);
void paste (framepos_t pos, float times, const MidiCutBuffer&);
- struct PCEvent {
- PCEvent(double a_time, uint8_t a_value, uint8_t a_channel)
- : time(a_time), value(a_value), channel(a_channel) {}
-
- double time;
- uint8_t value;
- uint8_t channel;
- };
-
- /** Add a new program change flag to the canvas.
- * @param program the MidiRegionView::PCEvent to add
+ /** Add a new patch change flag to the canvas.
+ * @param patch the patch change to add
* @param the text to display in the flag
*/
- void add_pgm_change(PCEvent& program, const std::string& displaytext);
+ void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext);
/** Look up the given time and channel in the 'automation' and set keys accordingly.
- * @param time the time of the program change event
+ * @param time the time of the patch change event
* @param channel the MIDI channel of the event
* @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);
- /** Change the 'automation' data of old_program to new values which correspond to new_patch.
- * @param old_program the program change event which is to be altered
- * @param new_patch the new lsb, msb and program number which are to be set
+ /** Change old_patch to new_patch.
+ * @param old_patch the canvas patch change which is to be altered
+ * @param new_patch new patch
*/
- void alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& 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<Evoral::MusicalTime> const &);
- /** Alter a given program to the new given one.
- * (Called on context menu select on CanvasProgramChange)
- */
- void program_selected(
- ArdourCanvas::CanvasProgramChange& program,
- const MIDI::Name::PatchPrimaryKey& new_patch);
+ void add_patch_change (framecnt_t, Evoral::PatchChange<Evoral::MusicalTime> const &);
+ void move_patch_change (ArdourCanvas::CanvasPatchChange &, Evoral::MusicalTime);
+ void delete_patch_change (ArdourCanvas::CanvasPatchChange *);
+ void edit_patch_change (ArdourCanvas::CanvasPatchChange *);
- /** Alter a given program to be its predecessor in the MIDNAM file.
+ /** Alter a given patch to be its predecessor in the MIDNAM file.
*/
- void previous_program(ArdourCanvas::CanvasProgramChange& program);
+ void previous_patch (ArdourCanvas::CanvasPatchChange &);
- /** Alters a given program to be its successor in the MIDNAM file.
+ /** Alters a given patch to be its successor in the MIDNAM file.
*/
- void next_program(ArdourCanvas::CanvasProgramChange& program);
+ void next_patch (ArdourCanvas::CanvasPatchChange &);
- /** Displays all program change events in the region as flags on the canvas.
+ /** Displays all patch change events in the region as flags on the canvas.
*/
- void display_program_changes();
+ void display_patch_changes();
/** Displays all system exclusive events in the region as flags on the canvas.
*/
void display_model(boost::shared_ptr<ARDOUR::MidiModel> model);
- void start_diff_command(std::string name = "midi edit");
- void diff_add_change(ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::DiffCommand::Property, uint8_t val);
- void diff_add_change(ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::MidiModel::DiffCommand::Property, Evoral::MusicalTime val);
- void diff_add_note(const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity=false);
- void diff_remove_note(ArdourCanvas::CanvasNoteEvent* ev);
+ 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_note (const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity = false);
+ void note_diff_remove_note (ArdourCanvas::CanvasNoteEvent* ev);
void apply_diff();
void apply_diff_as_subcommand();
void note_entered(ArdourCanvas::CanvasNoteEvent* ev);
void note_left(ArdourCanvas::CanvasNoteEvent* ev);
+ void patch_entered (ArdourCanvas::CanvasPatchChange *);
+ void patch_left (ArdourCanvas::CanvasPatchChange *);
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 begin_resizing(bool at_front);
- void update_resizing (ArdourCanvas::CanvasNote *, bool, double, bool);
- void commit_resizing (ArdourCanvas::CanvasNote *, bool, double, bool);
+ void update_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool);
+ void commit_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool);
/** Change the channel of the selection.
* @param channel - the channel number of the new channel, zero-based
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 trim_front_starting ();
+ void trim_front_ending ();
protected:
/** Allows derived types to specify their visibility requirements
bool play_midi_note_off(boost::shared_ptr<NoteType> note);
void clear_events();
- void switch_source(boost::shared_ptr<ARDOUR::Source> src);
bool canvas_event(GdkEvent* ev);
bool note_canvas_event(GdkEvent* ev);
void add_to_selection (ArdourCanvas::CanvasNoteEvent*);
void remove_from_selection (ArdourCanvas::CanvasNoteEvent*);
+ uint8_t get_channel_for_add () const;
+
int8_t _force_channel;
uint16_t _last_channel_selection;
uint8_t _current_range_min;
std::string _custom_device_mode;
typedef std::list<ArdourCanvas::CanvasNoteEvent*> Events;
- typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasProgramChange> > PgmChanges;
+ typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasPatchChange> > PatchChanges;
typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasSysEx> > SysExes;
boost::shared_ptr<ARDOUR::MidiModel> _model;
Events _events;
- PgmChanges _pgm_changes;
+ PatchChanges _patch_changes;
SysExes _sys_exes;
ArdourCanvas::CanvasNote** _active_notes;
ArdourCanvas::Group* _note_group;
- ARDOUR::MidiModel::DiffCommand* _diff_command;
+ ARDOUR::MidiModel::NoteDiffCommand* _note_diff_command;
ArdourCanvas::CanvasNote* _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;
+
+
+ /** 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;
MouseState _mouse_state;
int _pressed_button;
std::vector<NoteResizeData *> _resize_data;
- /* connection used to connect to model's ContentChanged signal */
+ /** connection used to connect to model's ContentChanged signal */
PBD::ScopedConnection content_connection;
ArdourCanvas::CanvasNoteEvent* find_canvas_note (boost::shared_ptr<NoteType>);
Events::iterator _optimization_iterator;
void update_note (ArdourCanvas::CanvasNote*);
- void update_hit (ArdourCanvas::CanvasHit*);
+ double update_hit (ArdourCanvas::CanvasHit *);
void create_ghost_note (double, double);
void update_ghost_note (double, double);
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 display_program_changes_on_channel (uint8_t);
+ void display_patch_changes_on_channel (uint8_t);
+
+ void connect_to_diskstream ();
+ void data_recorded (boost::shared_ptr<ARDOUR::MidiBuffer>, boost::weak_ptr<ARDOUR::MidiSource>);
+
+ void remove_ghost_note ();
+ void mouse_mode_changed ();
+ double _last_event_x;
+ double _last_event_y;
+
+ PBD::ScopedConnection _mouse_mode_connection;
Gdk::Cursor* pre_enter_cursor;
};
projects / ardour.git / blobdiff