rename HitBrushDrag to NoteBrushDrag
This commit is contained in:
@@ -6963,7 +6963,7 @@ HitCreateDrag::y_to_region (double y) const
|
||||
|
||||
/*-----------------------*/
|
||||
|
||||
HitBrushDrag::HitBrushDrag (EditingContext& ec, ArdourCanvas::Item* i, MidiView* mv, Temporal::Beats slen, int sm)
|
||||
NoteBrushDrag::NoteBrushDrag (EditingContext& ec, ArdourCanvas::Item* i, MidiView* mv, Temporal::Beats slen, int sm)
|
||||
: Drag (ec, i, Temporal::BeatTime, ec.get_trackview_group())
|
||||
, _midi_view (mv)
|
||||
, _last_pos (Temporal::Beats ())
|
||||
@@ -6975,12 +6975,12 @@ HitBrushDrag::HitBrushDrag (EditingContext& ec, ArdourCanvas::Item* i, MidiView*
|
||||
|
||||
}
|
||||
|
||||
HitBrushDrag::~HitBrushDrag ()
|
||||
NoteBrushDrag::~NoteBrushDrag ()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
HitBrushDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
||||
NoteBrushDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
||||
{
|
||||
Drag::start_grab (event, cursor);
|
||||
|
||||
@@ -7000,7 +7000,7 @@ HitBrushDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
||||
}
|
||||
|
||||
Temporal::Beats
|
||||
HitBrushDrag::get_stride (Temporal::Beats const & pos, Temporal::BBT_Offset const & q)
|
||||
NoteBrushDrag::get_stride (Temporal::Beats const & pos, Temporal::BBT_Offset const & q)
|
||||
{
|
||||
if (q < Temporal::BBT_Offset (0, 0, 0)) {
|
||||
/* negative quantization == do not quantize */
|
||||
@@ -7017,7 +7017,7 @@ HitBrushDrag::get_stride (Temporal::Beats const & pos, Temporal::BBT_Offset cons
|
||||
}
|
||||
|
||||
void
|
||||
HitBrushDrag::motion (GdkEvent* event, bool first_move)
|
||||
NoteBrushDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
Beats length;
|
||||
|
||||
@@ -7062,7 +7062,7 @@ HitBrushDrag::motion (GdkEvent* event, bool first_move)
|
||||
}
|
||||
|
||||
void
|
||||
HitBrushDrag::finished (GdkEvent* event, bool had_movement)
|
||||
NoteBrushDrag::finished (GdkEvent* event, bool had_movement)
|
||||
{
|
||||
if (added_notes) {
|
||||
_midi_view->end_note_diff_command ();
|
||||
@@ -7072,7 +7072,7 @@ HitBrushDrag::finished (GdkEvent* event, bool had_movement)
|
||||
}
|
||||
|
||||
double
|
||||
HitBrushDrag::y_to_region (double y) const
|
||||
NoteBrushDrag::y_to_region (double y) const
|
||||
{
|
||||
double x = 0;
|
||||
_midi_view->drag_group ()->canvas_to_item (x, y);
|
||||
|
||||
@@ -713,11 +713,11 @@ private:
|
||||
|
||||
};
|
||||
|
||||
class HitBrushDrag : public Drag
|
||||
class NoteBrushDrag : public Drag
|
||||
{
|
||||
public:
|
||||
HitBrushDrag (EditingContext&, ArdourCanvas::Item *, MidiView *, Temporal::Beats specified_length = Temporal::Beats(), int stride_multiple = 1);
|
||||
~HitBrushDrag ();
|
||||
NoteBrushDrag (EditingContext&, ArdourCanvas::Item *, MidiView *, Temporal::Beats specified_length = Temporal::Beats(), int stride_multiple = 1);
|
||||
~NoteBrushDrag ();
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *, bool);
|
||||
|
||||
@@ -574,13 +574,13 @@ MidiView::button_press (GdkEventButton* ev)
|
||||
|
||||
if (_midi_context.note_mode() == Percussive) {
|
||||
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
|
||||
draw_drag = new HitBrushDrag (_editing_context, drag_group(), this, Temporal::Beats (0, 60), stride_multiple); /* 1/128th notes */
|
||||
draw_drag = new NoteBrushDrag (_editing_context, drag_group(), this, Temporal::Beats (0, 60), stride_multiple); /* 1/128th notes */
|
||||
} else {
|
||||
draw_drag = new HitCreateDrag (_editing_context, drag_group(), this);
|
||||
}
|
||||
} else {
|
||||
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
|
||||
draw_drag = new HitBrushDrag (_editing_context, drag_group(), this, Temporal::Beats(), stride_multiple);
|
||||
draw_drag = new NoteBrushDrag (_editing_context, drag_group(), this, Temporal::Beats(), stride_multiple);
|
||||
} else {
|
||||
draw_drag = new NoteCreateDrag (_editing_context, drag_group(), this);
|
||||
}
|
||||
|
||||
@@ -442,7 +442,7 @@ class MidiView : public virtual sigc::trackable, public LineMerger
|
||||
friend class NoteDrag;
|
||||
friend class NoteCreateDrag;
|
||||
friend class HitCreateDrag;
|
||||
friend class HitBrushDrag;
|
||||
friend class NoteBrushDrag;
|
||||
friend class MidiGhostRegion;
|
||||
|
||||
friend class EditNoteDialog;
|
||||
|
||||
Reference in New Issue
Block a user