projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update japanese translation (Hiroki Inagaki)
[ardour.git]
/
gtk2_ardour
/
midi_region_view.h
diff --git
a/gtk2_ardour/midi_region_view.h
b/gtk2_ardour/midi_region_view.h
index e1af49abceb7421d67048fa29da1a792ef7433fc..20a1ee5b25f85260a2cd4f3839d9e23e1860f8d8 100644
(file)
--- a/
gtk2_ardour/midi_region_view.h
+++ b/
gtk2_ardour/midi_region_view.h
@@
-180,7
+180,7
@@
public:
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 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 abort_command();
void note_entered(NoteBase* ev);
@@
-200,8
+200,11
@@
public:
void select_range(framepos_t start, framepos_t end);
void invert_selection ();
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 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<Evoral::event_id_t>);
void select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend);
void select_notes (std::list<Evoral::event_id_t>);
void select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend);
@@
-295,10
+298,12
@@
public:
return _region_relative_time_converter_double;
}
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 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 ();
void transpose (bool up, bool fine, bool allow_smush);
void nudge_notes (bool forward, bool fine);
void channel_edit ();
@@
-359,6
+364,7
@@
private:
friend class NoteDrag;
friend class NoteCreateDrag;
friend class HitCreateDrag;
friend class NoteDrag;
friend class NoteCreateDrag;
friend class HitCreateDrag;
+ friend class MidiGhostRegion;
friend class EditNoteDialog;
friend class EditNoteDialog;
@@
-409,9
+415,10
@@
private:
uint8_t _current_range_min;
uint8_t _current_range_max;
uint8_t _current_range_min;
uint8_t _current_range_max;
- typedef boost::unordered_map<boost::shared_ptr<NoteType>, NoteBase*> Events;
+ 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::PatchChangePtr, boost::shared_ptr<PatchChange> > PatchChanges;
- typedef std::vector< boost::shared_ptr<SysEx> > SysExes;
+ 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;
ARDOUR::BeatsFramesConverter _region_relative_time_converter;
ARDOUR::BeatsFramesConverter _source_relative_time_converter;
@@
-419,6
+426,7
@@
private:
boost::shared_ptr<ARDOUR::MidiModel> _model;
Events _events;
boost::shared_ptr<ARDOUR::MidiModel> _model;
Events _events;
+ CopyDragEvents _copy_drag_events;
PatchChanges _patch_changes;
SysExes _sys_exes;
Note** _active_notes;
PatchChanges _patch_changes;
SysExes _sys_exes;
Note** _active_notes;
@@
-461,6
+469,7
@@
private:
Events::iterator _optimization_iterator;
boost::shared_ptr<PatchChange> find_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr p);
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_note (NoteBase*, bool update_ghost_regions = true);
void update_sustained (Note *, bool update_ghost_regions = true);
@@
-512,8
+521,8
@@
private:
bool _mouse_changed_selection;
bool _mouse_changed_selection;
-
ArdourCanvas
::Color _patch_change_outline;
-
ArdourCanvas
::Color _patch_change_fill;
+
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;
Evoral::Beats snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, bool shift_snap) const;