#include <gtkmm.h>
-#include <gtkmm2ext/gtk_ui.h>
+#include "gtkmm2ext/gtk_ui.h"
#include <sigc++/signal.h>
#include "midi_streamview.h"
#include "midi_time_axis.h"
#include "midi_util.h"
+#include "mouse_cursors.h"
#include "note_player.h"
#include "public_editor.h"
#include "rgb_macros.h"
#include "simpleline.h"
#include "streamview.h"
#include "utils.h"
-#include "mouse_cursors.h"
#include "patch_change_dialog.h"
#include "verbose_cursor.h"
, _last_channel_selection(0xFFFF)
, _current_range_min(0)
, _current_range_max(0)
- , _model_name(string())
- , _custom_device_mode(string())
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*group))
, _note_diff_command (0)
, _ghost_note(0)
- , _drag_rect (0)
, _step_edit_cursor (0)
, _step_edit_cursor_width (1.0)
, _step_edit_cursor_position (0.0)
, _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (0)
- , _pre_enter_cursor (0)
+ , pre_enter_cursor (0)
+ , pre_press_cursor (0)
{
_note_group->raise_to_top();
PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
: RegionView (parent, tv, r, spu, basic_color, false, visibility)
, _force_channel(-1)
, _last_channel_selection(0xFFFF)
- , _model_name(string())
- , _custom_device_mode(string())
+ , _current_range_min(0)
+ , _current_range_max(0)
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*parent))
, _note_diff_command (0)
, _ghost_note(0)
- , _drag_rect (0)
, _step_edit_cursor (0)
, _step_edit_cursor_width (1.0)
, _step_edit_cursor_position (0.0)
, _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (0)
+ , pre_enter_cursor (0)
+ , pre_press_cursor (0)
{
_note_group->raise_to_top();
PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
, RegionView (other)
, _force_channel(-1)
, _last_channel_selection(0xFFFF)
- , _model_name(string())
- , _custom_device_mode(string())
+ , _current_range_min(0)
+ , _current_range_max(0)
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*get_canvas_group()))
, _note_diff_command (0)
, _ghost_note(0)
- , _drag_rect (0)
, _step_edit_cursor (0)
, _step_edit_cursor_width (1.0)
, _step_edit_cursor_position (0.0)
, _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (0)
+ , pre_enter_cursor (0)
+ , pre_press_cursor (0)
{
Gdk::Color c;
int r,g,b,a;
: RegionView (other, boost::shared_ptr<Region> (region))
, _force_channel(-1)
, _last_channel_selection(0xFFFF)
- , _model_name(string())
- , _custom_device_mode(string())
+ , _current_range_min(0)
+ , _current_range_max(0)
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*get_canvas_group()))
, _note_diff_command (0)
, _ghost_note(0)
- , _drag_rect (0)
, _step_edit_cursor (0)
, _step_edit_cursor_width (1.0)
, _step_edit_cursor_position (0.0)
, _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (0)
+ , pre_enter_cursor (0)
+ , pre_press_cursor (0)
{
Gdk::Color c;
int r,g,b,a;
break;
}
+ if (ev->type == GDK_2BUTTON_PRESS) {
+ return trackview.editor().toggle_internal_editing_from_double_click (ev);
+ }
+
if (!trackview.editor().internal_editing()) {
return false;
}
case GDK_BUTTON_PRESS:
return button_press (&ev->button);
- case GDK_2BUTTON_PRESS:
- return true;
-
case GDK_BUTTON_RELEASE:
return button_release (&ev->button);
_mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
);
- if (trackview.editor().current_mouse_mode() == MouseRange) {
+ if (trackview.editor().current_mouse_mode() == MouseDraw && _mouse_state != AddDragging) {
create_ghost_note (ev->x, ev->y);
}
void
MidiRegionView::mouse_mode_changed ()
{
- if (trackview.editor().current_mouse_mode() == MouseRange && trackview.editor().internal_editing()) {
+ if (trackview.editor().current_mouse_mode() == MouseDraw && trackview.editor().internal_editing()) {
create_ghost_note (_last_event_x, _last_event_y);
} else {
remove_ghost_note ();
return false;
}
- _last_x = ev->x;
- _last_y = ev->y;
+ Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
+ MouseMode m = editor->current_mouse_mode();
- group->w2i (_last_x, _last_y);
+ if (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+ pre_press_cursor = editor->get_canvas_cursor ();
+ editor->set_canvas_cursor (editor->cursors()->midi_pencil);
+ }
if (_mouse_state != SelectTouchDragging) {
-
+
_pressed_button = ev->button;
_mouse_state = Pressed;
-
+
return true;
}
PublicEditor& editor = trackview.editor ();
+ if (pre_press_cursor) {
+ dynamic_cast<Editor*>(&editor)->set_canvas_cursor (pre_press_cursor, false);
+ pre_press_cursor = 0;
+ }
+
switch (_mouse_state) {
case Pressed: // Clicked
switch (editor.current_mouse_mode()) {
+ case MouseRange:
+ /* no motion occured - simple click */
+ clear_selection ();
+ break;
+
case MouseObject:
case MouseTimeFX:
{
beats = 1;
}
- create_note_at (event_x, event_y, beats, true, true);
+ /* Shorten the length by 1 tick so that we can add a new note at the next
+ grid snap without it overlapping this one.
+ */
+ beats -= 1.0 / Timecode::BBT_Time::ticks_per_beat;
+
+ create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true);
}
break;
}
- case MouseRange:
+ case MouseDraw:
{
bool success;
Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
beats = 1;
}
- create_note_at (event_x, event_y, beats, true, true);
+ /* Shorten the length by 1 tick so that we can add a new note at the next
+ grid snap without it overlapping this one.
+ */
+ beats -= 1.0 / Timecode::BBT_Time::ticks_per_beat;
+
+ create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true);
break;
}
_mouse_state = None;
break;
- case SelectRectDragging: // Select drag done
+ case SelectRectDragging:
+ case AddDragging:
editor.drags()->end_grab ((GdkEvent *) ev);
_mouse_state = None;
+ create_ghost_note (ev->x, ev->y);
break;
- case AddDragging: // Add drag done
-
- _mouse_state = None;
-
- if (Keyboard::is_insert_note_event(ev) || trackview.editor().current_mouse_mode() == MouseRange) {
-
- if (_drag_rect->property_x2() > _drag_rect->property_x1() + 2) {
-
- const double x = _drag_rect->property_x1();
- const double length = trackview.editor().pixel_to_frame (_drag_rect->property_x2() - _drag_rect->property_x1());
-
- create_note_at (x, _drag_rect->property_y1(), region_frames_to_region_beats(length), true, false);
- }
- }
-
- delete _drag_rect;
- _drag_rect = 0;
-
- create_ghost_note (ev->x, ev->y);
default:
break;
bool
MidiRegionView::motion (GdkEventMotion* ev)
{
- double event_x, event_y;
- framepos_t event_frame = 0;
-
- event_x = ev->x;
- event_y = ev->y;
- group->w2i(event_x, event_y);
-
PublicEditor& editor = trackview.editor ();
-
- // convert event_x to global frame
- framecnt_t grid_frames;
- event_frame = snap_frame_to_grid_underneath (editor.pixel_to_frame (event_x), grid_frames);
- if (!_ghost_note && editor.current_mouse_mode() != MouseRange
- && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())
- && _mouse_state != AddDragging) {
+ if (!_ghost_note && editor.current_mouse_mode() == MouseObject &&
+ Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) &&
+ _mouse_state != AddDragging) {
create_ghost_note (ev->x, ev->y);
- } else if (_ghost_note && editor.current_mouse_mode() != MouseRange
- && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+
+ } else if (_ghost_note && editor.current_mouse_mode() == MouseObject &&
+ Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
update_ghost_note (ev->x, ev->y);
- } else if (_ghost_note && editor.current_mouse_mode() != MouseRange) {
- delete _ghost_note;
- _ghost_note = 0;
+ } else if (_ghost_note && editor.current_mouse_mode() == MouseObject) {
+ remove_ghost_note ();
editor.verbose_cursor()->hide ();
- } else if (_ghost_note && editor.current_mouse_mode() == MouseRange) {
+
+ } else if (_ghost_note && editor.current_mouse_mode() == MouseDraw) {
+
update_ghost_note (ev->x, ev->y);
}
}
switch (_mouse_state) {
- case Pressed: // Maybe start a drag, if we've moved a bit
-
- if (fabs (event_x - _last_x) < 1 && fabs (event_y - _last_y) < 1) {
- /* no appreciable movement since the button was pressed */
- return false;
- }
-
- if (_pressed_button == 1 && editor.current_mouse_mode() == MouseObject
- && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
-
- editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
- _mouse_state = SelectRectDragging;
- return true;
-
- } else if (editor.internal_editing()) {
- // Add note drag start
-
- group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- Gdk::Cursor(Gdk::FLEUR), ev->time);
-
- _last_x = event_x;
- _last_y = event_y;
- _drag_start_x = event_x;
- _drag_start_y = event_y;
+ case Pressed:
- _drag_rect = new ArdourCanvas::SimpleRect(*group);
- _drag_rect->property_x1() = editor.frame_to_pixel(event_frame);
-
- _drag_rect->property_y1() = midi_stream_view()->note_to_y(
- midi_stream_view()->y_to_note(event_y));
- _drag_rect->property_x2() = editor.frame_to_pixel(event_frame);
+ if (_pressed_button == 1) {
- _drag_rect->property_y2() = _drag_rect->property_y1()
- + floor(midi_stream_view()->note_height());
- _drag_rect->property_outline_what() = 0xFF;
- _drag_rect->property_outline_color_rgba() = 0xFFFFFF99;
- _drag_rect->property_fill_color_rgba() = 0xFFFFFF66;
-
- _mouse_state = AddDragging;
+ MouseMode m = editor.current_mouse_mode();
- delete _ghost_note;
- _ghost_note = 0;
-
- editor.verbose_cursor()->hide ();
-
- return true;
+ if (m == MouseDraw || (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()))) {
+
+ editor.drags()->set (new NoteCreateDrag (dynamic_cast<Editor *> (&editor), group, this), (GdkEvent *) ev);
+ _mouse_state = AddDragging;
+ remove_ghost_note ();
+ editor.verbose_cursor()->hide ();
+ return true;
+ } else if (m == MouseObject) {
+
+ editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
+ _mouse_state = SelectRectDragging;
+ return true;
+ } else if (m == MouseRange) {
+ editor.drags()->set (new MidiVerticalSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
+ _mouse_state = SelectVerticalDragging;
+ return true;
+ }
}
return false;
case SelectRectDragging:
+ case SelectVerticalDragging:
+ case AddDragging:
editor.drags()->motion_handler ((GdkEvent *) ev, false);
break;
- case AddDragging: // Add note drag motion
-
- if (ev->is_hint) {
- int t_x;
- int t_y;
- GdkModifierType state;
- gdk_window_get_pointer(ev->window, &t_x, &t_y, &state);
- event_x = t_x;
- event_y = t_y;
- }
-
- if (_mouse_state == AddDragging) {
- event_x = editor.frame_to_pixel(event_frame);
-
- if (editor.snap_mode() == SnapNormal) {
- /* event_frame will have been snapped to the start of the note we are under;
- it's more intuitive if we use the end of that note here
- */
- event_x = editor.frame_to_pixel (event_frame + grid_frames);
- } else {
- event_x = editor.frame_to_pixel (event_frame);
- }
-
- }
-
- if (_drag_rect) {
-
- if (event_x > _drag_start_x) {
- _drag_rect->property_x2() = event_x;
- }
- else {
- _drag_rect->property_x1() = event_x;
- }
- }
-
- _last_x = event_x;
- _last_y = event_y;
-
case SelectTouchDragging:
return false;
}
/** Add a note to the model, and the view, at a canvas (click) coordinate.
- * \param x horizontal position in pixels
+ * \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, which will be snapped to the grid
- * \param sh true to make the note 1 frame shorter than the snapped version of \a length.
- * \param snap_x true to snap x to the grid, otherwise false.
+ * \param length duration of the note in beats
+ * \param snap_t true to snap t to the grid, otherwise false.
*/
void
-MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool snap_x)
+MidiRegionView::create_note_at (framepos_t t, double y, double length, bool snap_t)
{
MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
MidiStreamView* const view = mtv->midi_view();
assert(note <= 127.0);
// Start of note in frames relative to region start
- framepos_t start_frames = trackview.editor().pixel_to_frame (x);
- if (snap_x) {
+ if (snap_t) {
framecnt_t grid_frames;
- start_frames = snap_frame_to_grid_underneath (start_frames, grid_frames);
+ t = snap_frame_to_grid_underneath (t, grid_frames);
}
- assert(start_frames >= 0);
-
- // Snap length
- length = region_frames_to_region_beats(
- snap_frame_to_frame (start_frames + region_beats_to_region_frames(length)) - start_frames);
+ assert (t >= 0);
assert (length != 0);
- if (sh) {
- length = region_frames_to_region_beats (region_beats_to_region_frames (length) - 1);
- }
-
const boost::shared_ptr<NoteType> new_note (new NoteType (mtv->get_channel_for_add (),
- region_frames_to_region_beats(start_frames + _region->start()), length,
+ region_frames_to_region_beats(t + _region->start()),
+ length,
(uint8_t)note, 0x40));
if (_model->contains (new_note)) {
void
MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
{
- if (_no_sound_notes || !trackview.editor().sound_notes()) {
+ if (_no_sound_notes || !Config->get_sound_midi_notes()) {
return;
}
void
MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
{
- if (_no_sound_notes || !trackview.editor().sound_notes()) {
+ if (_no_sound_notes || !Config->get_sound_midi_notes()) {
return;
}
MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions)
{
boost::shared_ptr<NoteType> note = ev->note();
-
const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (note->time()));
const double y1 = midi_stream_view()->note_to_y(note->note());
{
assert (patch->time() >= 0);
- const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (patch->time()));
+ framecnt_t region_frames = source_beats_to_region_frames (patch->time());
+ const double x = trackview.editor().frame_to_pixel (region_frames);
double const height = midi_stream_view()->contents_height();
);
// Show unless patch change is beyond the region bounds
- if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) {
+ if (region_frames < 0 || region_frames >= _region->length()) {
patch_change->hide();
} else {
patch_change->show();
void
MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal)
{
+ bool changed = false;
+
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
if ((*i) != ev) {
Selection::iterator tmp = i;
(*i)->set_selected (false);
(*i)->hide_velocity ();
_selection.erase (i);
-
+ changed = true;
+
i = tmp;
} else {
++i;
selection.
*/
- if (signal) {
+ if (changed && signal) {
SelectionCleared (this); /* EMIT SIGNAL */
}
}
}
}
+void
+MidiRegionView::update_vertical_drag_selection (double y1, double y2, bool extend)
+{
+ if (y1 > y2) {
+ swap (y1, y2);
+ }
+
+ // TODO: Make this faster by storing the last updated selection rect, and only
+ // adjusting things that are in the area that appears/disappeared.
+ // We probably need a tree to be able to find events in O(log(n)) time.
+
+ for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+
+ /* check if any corner of the note is inside the rect
+
+ Notes:
+ 1) this is computing "touched by", not "contained by" the rect.
+ 2) this does not require that events be sorted in time.
+ */
+
+ if (((*i)->y1() >= y1 && (*i)->y1() <= y2)) {
+ // within y- (note-) range
+ if (!(*i)->selected()) {
+ add_to_selection (*i);
+ }
+ } else if ((*i)->selected() && !extend) {
+ // Not inside rectangle
+ remove_from_selection (*i);
+ }
+ }
+}
+
void
MidiRegionView::remove_from_selection (CanvasNoteEvent* ev)
{
(*i)->move_event(dx, dy);
}
- if (dy && !_selection.empty() && !_no_sound_notes && trackview.editor().sound_notes()) {
+ if (dy && !_selection.empty() && !_no_sound_notes && Config->get_sound_midi_notes()) {
if (to_play.size() > 1) {
start_note_diff_command (_("move notes"));
for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) {
-
- Evoral::MusicalTime new_time = absolute_frames_to_source_beats (source_beats_to_absolute_frames ((*i)->note()->time()) + dt);
+
+ framepos_t new_frames = source_beats_to_absolute_frames ((*i)->note()->time()) + dt;
+ Evoral::MusicalTime new_time = absolute_frames_to_source_beats (new_frames);
if (new_time < 0) {
continue;
{
Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
- _pre_enter_cursor = editor->get_canvas_cursor ();
+ pre_enter_cursor = editor->get_canvas_cursor ();
if (_mouse_state == SelectTouchDragging) {
note_selected (ev, true);
editor->verbose_cursor()->hide ();
- if (_pre_enter_cursor) {
- editor->set_canvas_cursor (_pre_enter_cursor);
- _pre_enter_cursor = 0;
+ if (pre_enter_cursor) {
+ editor->set_canvas_cursor (pre_enter_cursor);
+ pre_enter_cursor = 0;
}
}
{
Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
- if (x_fraction > 0.0 && x_fraction < 0.25) {
+ if (x_fraction > 0.0 && x_fraction < 0.2) {
editor->set_canvas_cursor (editor->cursors()->left_side_trim);
- } else if (x_fraction >= 0.75 && x_fraction < 1.0) {
+ } else if (x_fraction >= 0.8 && x_fraction < 1.0) {
editor->set_canvas_cursor (editor->cursors()->right_side_trim);
} else {
- if (_pre_enter_cursor && can_set_cursor) {
- editor->set_canvas_cursor (_pre_enter_cursor);
+ if (pre_enter_cursor && can_set_cursor) {
+ editor->set_canvas_cursor (pre_enter_cursor);
}
}
}
framepos_t const unsnapped_frame = editor.pixel_to_frame (x);
framecnt_t grid_frames;
framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames);
-
+
/* use region_frames... because we are converting a delta within the region
*/
- double length = region_frames_to_region_beats (snap_frame_to_frame (f + grid_frames) - f);
+ bool success;
+ double length = editor.get_grid_type_as_beats (success, unsnapped_frame);
+
+ if (!success) {
+ length = 1;
+ }
/* note that this sets the time of the ghost note in beats relative to
the start of the source; that is how all note times are stored.
void
MidiRegionView::create_ghost_note (double x, double y)
{
- delete _ghost_note;
- _ghost_note = 0;
+ remove_ghost_note ();
boost::shared_ptr<NoteType> g (new NoteType);
_ghost_note = new NoEventCanvasNote (*this, *_note_group, g);
Evoral::MIDIEvent<MidiBuffer::TimeType> const ev (*i, false);
assert (ev.buffer ());
+ /* ev.time() is in session frames, so (ev.time() - converter.origin_b()) is
+ frames from the start of the source, and so time_beats is in terms of the
+ source.
+ */
+
Evoral::MusicalTime const time_beats = converter.from (ev.time () - converter.origin_b ());
if (ev.type() == MIDI_CMD_NOTE_ON) {
projects / ardour.git / blobdiff