#include "ardour/session.h"
#include "evoral/Parameter.hpp"
+#include "evoral/MIDIParameters.hpp"
#include "evoral/Control.hpp"
#include "evoral/midi_util.h"
#include "automation_time_axis.h"
#include "canvas-hit.h"
#include "canvas-note.h"
-#include "canvas-program-change.h"
+#include "canvas_patch_change.h"
+#include "editor.h"
#include "ghostregion.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "midi_region_view.h"
#include "midi_streamview.h"
#include "midi_time_axis.h"
-#include "midi_time_axis.h"
#include "midi_util.h"
+#include "note_player.h"
#include "public_editor.h"
+#include "rgb_macros.h"
#include "selection.h"
#include "simpleline.h"
#include "streamview.h"
#include "utils.h"
+#include "mouse_cursors.h"
+#include "patch_change_dialog.h"
#include "i18n.h"
, _model_name(string())
, _custom_device_mode(string())
, _active_notes(0)
- , _note_group(new ArdourCanvas::Group(*parent))
- , _delta_command(0)
- , _diff_command(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)
+ , _channel_selection_scoped_note (0)
+ , _temporary_note_group (0)
, _mouse_state(None)
, _pressed_button(0)
, _sort_needed (true)
, _optimization_iterator (_events.end())
, _list_editor (0)
, no_sound_notes (false)
+ , _last_event_x (0)
+ , _last_event_y (0)
+ , pre_enter_cursor (0)
{
_note_group->raise_to_top();
+ PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+
+ connect_to_diskstream ();
}
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
, _custom_device_mode(string())
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*parent))
- , _delta_command(0)
- , _diff_command(0)
+ , _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)
+ , _channel_selection_scoped_note (0)
+ , _temporary_note_group (0)
, _mouse_state(None)
, _pressed_button(0)
, _sort_needed (true)
, _optimization_iterator (_events.end())
, _list_editor (0)
, no_sound_notes (false)
-
+ , _last_event_x (0)
+ , _last_event_y (0)
{
_note_group->raise_to_top();
-}
+ PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+ connect_to_diskstream ();
+}
MidiRegionView::MidiRegionView (const MidiRegionView& other)
: sigc::trackable(other)
, _custom_device_mode(string())
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*get_canvas_group()))
- , _delta_command(0)
- , _diff_command(0)
+ , _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)
+ , _channel_selection_scoped_note (0)
+ , _temporary_note_group (0)
, _mouse_state(None)
, _pressed_button(0)
, _sort_needed (true)
, _optimization_iterator (_events.end())
, _list_editor (0)
, no_sound_notes (false)
+ , _last_event_x (0)
+ , _last_event_y (0)
{
Gdk::Color c;
int r,g,b,a;
, _custom_device_mode(string())
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*get_canvas_group()))
- , _delta_command(0)
- , _diff_command(0)
+ , _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)
+ , _channel_selection_scoped_note (0)
+ , _temporary_note_group (0)
, _mouse_state(None)
, _pressed_button(0)
, _sort_needed (true)
, _optimization_iterator (_events.end())
, _list_editor (0)
, no_sound_notes (false)
+ , _last_event_x (0)
+ , _last_event_y (0)
{
Gdk::Color c;
int r,g,b,a;
void
MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
{
+ PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+
CanvasNoteEvent::CanvasNoteEventDeleted.connect (note_delete_connection, MISSING_INVALIDATOR,
ui_bind (&MidiRegionView::maybe_remove_deleted_note_from_selection, this, _1),
gui_context());
midi_view()->signal_midi_patch_settings_changed().connect(
sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+
+ trackview.editor().SnapChanged.connect (snap_changed_connection, invalidator (*this), ui_bind (&MidiRegionView::snap_changed, this), gui_context ());
+
+ connect_to_diskstream ();
+}
+
+void
+MidiRegionView::connect_to_diskstream ()
+{
+ midi_view()->midi_track()->DataRecorded.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::data_recorded, this, _1, _2), gui_context ());
}
bool
MidiRegionView::canvas_event(GdkEvent* ev)
{
- PublicEditor& editor (trackview.editor());
-
- if (!editor.internal_editing()) {
+ switch (ev->type) {
+ case GDK_ENTER_NOTIFY:
+ case GDK_LEAVE_NOTIFY:
+ _last_event_x = ev->crossing.x;
+ _last_event_y = ev->crossing.y;
+ break;
+ case GDK_MOTION_NOTIFY:
+ _last_event_x = ev->motion.x;
+ _last_event_y = ev->motion.y;
+ break;
+ default:
+ break;
+ }
+
+ if (!trackview.editor().internal_editing()) {
return false;
}
- static double drag_start_x, drag_start_y;
- static double last_x, last_y;
- double event_x, event_y;
- nframes64_t event_frame = 0;
- bool fine;
-
- static ArdourCanvas::SimpleRect* drag_rect = 0;
-
- /* XXX: note that as of August 2009, the GnomeCanvas does not propagate scroll events
+ /* XXX: note that until version 2.30, the GnomeCanvas did not propagate scroll events
to its items, which means that ev->type == GDK_SCROLL will never be seen
*/
switch (ev->type) {
case GDK_SCROLL:
- fine = Keyboard::modifier_state_equals (ev->scroll.state, Keyboard::Level4Modifier);
-
- if (ev->scroll.direction == GDK_SCROLL_UP) {
- change_velocities (true, fine, false);
- return true;
- } else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
- change_velocities (false, fine, false);
- return true;
- } else {
- return false;
- }
- break;
+ return scroll (&ev->scroll);
case GDK_KEY_PRESS:
+ return key_press (&ev->key);
- /* since GTK bindings are generally activated on press, and since
- detectable auto-repeat is the name of the game and only sends
- repeated presses, carry out key actions at key press, not release.
- */
-
- if (ev->key.keyval == GDK_Alt_L || ev->key.keyval == GDK_Alt_R){
- _mouse_state = SelectTouchDragging;
- return true;
+ case GDK_KEY_RELEASE:
+ return key_release (&ev->key);
- } else if (ev->key.keyval == GDK_Escape) {
- clear_selection();
- _mouse_state = None;
+ case GDK_BUTTON_PRESS:
+ return button_press (&ev->button);
- } else if (ev->key.keyval == GDK_comma || ev->key.keyval == GDK_period) {
+ case GDK_2BUTTON_PRESS:
+ return true;
- bool start = (ev->key.keyval == GDK_comma);
- bool end = (ev->key.keyval == GDK_period);
- bool shorter = Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier);
- fine = Keyboard::modifier_state_contains (ev->key.state, Keyboard::SecondaryModifier);
+ case GDK_BUTTON_RELEASE:
+ return button_release (&ev->button);
+
+ case GDK_ENTER_NOTIFY:
+ return enter_notify (&ev->crossing);
- change_note_lengths (fine, shorter, start, end);
+ case GDK_LEAVE_NOTIFY:
+ return leave_notify (&ev->crossing);
- return true;
+ case GDK_MOTION_NOTIFY:
+ return motion (&ev->motion);
- } else if (ev->key.keyval == GDK_Delete) {
+ default:
+ break;
+ }
- delete_selection();
- return true;
+ return false;
+}
- } else if (ev->key.keyval == GDK_Tab) {
+void
+MidiRegionView::remove_ghost_note ()
+{
+ delete _ghost_note;
+ _ghost_note = 0;
+}
- if (Keyboard::modifier_state_equals (ev->key.state, Keyboard::PrimaryModifier)) {
- goto_previous_note ();
- } else {
- goto_next_note ();
- }
- return true;
+bool
+MidiRegionView::enter_notify (GdkEventCrossing* ev)
+{
+ trackview.editor().MouseModeChanged.connect (
+ _mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
+ );
- } else if (ev->key.keyval == GDK_Up) {
+ Keyboard::magic_widget_grab_focus();
+ group->grab_focus();
- bool allow_smush = Keyboard::modifier_state_contains (ev->key.state, Keyboard::SecondaryModifier);
- bool fine = Keyboard::modifier_state_contains (ev->key.state, Keyboard::TertiaryModifier);
+ if (trackview.editor().current_mouse_mode() == MouseRange) {
+ create_ghost_note (ev->x, ev->y);
+ }
- if (Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier)) {
- change_velocities (true, fine, allow_smush);
- } else {
- transpose (true, fine, allow_smush);
- }
- return true;
+ return false;
+}
- } else if (ev->key.keyval == GDK_Down) {
+bool
+MidiRegionView::leave_notify (GdkEventCrossing*)
+{
+ _mouse_mode_connection.disconnect ();
+
+ trackview.editor().hide_verbose_canvas_cursor ();
+ remove_ghost_note ();
+ return false;
+}
- bool allow_smush = Keyboard::modifier_state_contains (ev->key.state, Keyboard::SecondaryModifier);
- fine = Keyboard::modifier_state_contains (ev->key.state, Keyboard::TertiaryModifier);
+void
+MidiRegionView::mouse_mode_changed ()
+{
+ if (trackview.editor().current_mouse_mode() == MouseRange && trackview.editor().internal_editing()) {
+ create_ghost_note (_last_event_x, _last_event_y);
+ } else {
+ remove_ghost_note ();
+ trackview.editor().hide_verbose_canvas_cursor ();
+ }
+}
- if (Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier)) {
- change_velocities (false, fine, allow_smush);
- } else {
- transpose (false, fine, allow_smush);
- }
- return true;
+bool
+MidiRegionView::button_press (GdkEventButton* ev)
+{
+ _last_x = ev->x;
+ _last_y = ev->y;
+
+ group->w2i (_last_x, _last_y);
+
+ if (_mouse_state != SelectTouchDragging) {
+
+ _pressed_button = ev->button;
+ _mouse_state = Pressed;
- } else if (ev->key.keyval == GDK_Left) {
+ return true;
+ }
+
+ _pressed_button = ev->button;
- nudge_notes (false);
- return true;
+ return true;
+}
- } else if (ev->key.keyval == GDK_Right) {
+bool
+MidiRegionView::button_release (GdkEventButton* ev)
+{
+ double event_x, event_y;
+ framepos_t event_frame = 0;
- nudge_notes (true);
- return true;
+ event_x = ev->x;
+ event_y = ev->y;
+
+ group->w2i(event_x, event_y);
+ group->ungrab(ev->time);
+
+ event_frame = trackview.editor().pixel_to_frame(event_x);
+
+ switch (_mouse_state) {
+ case Pressed: // Clicked
+
+ switch (trackview.editor().current_mouse_mode()) {
+ case MouseObject:
+ case MouseTimeFX:
+ {
+ clear_selection();
+
+ if (Keyboard::is_insert_note_event(ev)){
+
+ double event_x, event_y;
+
+ event_x = ev->x;
+ event_y = ev->y;
+ group->w2i(event_x, event_y);
- } else if (ev->key.keyval == GDK_Control_L) {
- return true;
+ bool success;
+ Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x));
+
+ if (!success) {
+ beats = 1;
+ }
+
+ create_note_at (event_x, event_y, beats, true);
+ }
- } else if (ev->key.keyval == GDK_r) {
- /* if we're not step editing, this really doesn't matter */
- midi_view()->step_edit_rest ();
- return true;
+ break;
}
+ case MouseRange:
+ {
+ bool success;
+ Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x));
+
+ if (!success) {
+ beats = 1;
+ }
+
+ create_note_at (event_x, event_y, beats, true);
+
+ break;
+ }
+ default:
+ break;
+ }
+
+ _mouse_state = None;
+ break;
+
+ case SelectRectDragging: // Select drag done
+
+ _mouse_state = None;
+ delete _drag_rect;
+ _drag_rect = 0;
+ break;
- return false;
+ case AddDragging: // Add drag done
- case GDK_KEY_RELEASE:
- if (ev->key.keyval == GDK_Alt_L || ev->key.keyval == GDK_Alt_R) {
- _mouse_state = None;
- return true;
- }
- return false;
+ _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) {
- case GDK_BUTTON_PRESS:
- last_x = ev->button.x;
- last_y = ev->button.y;
- group->w2i (last_x, last_y);
-
- if (_mouse_state != SelectTouchDragging && ev->button.button == 1) {
- _pressed_button = ev->button.button;
- _mouse_state = Pressed;
- return true;
- }
- _pressed_button = ev->button.button;
- return true;
+ const double x = _drag_rect->property_x1();
+ const double length = trackview.editor().pixel_to_frame (_drag_rect->property_x2() - _drag_rect->property_x1());
- case GDK_2BUTTON_PRESS:
- return true;
+ create_note_at (x, _drag_rect->property_y1(), frames_to_beats(length), true);
+ }
+ }
- case GDK_ENTER_NOTIFY:
- /* FIXME: do this on switch to note tool, too, if the pointer is already in */
- Keyboard::magic_widget_grab_focus();
- group->grab_focus();
- break;
+ delete _drag_rect;
+ _drag_rect = 0;
- case GDK_MOTION_NOTIFY:
- event_x = ev->motion.x;
- event_y = ev->motion.y;
- group->w2i(event_x, event_y);
-
- // convert event_x to global frame
- event_frame = trackview.editor().pixel_to_frame(event_x) + _region->position();
- trackview.editor().snap_to(event_frame);
- // convert event_frame back to local coordinates relative to position
- event_frame -= _region->position();
-
- 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;
- }
+ create_ghost_note (ev->x, ev->y);
+
+ default:
+ break;
+ }
- // Select drag start
- if (_pressed_button == 1 && editor.current_mouse_mode() == MouseObject) {
- group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
- last_x = event_x;
- last_y = event_y;
- drag_start_x = event_x;
- drag_start_y = event_y;
-
- drag_rect = new ArdourCanvas::SimpleRect(*group);
- drag_rect->property_x1() = event_x;
- drag_rect->property_y1() = event_y;
- drag_rect->property_x2() = event_x;
- drag_rect->property_y2() = event_y;
- drag_rect->property_outline_what() = 0xFF;
- drag_rect->property_outline_color_rgba()
- = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get();
- drag_rect->property_fill_color_rgba()
- = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get();
-
- _mouse_state = SelectRectDragging;
- return true;
+ return false;
+}
- // Add note drag start
- } else if (editor.internal_editing()) {
- group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
- last_x = event_x;
- last_y = event_y;
- drag_start_x = event_x;
- drag_start_y = event_y;
-
- drag_rect = new ArdourCanvas::SimpleRect(*group);
- drag_rect->property_x1() = trackview.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() = trackview.editor().frame_to_pixel(event_frame);
- 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;
- return true;
- }
+bool
+MidiRegionView::motion (GdkEventMotion* ev)
+{
+ double event_x, event_y;
+ framepos_t event_frame = 0;
- return false;
-
- case SelectRectDragging: // Select drag motion
- case AddDragging: // Add note drag motion
- if (ev->motion.is_hint) {
- int t_x;
- int t_y;
- GdkModifierType state;
- gdk_window_get_pointer(ev->motion.window, &t_x, &t_y, &state);
- event_x = t_x;
- event_y = t_y;
- }
+ event_x = ev->x;
+ event_y = ev->y;
+ group->w2i(event_x, event_y);
- if (_mouse_state == AddDragging)
- event_x = trackview.editor().frame_to_pixel(event_frame);
+ // convert event_x to global frame
+ event_frame = trackview.editor().pixel_to_frame(event_x) + _region->position();
+ trackview.editor().snap_to(event_frame);
+
+ // convert event_frame back to local coordinates relative to position
+ event_frame -= _region->position();
- if (drag_rect) {
- if (event_x > drag_start_x)
- drag_rect->property_x2() = event_x;
- else
- drag_rect->property_x1() = event_x;
- }
+ if (!_ghost_note && trackview.editor().current_mouse_mode() != MouseRange
+ && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())
+ && _mouse_state != AddDragging){
+
+ create_ghost_note (ev->x, ev->y);
+ }
+ else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange
+ && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())){
+
+ update_ghost_note (ev->x, ev->y);
+ }
+ else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange){
+
+ delete _ghost_note;
+ _ghost_note = 0;
+
+ trackview.editor().hide_verbose_canvas_cursor ();
+ }
+ else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) {
+ update_ghost_note (ev->x, ev->y);
+ }
+
+ /* any motion immediately hides velocity text that may have been visible */
+
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ (*i)->hide_velocity ();
+ }
- if (drag_rect && _mouse_state == SelectRectDragging) {
- if (event_y > drag_start_y)
- drag_rect->property_y2() = event_y;
- else
- drag_rect->property_y1() = event_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;
+ }
+
+ // Select drag start
+ if (_pressed_button == 1 && trackview.editor().current_mouse_mode() == MouseObject
+ && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+
+ 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;
+
+ _drag_rect = new ArdourCanvas::SimpleRect(*group);
+ _drag_rect->property_x1() = event_x;
+ _drag_rect->property_y1() = event_y;
+ _drag_rect->property_x2() = event_x;
+ _drag_rect->property_y2() = event_y;
+ _drag_rect->property_outline_what() = 0xFF;
+ _drag_rect->property_outline_color_rgba()
+ = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get();
+ _drag_rect->property_fill_color_rgba()
+ = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get();
+
+ _mouse_state = SelectRectDragging;
+ return true;
- update_drag_selection(drag_start_x, event_x, drag_start_y, event_y);
+ // Add note drag start
+ } else if (trackview.editor().internal_editing()) {
+
+ delete _ghost_note;
+ _ghost_note = 0;
+
+ 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;
+
+ _drag_rect = new ArdourCanvas::SimpleRect(*group);
+ _drag_rect->property_x1() = trackview.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() = trackview.editor().frame_to_pixel(event_frame);
+ _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;
+
+ if (_ghost_note){
+
+ delete _ghost_note;
+ _ghost_note = 0;
+
+ trackview.editor().hide_verbose_canvas_cursor ();
}
- last_x = event_x;
- last_y = event_y;
+ return true;
+ }
- case SelectTouchDragging:
- return false;
+ return false;
- default:
- break;
- }
- break;
+ case SelectRectDragging: // Select drag motion
+ case AddDragging: // Add note drag motion
- case GDK_BUTTON_RELEASE:
- event_x = ev->motion.x;
- event_y = ev->motion.y;
- group->w2i(event_x, event_y);
- group->ungrab(ev->button.time);
- event_frame = trackview.editor().pixel_to_frame(event_x);
-
- if (ev->button.button == 3) {
- return false;
- } else if (_pressed_button != 1) {
- return false;
- }
+ 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;
+ }
- switch (_mouse_state) {
- case Pressed: // Clicked
- switch (editor.current_mouse_mode()) {
- case MouseObject:
- case MouseTimeFX:
- clear_selection();
- break;
- case MouseRange:
- {
- bool success;
- Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x));
- if (!success) {
- beats = 1;
- }
+ if (_mouse_state == AddDragging){
+ event_x = trackview.editor().frame_to_pixel(event_frame);
+ }
- create_note_at (event_x, event_y, beats);
- break;
+ if (_drag_rect) {
+
+ if (event_x > _drag_start_x){
+ _drag_rect->property_x2() = event_x;
}
- default:
- break;
+ else {
+ _drag_rect->property_x1() = event_x;
}
- _mouse_state = None;
- break;
- case SelectRectDragging: // Select drag done
- _mouse_state = None;
- delete drag_rect;
- drag_rect = 0;
- break;
- case AddDragging: // Add drag done
- _mouse_state = None;
- 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(), frames_to_beats(length));
+ }
+
+ if (_drag_rect && _mouse_state == SelectRectDragging) {
+
+ if (event_y > _drag_start_y){
+ _drag_rect->property_y2() = event_y;
+ }
+ else {
+ _drag_rect->property_y1() = event_y;
}
- delete drag_rect;
- drag_rect = 0;
- default: break;
- }
+ update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y);
+ }
- default: break;
- }
+ _last_x = event_x;
+ _last_y = event_y;
- return false;
+ case SelectTouchDragging:
+ return false;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+
+bool
+MidiRegionView::scroll (GdkEventScroll* ev)
+{
+ if (_selection.empty()) {
+ return false;
+ }
+
+ trackview.editor().hide_verbose_canvas_cursor ();
+
+ bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
+
+ if (ev->direction == GDK_SCROLL_UP) {
+ change_velocities (true, fine, false);
+ } else if (ev->direction == GDK_SCROLL_DOWN) {
+ change_velocities (false, fine, false);
+ }
+ return true;
+}
+
+bool
+MidiRegionView::key_press (GdkEventKey* ev)
+{
+ /* since GTK bindings are generally activated on press, and since
+ detectable auto-repeat is the name of the game and only sends
+ repeated presses, carry out key actions at key press, not release.
+ */
+
+ if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R){
+ _mouse_state = SelectTouchDragging;
+ return true;
+
+ } else if (ev->keyval == GDK_Escape) {
+ clear_selection();
+ _mouse_state = None;
+
+ } else if (ev->keyval == GDK_comma || ev->keyval == GDK_period) {
+
+ bool start = (ev->keyval == GDK_comma);
+ bool end = (ev->keyval == GDK_period);
+ bool shorter = Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier);
+ bool fine = Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+
+ change_note_lengths (fine, shorter, 0.0, start, end);
+
+ return true;
+
+ } else if (ev->keyval == GDK_Delete) {
+
+ delete_selection();
+ return true;
+
+ } else if (ev->keyval == GDK_Tab) {
+
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ goto_previous_note ();
+ } else {
+ goto_next_note ();
+ }
+ return true;
+
+ } else if (ev->keyval == GDK_Up) {
+
+ bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+ bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+
+ if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+ change_velocities (true, fine, allow_smush);
+ } else {
+ transpose (true, fine, allow_smush);
+ }
+ return true;
+
+ } else if (ev->keyval == GDK_Down) {
+
+ bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+ bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+
+ if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+ change_velocities (false, fine, allow_smush);
+ } else {
+ transpose (false, fine, allow_smush);
+ }
+ return true;
+
+ } else if (ev->keyval == GDK_Left) {
+
+ nudge_notes (false);
+ return true;
+
+ } else if (ev->keyval == GDK_Right) {
+
+ nudge_notes (true);
+ return true;
+
+ } else if (ev->keyval == GDK_Control_L) {
+ return true;
+
+ }
+
+ return false;
+}
+
+bool
+MidiRegionView::key_release (GdkEventKey* ev)
+{
+ if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R) {
+ _mouse_state = None;
+ return true;
+ }
+ return false;
}
void
/** Add a note to the model, and the view, at a canvas (click) coordinate.
* \param x horizontal position in pixels
* \param y vertical position in pixels
- * \param length duration of the note in beats */
+ * \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.
+ */
void
-MidiRegionView::create_note_at(double x, double y, double length)
+MidiRegionView::create_note_at(double x, double y, double length, bool sh)
{
MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
MidiStreamView* const view = mtv->midi_view();
- double note = midi_stream_view()->y_to_note(y);
+ double note = view->y_to_note(y);
assert(note >= 0.0);
assert(note <= 127.0);
// Start of note in frames relative to region start
- nframes64_t const start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
+ framepos_t const start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
assert(start_frames >= 0);
// Snap length
assert (length != 0);
- const boost::shared_ptr<NoteType> new_note(new NoteType(0,
- frames_to_beats(start_frames + _region->start()), length,
- (uint8_t)note, 0x40));
+ if (sh) {
+ length = frames_to_beats (beats_to_frames (length) - 1);
+ }
+
+ const boost::shared_ptr<NoteType> new_note (new NoteType (get_channel_for_add (),
+ frames_to_beats(start_frames + _region->start()), length,
+ (uint8_t)note, 0x40));
if (_model->contains (new_note)) {
return;
view->update_note_range(new_note->note());
- MidiModel::DeltaCommand* cmd = _model->new_delta_command("add note");
- cmd->add(new_note);
+ MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command("add note");
+ cmd->add (new_note);
_model->apply_command(*trackview.session(), cmd);
play_midi_note (new_note);
}
_events.clear();
- _pgm_changes.clear();
+ _patch_changes.clear();
_sys_exes.clear();
_optimization_iterator = _events.end();
}
-
void
MidiRegionView::display_model(boost::shared_ptr<MidiModel> model)
{
_model = model;
+
content_connection.disconnect ();
_model->ContentsChanged.connect (content_connection, invalidator (*this), boost::bind (&MidiRegionView::redisplay_model, this), gui_context());
}
}
-
-void
-MidiRegionView::start_delta_command(string name)
-{
- if (!_delta_command) {
- _delta_command = _model->new_delta_command(name);
- }
-}
-
void
-MidiRegionView::start_diff_command(string name)
+MidiRegionView::start_note_diff_command (string name)
{
- if (!_diff_command) {
- _diff_command = _model->new_diff_command(name);
+ if (!_note_diff_command) {
+ _note_diff_command = _model->new_note_diff_command (name);
}
}
void
-MidiRegionView::delta_add_note(const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity)
+MidiRegionView::note_diff_add_note (const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity)
{
- if (_delta_command) {
- _delta_command->add(note);
+ if (_note_diff_command) {
+ _note_diff_command->add (note);
}
if (selected) {
_marked_for_selection.insert(note);
}
void
-MidiRegionView::delta_remove_note(ArdourCanvas::CanvasNoteEvent* ev)
+MidiRegionView::note_diff_remove_note (ArdourCanvas::CanvasNoteEvent* ev)
{
- if (_delta_command && ev->note()) {
- _delta_command->remove(ev->note());
+ if (_note_diff_command && ev->note()) {
+ _note_diff_command->remove(ev->note());
}
}
void
-MidiRegionView::diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
- MidiModel::DiffCommand::Property property,
- uint8_t val)
+MidiRegionView::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
+ MidiModel::NoteDiffCommand::Property property,
+ uint8_t val)
{
- if (_diff_command) {
- _diff_command->change (ev->note(), property, val);
+ if (_note_diff_command) {
+ _note_diff_command->change (ev->note(), property, val);
}
}
void
-MidiRegionView::diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
- MidiModel::DiffCommand::Property property,
- Evoral::MusicalTime val)
+MidiRegionView::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
+ MidiModel::NoteDiffCommand::Property property,
+ Evoral::MusicalTime val)
{
- if (_diff_command) {
- _diff_command->change (ev->note(), property, val);
+ if (_note_diff_command) {
+ _note_diff_command->change (ev->note(), property, val);
}
}
-void
-MidiRegionView::apply_delta()
-{
- if (!_delta_command) {
- return;
- }
-
- // Mark all selected notes for selection when model reloads
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
- _marked_for_selection.insert((*i)->note());
- }
-
- _model->apply_command(*trackview.session(), _delta_command);
- _delta_command = 0;
- midi_view()->midi_track()->playlist_modified();
-
- _marked_for_selection.clear();
- _marked_for_velocity.clear();
-}
-
void
MidiRegionView::apply_diff ()
{
- if (!_diff_command) {
- return;
- }
-
- _model->apply_command(*trackview.session(), _diff_command);
- _diff_command = 0;
- midi_view()->midi_track()->playlist_modified();
-
- _marked_for_velocity.clear();
-}
+ bool add_or_remove;
-void
-MidiRegionView::apply_delta_as_subcommand()
-{
- if (!_delta_command) {
+ if (!_note_diff_command) {
return;
}
- // Mark all selected notes for selection when model reloads
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
- _marked_for_selection.insert((*i)->note());
- }
+ if ((add_or_remove = _note_diff_command->adds_or_removes())) {
+ // Mark all selected notes for selection when model reloads
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ _marked_for_selection.insert((*i)->note());
+ }
+ }
- _model->apply_command_as_subcommand(*trackview.session(), _delta_command);
- _delta_command = 0;
+ _model->apply_command(*trackview.session(), _note_diff_command);
+ _note_diff_command = 0;
midi_view()->midi_track()->playlist_modified();
+
+ if (add_or_remove) {
+ _marked_for_selection.clear();
+ }
- _marked_for_selection.clear();
_marked_for_velocity.clear();
}
void
-MidiRegionView::apply_diff_as_subcommand()
+MidiRegionView::apply_diff_as_subcommand ()
{
- if (!_diff_command) {
+ bool add_or_remove;
+
+ if (!_note_diff_command) {
return;
}
- // Mark all selected notes for selection when model reloads
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
- _marked_for_selection.insert((*i)->note());
- }
+ if ((add_or_remove = _note_diff_command->adds_or_removes())) {
+ // Mark all selected notes for selection when model reloads
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ _marked_for_selection.insert((*i)->note());
+ }
+ }
- _model->apply_command_as_subcommand(*trackview.session(), _diff_command);
- _diff_command = 0;
+ _model->apply_command_as_subcommand(*trackview.session(), _note_diff_command);
+ _note_diff_command = 0;
midi_view()->midi_track()->playlist_modified();
- _marked_for_selection.clear();
+ if (add_or_remove) {
+ _marked_for_selection.clear();
+ }
_marked_for_velocity.clear();
}
+
void
MidiRegionView::abort_command()
{
- delete _delta_command;
- _delta_command = 0;
- delete _diff_command;
- _diff_command = 0;
+ delete _note_diff_command;
+ _note_diff_command = 0;
clear_selection();
}
return 0;
}
+void
+MidiRegionView::get_events (Events& e, Evoral::Sequence<Evoral::MusicalTime>::NoteOperator op, uint8_t val, int chan_mask)
+{
+ MidiModel::Notes notes;
+ _model->get_notes (notes, op, val, chan_mask);
+
+ for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+ CanvasNoteEvent* cne = find_canvas_note (*n);
+ if (cne) {
+ e.push_back (cne);
+ }
+ }
+}
+
void
MidiRegionView::redisplay_model()
{
}
}
+ _patch_changes.clear();
+ _sys_exes.clear();
+
display_sysexes();
- display_program_changes();
+ display_patch_changes ();
_marked_for_selection.clear ();
_marked_for_velocity.clear ();
}
void
-MidiRegionView::display_program_changes()
+MidiRegionView::display_patch_changes ()
{
- boost::shared_ptr<Evoral::Control> control = _model->control(MidiPgmChangeAutomation);
- if (!control) {
- return;
- }
-
- Glib::Mutex::Lock lock (control->list()->lock());
-
- uint8_t channel = control->parameter().channel();
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+ uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
- for (AutomationList::const_iterator event = control->list()->begin();
- event != control->list()->end(); ++event) {
- double event_time = (*event)->when;
- double program_number = floor((*event)->value + 0.5);
+ for (uint8_t i = 0; i < 16; ++i) {
+ if (chn_mask & (1<<i)) {
+ display_patch_changes_on_channel (i);
+ }
+ }
+}
- // Get current value of bank select MSB at time of the program change
- Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK);
- boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
- uint8_t msb = 0;
- if (msb_control != 0) {
- msb = uint8_t(floor(msb_control->get_float(true, event_time) + 0.5));
- }
+void
+MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
+{
+ for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) {
- // Get current value of bank select LSB at time of the program change
- Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK);
- boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
- uint8_t lsb = 0;
- if (lsb_control != 0) {
- lsb = uint8_t(floor(lsb_control->get_float(true, event_time) + 0.5));
+ if ((*i)->channel() != channel) {
+ continue;
}
-
- MIDI::Name::PatchPrimaryKey patch_key(msb, lsb, program_number);
+
+ MIDI::Name::PatchPrimaryKey patch_key ((*i)->bank_msb (), (*i)->bank_lsb (), (*i)->program ());
boost::shared_ptr<MIDI::Name::Patch> patch =
MIDI::Name::MidiPatchManager::instance().find_patch(
_model_name, _custom_device_mode, channel, patch_key);
- PCEvent program_change(event_time, uint8_t(program_number), channel);
-
if (patch != 0) {
- add_pgm_change(program_change, patch->name());
+ add_canvas_patch_change (*i, patch->name());
} else {
char buf[4];
- snprintf(buf, 4, "%d", int(program_number));
- add_pgm_change(program_change, buf);
+ // program_number is zero-based: convert to one-based
+ snprintf (buf, 4, "%d", (*i)->program() + 1);
+ add_canvas_patch_change (*i, buf);
}
}
}
}
string text = str.str();
- ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
-
const double x = trackview.editor().frame_to_pixel(beats_to_frames(time));
double height = midi_stream_view()->contents_height();
boost::shared_ptr<CanvasSysEx> sysex = boost::shared_ptr<CanvasSysEx>(
- new CanvasSysEx(*this, *group, text, height, x, 1.0));
+ new CanvasSysEx(*this, *_note_group, text, height, x, 1.0));
- // Show unless program change is beyond the region bounds
+ // Show unless patch change is beyond the region bounds
if (time - _region->start() >= _region->length() || time < _region->start()) {
sysex->hide();
} else {
{
in_destructor = true;
+ trackview.editor().hide_verbose_canvas_cursor ();
+
note_delete_connection.disconnect ();
delete _list_editor;
_selection.clear();
clear_events();
+
delete _note_group;
- delete _delta_command;
+ delete _note_diff_command;
+ delete _step_edit_cursor;
+ delete _temporary_note_group;
}
void
if (_enable_display) {
redisplay_model();
}
+
+ move_step_edit_cursor (_step_edit_cursor_position);
+ set_step_edit_cursor_width (_step_edit_cursor_width);
}
void
if (name_pixbuf) {
name_pixbuf->raise_to_top();
}
+
+ for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
+ (*x)->set_height (midi_stream_view()->contents_height());
+ }
+
+ if (_step_edit_cursor) {
+ _step_edit_cursor->property_y2() = midi_stream_view()->contents_height();
+ }
}
} else if (CanvasHit* chit = dynamic_cast<CanvasHit*>(event)) {
- double x = trackview.editor().frame_to_pixel(
- beats_to_frames(note->time()) - _region->start());
- const double diamond_size = midi_stream_view()->note_height() / 2.0;
- double y = midi_stream_view()->note_to_y(event->note()->note())
- + ((diamond_size-2.0) / 4.0);
+ const double diamond_size = update_hit (chit);
chit->set_height (diamond_size);
- chit->move (x - chit->x1(), y - chit->y1());
- chit->show ();
}
}
}
}
if (_active_notes && _active_notes[note]) {
- const nframes64_t end_time_frames = beats_to_frames(end_time);
+
+ const framepos_t end_time_frames = beats_to_frames(end_time);
+
_active_notes[note]->property_x2() = trackview.editor().frame_to_pixel(end_time_frames);
_active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges
_active_notes[note] = 0;
}
}
+
void
MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
{
}
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
- assert(route_ui);
-
- route_ui->midi_track()->write_immediate_event(
- note->on_event().size(), note->on_event().buffer());
+
+ if (!route_ui || !route_ui->midi_track()) {
+ return;
+ }
- const double note_length_beats = (note->off_event().time() - note->on_event().time());
- nframes_t note_length_ms = beats_to_frames(note_length_beats)
- * (1000 / (double)route_ui->session()->nominal_frame_rate());
- Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(this, &MidiRegionView::play_midi_note_off), note),
- note_length_ms, G_PRIORITY_DEFAULT);
+ NotePlayer* np = new NotePlayer (route_ui->midi_track());
+ np->add (note);
+ np->play ();
}
-bool
-MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note)
+void
+MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
{
+ if (no_sound_notes || !trackview.editor().sound_notes()) {
+ return;
+ }
+
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
- assert(route_ui);
+
+ if (!route_ui || !route_ui->midi_track()) {
+ return;
+ }
- route_ui->midi_track()->write_immediate_event(
- note->off_event().size(), note->off_event().buffer());
+ NotePlayer* np = new NotePlayer (route_ui->midi_track());
- return false;
+ for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
+ np->add (*n);
+ }
+
+ np->play ();
}
+
bool
MidiRegionView::note_in_region_range(const boost::shared_ptr<NoteType> note, bool& visible) const
{
- const nframes64_t note_start_frames = beats_to_frames(note->time());
+ const framepos_t note_start_frames = beats_to_frames(note->time());
bool outside = (note_start_frames - _region->start() >= _region->length()) ||
(note_start_frames < _region->start());
{
boost::shared_ptr<NoteType> note = ev->note();
- const nframes64_t note_start_frames = beats_to_frames(note->time());
- const nframes64_t note_end_frames = beats_to_frames(note->end_time());
+ const framepos_t note_start_frames = beats_to_frames(note->time());
+
+ /* trim note display to not overlap the end of its region */
+ const framepos_t note_end_frames = min (beats_to_frames (note->end_time()), _region->start() + _region->length());
const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
const double y1 = midi_stream_view()->note_to_y(note->note());
- const double note_endpixel =
- trackview.editor().frame_to_pixel(note_end_frames - _region->start());
+ const double note_endpixel = trackview.editor().frame_to_pixel(note_end_frames - _region->start());
ev->property_x1() = x;
ev->property_y1() = y1;
+
if (note->length() > 0) {
ev->property_x2() = note_endpixel;
} else {
ev->property_x2() = trackview.editor().frame_to_pixel(_region->length());
}
+
ev->property_y2() = y1 + floor(midi_stream_view()->note_height());
if (note->length() == 0) {
}
}
-void
+double
MidiRegionView::update_hit (CanvasHit* ev)
{
boost::shared_ptr<NoteType> note = ev->note();
- const nframes64_t note_start_frames = beats_to_frames(note->time());
+ const framepos_t note_start_frames = beats_to_frames(note->time());
const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
const double diamond_size = midi_stream_view()->note_height() / 2.0;
const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
ev->move_to (x, y);
+
+ return diamond_size;
}
/** Add a MIDI note to the view (with length).
assert(note->time() >= 0);
assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
- ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+ //ArdourCanvas::Group* const group = (ArdourCanvas::Group*) get_canvas_group();
if (midi_view()->note_mode() == Sustained) {
- CanvasNote* ev_rect = new CanvasNote(*this, *group, note);
+ CanvasNote* ev_rect = new CanvasNote(*this, *_note_group, note);
update_note (ev_rect);
const double diamond_size = midi_stream_view()->note_height() / 2.0;
- CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size, note);
+ CanvasHit* ev_diamond = new CanvasHit(*this, *_note_group, diamond_size, note);
update_hit (ev_diamond);
if (event) {
if (_marked_for_selection.find(note) != _marked_for_selection.end()) {
note_selected(event, true);
- }
+ }
if (_marked_for_velocity.find(note) != _marked_for_velocity.end()) {
event->show_velocity();
}
+
event->on_channel_selection_change(_last_channel_selection);
_events.push_back(event);
event->hide ();
}
}
+
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+ MidiStreamView* const view = mtv->midi_view();
+
+ view->update_note_range(note->note());
}
void
-MidiRegionView::add_note (uint8_t channel, uint8_t number, uint8_t velocity,
- Evoral::MusicalTime pos, Evoral::MusicalTime len)
+MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity,
+ Evoral::MusicalTime pos, Evoral::MusicalTime len)
{
boost::shared_ptr<NoteType> new_note (new NoteType (channel, pos, len, number, velocity));
- start_delta_command (_("step add"));
- delta_add_note (new_note, true, false);
- apply_delta();
-
/* potentially extend region to hold new note */
- nframes64_t end_frame = _region->position() + beats_to_frames (new_note->end_time());
- nframes64_t region_end = _region->position() + _region->length() - 1;
+ framepos_t end_frame = _region->position() + beats_to_frames (new_note->end_time());
+ framepos_t region_end = _region->position() + _region->length() - 1;
if (end_frame > region_end) {
- _region->set_length (end_frame, this);
- } else {
- redisplay_model ();
+ _region->set_length (end_frame - _region->position(), this);
}
+
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+ MidiStreamView* const view = mtv->midi_view();
+
+ view->update_note_range(new_note->note());
+
+ _marked_for_selection.clear ();
+ clear_selection ();
+
+ start_note_diff_command (_("step add"));
+ note_diff_add_note (new_note, true, false);
+ apply_diff();
+
+ // last_step_edit_note = new_note;
}
void
-MidiRegionView::add_pgm_change(PCEvent& program, const string& displaytext)
+MidiRegionView::step_sustain (Evoral::MusicalTime beats)
{
- assert(program.time >= 0);
+ change_note_lengths (false, false, beats, false, true);
+}
- ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
- const double x = trackview.editor().frame_to_pixel(beats_to_frames(program.time));
+void
+MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext)
+{
+ assert (patch->time() >= 0);
+
+ const double x = trackview.editor().frame_to_pixel (beats_to_frames (patch->time()));
- double height = midi_stream_view()->contents_height();
+ double const height = midi_stream_view()->contents_height();
- boost::shared_ptr<CanvasProgramChange> pgm_change = boost::shared_ptr<CanvasProgramChange>(
- new CanvasProgramChange(*this, *group,
+ boost::shared_ptr<CanvasPatchChange> patch_change = boost::shared_ptr<CanvasPatchChange>(
+ new CanvasPatchChange(*this, *_note_group,
displaytext,
height,
x, 1.0,
_model_name,
_custom_device_mode,
- program.time, program.channel, program.value));
+ patch)
+ );
+
+ // Show unless patch change is beyond the region bounds
+ if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) {
+ patch_change->hide();
+ } else {
+ patch_change->show();
+ }
+
+ _patch_changes.push_back (patch_change);
+}
- // Show unless program change is beyond the region bounds
- if (program.time - _region->start() >= _region->length() || program.time < _region->start()) {
- pgm_change->hide();
+void
+MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
+{
+ MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time);
+ while (i != _model->patch_changes().end() && (*i)->channel() != channel) {
+ ++i;
+ }
+
+ if (i != _model->patch_changes().end()) {
+ key.msb = (*i)->bank_msb ();
+ key.lsb = (*i)->bank_lsb ();
+ key.program_number = (*i)->program ();
} else {
- pgm_change->show();
+ key.msb = key.lsb = key.program_number = 0;
}
-
- _pgm_changes.push_back(pgm_change);
+
+ assert (key.is_sane());
}
+
void
-MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
+MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch)
{
- cerr << "getting patch key at " << time << " for channel " << channel << endl;
- Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK);
- boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
- float msb = -1.0;
- if (msb_control != 0) {
- msb = int(msb_control->get_float(true, time));
- cerr << "got msb " << msb;
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change"));
+
+ if (pc.patch()->program() != new_patch.program_number) {
+ c->change_program (pc.patch (), new_patch.program_number);
}
- Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK);
- boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
- float lsb = -1.0;
- if (lsb_control != 0) {
- lsb = lsb_control->get_float(true, time);
- cerr << " got lsb " << lsb;
+ int const new_bank = (new_patch.msb << 7) | new_patch.lsb;
+ if (pc.patch()->bank() != new_bank) {
+ c->change_bank (pc.patch (), new_bank);
}
- Evoral::Parameter program_change(MidiPgmChangeAutomation, channel, 0);
- boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
- float program_number = -1.0;
- if (program_control != 0) {
- program_number = program_control->get_float(true, time);
- cerr << " got program " << program_number << endl;
- }
+ _model->apply_command (*trackview.session(), c);
- key.msb = (int) floor(msb + 0.5);
- key.lsb = (int) floor(lsb + 0.5);
- key.program_number = (int) floor(program_number + 0.5);
- assert(key.is_sane());
+ _patch_changes.clear ();
+ display_patch_changes ();
}
-
void
-MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch)
+MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const Evoral::PatchChange<Evoral::MusicalTime> & new_change)
{
- // TODO: Get the real event here and alter them at the original times
- Evoral::Parameter bank_select_msb(MidiCCAutomation, old_program.channel, MIDI_CTL_MSB_BANK);
- boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
- if (msb_control != 0) {
- msb_control->set_float(float(new_patch.msb), true, old_program.time);
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change"));
+
+ if (old_change->time() != new_change.time()) {
+ c->change_time (old_change, new_change.time());
}
- // TODO: Get the real event here and alter them at the original times
- Evoral::Parameter bank_select_lsb(MidiCCAutomation, old_program.channel, MIDI_CTL_LSB_BANK);
- boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
- if (lsb_control != 0) {
- lsb_control->set_float(float(new_patch.lsb), true, old_program.time);
+ if (old_change->channel() != new_change.channel()) {
+ c->change_channel (old_change, new_change.channel());
+ }
+
+ if (old_change->program() != new_change.program()) {
+ c->change_program (old_change, new_change.program());
}
- Evoral::Parameter program_change(MidiPgmChangeAutomation, old_program.channel, 0);
- boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
+ if (old_change->bank() != new_change.bank()) {
+ c->change_bank (old_change, new_change.bank());
+ }
- assert(program_control != 0);
- program_control->set_float(float(new_patch.program_number), true, old_program.time);
+ _model->apply_command (*trackview.session(), c);
- redisplay_model();
+ _patch_changes.clear ();
+ display_patch_changes ();
}
+/** Add a patch change to the region.
+ * @param t Time in frames relative to region position
+ * @param patch Patch to add; time and channel are ignored (time is converted from t, and channel comes from
+ * get_channel_for_add())
+ */
void
-MidiRegionView::program_selected(CanvasProgramChange& program, const MIDI::Name::PatchPrimaryKey& new_patch)
+MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange<Evoral::MusicalTime> const & patch)
{
- PCEvent program_change_event(program.event_time(), program.program(), program.channel());
- alter_program_change(program_change_event, new_patch);
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("add patch change"));
+ c->add (MidiModel::PatchChangePtr (
+ new Evoral::PatchChange<Evoral::MusicalTime> (
+ frames_to_beats (t + midi_region()->start()), get_channel_for_add(), patch.program(), patch.bank()
+ )
+ ));
+
+ _model->apply_command (*trackview.session(), c);
+
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
-MidiRegionView::previous_program(CanvasProgramChange& program)
+MidiRegionView::move_patch_change (CanvasPatchChange& pc, Evoral::MusicalTime t)
{
- MIDI::Name::PatchPrimaryKey key;
- get_patch_key_at(program.event_time(), program.channel(), key);
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("move patch change"));
+ c->change_time (pc.patch (), t);
+ _model->apply_command (*trackview.session(), c);
- boost::shared_ptr<MIDI::Name::Patch> patch =
- MIDI::Name::MidiPatchManager::instance().previous_patch(
- _model_name,
- _custom_device_mode,
- program.channel(),
- key);
-
- PCEvent program_change_event(program.event_time(), program.program(), program.channel());
- if (patch) {
- alter_program_change(program_change_event, patch->patch_primary_key());
- }
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
-MidiRegionView::next_program(CanvasProgramChange& program)
+MidiRegionView::delete_patch_change (CanvasPatchChange* pc)
{
- MIDI::Name::PatchPrimaryKey key;
- get_patch_key_at(program.event_time(), program.channel(), key);
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("delete patch change"));
+ c->remove (pc->patch ());
+ _model->apply_command (*trackview.session(), c);
- boost::shared_ptr<MIDI::Name::Patch> patch =
- MIDI::Name::MidiPatchManager::instance().next_patch(
- _model_name,
- _custom_device_mode,
- program.channel(),
- key);
+ _patch_changes.clear ();
+ display_patch_changes ();
+}
+
+void
+MidiRegionView::previous_patch (CanvasPatchChange& patch)
+{
+ if (patch.patch()->program() < 127) {
+ MIDI::Name::PatchPrimaryKey key;
+ get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+ key.program_number++;
+ change_patch_change (patch, key);
+ }
+}
- PCEvent program_change_event(program.event_time(), program.program(), program.channel());
- if (patch) {
- alter_program_change(program_change_event, patch->patch_primary_key());
- }
+void
+MidiRegionView::next_patch (CanvasPatchChange& patch)
+{
+ if (patch.patch()->program() > 0) {
+ MIDI::Name::PatchPrimaryKey key;
+ get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+ key.program_number--;
+ change_patch_change (patch, key);
+ }
}
void
return;
}
- start_delta_command (_("delete selection"));
+ start_note_diff_command (_("delete selection"));
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
if ((*i)->selected()) {
- _delta_command->remove((*i)->note());
+ _note_diff_command->remove((*i)->note());
}
}
_selection.clear();
- apply_delta ();
+ apply_diff ();
}
void
MidiRegionView::delete_note (boost::shared_ptr<NoteType> n)
{
- start_delta_command (_("delete note"));
- _delta_command->remove (n);
- apply_delta ();
+ start_note_diff_command (_("delete note"));
+ _note_diff_command->remove (n);
+ apply_diff ();
trackview.editor().hide_verbose_canvas_cursor ();
}
{
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
if ((*i)->selected() && (*i) != ev) {
- (*i)->selected(false);
+ (*i)->set_selected(false);
(*i)->hide_velocity();
}
}
Selection::iterator tmp = i;
++tmp;
- (*i)->selected (false);
+ (*i)->set_selected (false);
_selection.erase (i);
i = tmp;
}
}
+void
+MidiRegionView::select_all_notes ()
+{
+ clear_selection ();
+
+ for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+ add_to_selection (*i);
+ }
+}
+
void
MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend)
{
MidiModel::Notes& notes (_model->notes());
_optimization_iterator = _events.begin();
+ if (!add) {
+ clear_selection ();
+ }
+
if (extend && _selection.empty()) {
extend = false;
}
CanvasNoteEvent* cne;
bool select = false;
- if (((0x0001 << note->channel()) & channel_mask) != 0) {
+ if (((1 << note->channel()) & channel_mask) != 0) {
if (extend) {
if ((note->note() >= low_note && note->note() <= high_note)) {
select = true;
} else {
/* find end of latest note selected, select all between that and the start of "ev" */
- Evoral::MusicalTime earliest = DBL_MAX;
+ Evoral::MusicalTime earliest = Evoral::MaxMusicalTime;
Evoral::MusicalTime latest = 0;
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
_selection.erase (i);
}
- ev->selected (false);
+ ev->set_selected (false);
ev->hide_velocity ();
if (_selection.empty()) {
}
if (_selection.insert (ev).second) {
- ev->selected (true);
+ ev->set_selected (true);
play_midi_note ((ev)->note());
- }
+ }
if (add_mrv_selection) {
PublicEditor& editor (trackview.editor());
}
void
-MidiRegionView::move_selection(double dx, double dy)
+MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
{
+ typedef vector<boost::shared_ptr<NoteType> > PossibleChord;
+ PossibleChord to_play;
+ Evoral::MusicalTime earliest = Evoral::MaxMusicalTime;
+
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ if ((*i)->note()->time() < earliest) {
+ earliest = (*i)->note()->time();
+ }
+ }
+
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ if (Evoral::musical_time_equal ((*i)->note()->time(), earliest)) {
+ to_play.push_back ((*i)->note());
+ }
(*i)->move_event(dx, dy);
- }
+ }
+
+ if (dy && !_selection.empty() && !no_sound_notes && trackview.editor().sound_notes()) {
+
+ if (to_play.size() > 1) {
+
+ PossibleChord shifted;
+
+ for (PossibleChord::iterator n = to_play.begin(); n != to_play.end(); ++n) {
+ boost::shared_ptr<NoteType> moved_note (new NoteType (**n));
+ moved_note->set_note (moved_note->note() + cumulative_dy);
+ shifted.push_back (moved_note);
+ }
+
+ play_midi_chord (shifted);
+
+ } else if (!to_play.empty()) {
+
+ boost::shared_ptr<NoteType> moved_note (new NoteType (*to_play.front()));
+ moved_note->set_note (moved_note->note() + cumulative_dy);
+ play_midi_note (moved_note);
+ }
+ }
}
void
-MidiRegionView::note_dropped(CanvasNoteEvent *, double dt, int8_t dnote)
+MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
{
assert (!_selection.empty());
highest_note_difference = highest_note_in_selection - 127;
}
- start_diff_command(_("move notes"));
+ start_note_diff_command (_("move notes"));
for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) {
- nframes64_t start_frames = beats_to_frames((*i)->note()->time());
-
- if (dt >= 0) {
- start_frames += snap_frame_to_frame(trackview.editor().pixel_to_frame(dt));
- } else {
- start_frames -= snap_frame_to_frame(trackview.editor().pixel_to_frame(-dt));
- }
-
- Evoral::MusicalTime new_time = frames_to_beats(start_frames);
+ Evoral::MusicalTime new_time = frames_to_beats (beats_to_frames ((*i)->note()->time()) + dt);
if (new_time < 0) {
continue;
}
- diff_add_change (*i, MidiModel::DiffCommand::StartTime, new_time);
+ note_diff_add_change (*i, MidiModel::NoteDiffCommand::StartTime, new_time);
uint8_t original_pitch = (*i)->note()->note();
uint8_t new_pitch = original_pitch + dnote - highest_note_difference;
lowest_note_in_selection = std::min(lowest_note_in_selection, new_pitch);
highest_note_in_selection = std::max(highest_note_in_selection, new_pitch);
- diff_add_change (*i, MidiModel::DiffCommand::NoteNumber, new_pitch);
+ note_diff_add_change (*i, MidiModel::NoteDiffCommand::NoteNumber, new_pitch);
}
apply_diff();
}
}
-nframes64_t
+framepos_t
MidiRegionView::snap_pixel_to_frame(double x)
{
PublicEditor& editor = trackview.editor();
// x is region relative, convert it to global absolute frames
- nframes64_t frame = editor.pixel_to_frame(x) + _region->position();
+ framepos_t frame = editor.pixel_to_frame(x) + _region->position();
editor.snap_to(frame);
return frame - _region->position(); // convert back to region relative
}
-nframes64_t
-MidiRegionView::snap_frame_to_frame(nframes64_t x)
+framepos_t
+MidiRegionView::snap_frame_to_frame(framepos_t x)
{
PublicEditor& editor = trackview.editor();
// x is region relative, convert it to global absolute frames
- nframes64_t frame = x + _region->position();
+ framepos_t frame = x + _region->position();
editor.snap_to(frame);
return frame - _region->position(); // convert back to region relative
}
double
MidiRegionView::get_position_pixels()
{
- nframes64_t region_frame = get_position();
+ framepos_t region_frame = get_position();
return trackview.editor().frame_to_pixel(region_frame);
}
double
MidiRegionView::get_end_position_pixels()
{
- nframes64_t frame = get_position() + get_duration ();
+ framepos_t frame = get_position() + get_duration ();
return trackview.editor().frame_to_pixel(frame);
}
-nframes64_t
+framepos_t
MidiRegionView::beats_to_frames(double beats) const
{
return _time_converter.to(beats);
}
double
-MidiRegionView::frames_to_beats(nframes64_t frames) const
+MidiRegionView::frames_to_beats(framepos_t frames) const
{
return _time_converter.from(frames);
}
// create a new SimpleRect from the note which will be the resize preview
SimpleRect *resize_rect = new SimpleRect(
- *group, note->x1(), note->y1(), note->x2(), note->y2());
+ *_note_group, note->x1(), note->y1(), note->x2(), note->y2());
// calculate the colors: get the color settings
uint32_t fill_color = UINT_RGBA_CHANGE_A(
// calculate color based on note velocity
resize_rect->property_fill_color_rgba() = UINT_INTERPOLATE(
- CanvasNoteEvent::meter_style_fill_color(note->note()->velocity()),
+ CanvasNoteEvent::meter_style_fill_color(note->note()->velocity(), note->selected()),
fill_color,
0.85);
}
}
+/** Update resizing notes while user drags.
+ * @param primary `primary' note for the drag; ie the one that is used as the reference in non-relative mode.
+ * @param at_front which end of the note (true == note on, false == note off)
+ * @param delta_x change in mouse position since the start of the drag
+ * @param relative true if relative resizing is taking place, false if absolute resizing. This only makes
+ * a difference when multiple notes are being resized; in relative mode, each note's length is changed by the
+ * amount of the drag. In non-relative mode, all selected notes are set to have the same start or end point
+ * as the \a primary note.
+ */
void
-MidiRegionView::update_resizing (bool at_front, double delta_x, bool relative)
+MidiRegionView::update_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at_front, double delta_x, bool relative)
{
+ bool cursor_set = false;
+
for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
SimpleRect* resize_rect = (*i)->resize_rect;
CanvasNote* canvas_note = (*i)->canvas_note;
if (relative) {
current_x = canvas_note->x1() + delta_x;
} else {
- // x is in track relative, transform it to region relative
- current_x = delta_x - get_position_pixels();
+ current_x = primary->x1() + delta_x;
}
} else {
if (relative) {
current_x = canvas_note->x2() + delta_x;
} else {
- // x is in track relative, transform it to region relative
- current_x = delta_x - get_end_position_pixels ();
+ current_x = primary->x2() + delta_x;
}
}
resize_rect->property_x2() = snap_to_pixel(current_x);
resize_rect->property_x1() = canvas_note->x1();
}
+
+ if (!cursor_set) {
+ double beats;
+
+ beats = snap_pixel_to_frame (current_x);
+ beats = frames_to_beats (beats);
+
+ double len;
+
+ if (at_front) {
+ if (beats < canvas_note->note()->end_time()) {
+ len = canvas_note->note()->time() - beats;
+ len += canvas_note->note()->length();
+ } else {
+ len = 0;
+ }
+ } else {
+ if (beats >= canvas_note->note()->time()) {
+ len = beats - canvas_note->note()->time();
+ } else {
+ len = 0;
+ }
+ }
+
+ char buf[16];
+ snprintf (buf, sizeof (buf), "%.3g beats", len);
+ trackview.editor().show_verbose_canvas_cursor_with (buf);
+
+ cursor_set = true;
+ }
+
}
}
+
+/** Finish resizing notes when the user releases the mouse button.
+ * Parameters the same as for \a update_resizing().
+ */
void
-MidiRegionView::commit_resizing (bool at_front, double delta_x, bool relative)
+MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at_front, double delta_x, bool relative)
{
- start_diff_command(_("resize notes"));
+ start_note_diff_command (_("resize notes"));
for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
CanvasNote* canvas_note = (*i)->canvas_note;
SimpleRect* resize_rect = (*i)->resize_rect;
- const double region_start = get_position_pixels();
double current_x;
if (at_front) {
if (relative) {
current_x = canvas_note->x1() + delta_x;
} else {
- // x is in track relative, transform it to region relative
- current_x = region_start + delta_x;
+ current_x = primary->x1() + delta_x;
}
} else {
if (relative) {
current_x = canvas_note->x2() + delta_x;
} else {
- // x is in track relative, transform it to region relative
- current_x = region_start + delta_x;
+ current_x = primary->x2() + delta_x;
}
}
current_x = frames_to_beats (current_x);
if (at_front && current_x < canvas_note->note()->end_time()) {
- diff_add_change (canvas_note, MidiModel::DiffCommand::StartTime, current_x);
+ note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, current_x);
double len = canvas_note->note()->time() - current_x;
len += canvas_note->note()->length();
if (len > 0) {
/* XXX convert to beats */
- diff_add_change (canvas_note, MidiModel::DiffCommand::Length, len);
+ note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
}
}
if (len > 0) {
/* XXX convert to beats */
- diff_add_change (canvas_note, MidiModel::DiffCommand::Length, len);
+ note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
}
}
apply_diff();
}
+void
+MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t channel)
+{
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::Channel, (uint8_t) channel);
+}
+
void
MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative)
{
new_velocity = velocity;
}
- diff_add_change (event, MidiModel::DiffCommand::Velocity, new_velocity);
+ event->set_selected (event->selected()); // change color
+
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::Velocity, new_velocity);
}
void
}
clamp_to_0_127 (new_note);
- diff_add_change (event, MidiModel::DiffCommand::NoteNumber, new_note);
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::NoteNumber, new_note);
}
void
{
bool change_start = false;
bool change_length = false;
- Evoral::MusicalTime new_start;
- Evoral::MusicalTime new_length;
+ Evoral::MusicalTime new_start = 0;
+ Evoral::MusicalTime new_length = 0;
/* NOTE: the semantics of the two delta arguments are slightly subtle:
}
if (change_start) {
- diff_add_change (event, MidiModel::DiffCommand::StartTime, new_start);
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::StartTime, new_start);
}
if (change_length) {
- diff_add_change (event, MidiModel::DiffCommand::Length, new_length);
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::Length, new_length);
}
}
new_time = delta;
}
- diff_add_change (event, MidiModel::DiffCommand::StartTime, new_time);
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::StartTime, new_time);
+}
+
+void
+MidiRegionView::change_note_length (CanvasNoteEvent* event, Evoral::MusicalTime t)
+{
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::Length, t);
}
void
}
}
- start_diff_command(_("change velocities"));
+ start_note_diff_command (_("change velocities"));
for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
Selection::iterator next = i;
}
apply_diff();
+
+ if (!_selection.empty()) {
+ char buf[24];
+ snprintf (buf, sizeof (buf), "Vel %d",
+ (int) (*_selection.begin())->note()->velocity());
+ trackview.editor().show_verbose_canvas_cursor_with (buf, 10, 10);
+ }
}
}
}
- start_diff_command (_("transpose"));
+ start_note_diff_command (_("transpose"));
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
Selection::iterator next = i;
}
void
-MidiRegionView::change_note_lengths (bool fine, bool shorter, bool start, bool end)
+MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTime delta, bool start, bool end)
{
- Evoral::MusicalTime delta;
-
- if (fine) {
- delta = 1.0/128.0;
- } else {
- /* grab the current grid distance */
- bool success;
- delta = trackview.editor().get_grid_type_as_beats (success, _region->position());
- if (!success) {
- /* XXX cannot get grid type as beats ... should always be possible ... FIX ME */
- cerr << "Grid type not available as beats - TO BE FIXED\n";
- return;
- }
- }
+ if (delta == 0.0) {
+ if (fine) {
+ delta = 1.0/128.0;
+ } else {
+ /* grab the current grid distance */
+ bool success;
+ delta = trackview.editor().get_grid_type_as_beats (success, _region->position());
+ if (!success) {
+ /* XXX cannot get grid type as beats ... should always be possible ... FIX ME */
+ cerr << "Grid type not available as beats - TO BE FIXED\n";
+ return;
+ }
+ }
+ }
if (shorter) {
delta = -delta;
}
- start_diff_command (_("change note lengths"));
+ start_note_diff_command (_("change note lengths"));
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
Selection::iterator next = i;
into a vector and sort before using the first one.
*/
- nframes64_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time());
- nframes64_t unused;
- nframes64_t distance;
+ framepos_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time());
+ framepos_t unused;
+ framepos_t distance;
if (trackview.editor().snap_mode() == Editing::SnapOff) {
/* use grid */
- nframes64_t next_pos = ref_point;
+ framepos_t next_pos = ref_point;
if (forward) {
- /* XXX need check on max_frames, but that needs max_frames64 or something */
- next_pos += 1;
+ if (max_framepos - 1 < next_pos) {
+ next_pos += 1;
+ }
} else {
if (next_pos == 0) {
return;
next_pos -= 1;
}
- cerr << "ref point was " << ref_point << " next was " << next_pos;
trackview.editor().snap_to (next_pos, (forward ? 1 : -1), false);
distance = ref_point - next_pos;
- cerr << " final is " << next_pos << " distance = " << distance << endl;
}
if (distance == 0) {
delta = -delta;
}
- start_diff_command (_("nudge"));
+ start_note_diff_command (_("nudge"));
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
Selection::iterator next = i;
void
MidiRegionView::change_channel(uint8_t channel)
{
- start_diff_command(_("change channel"));
+ start_note_diff_command(_("change channel"));
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
- diff_add_change (*i, MidiModel::DiffCommand::Channel, channel);
+ note_diff_add_change (*i, MidiModel::NoteDiffCommand::Channel, channel);
}
+
apply_diff();
}
void
MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
{
+ Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
+
+ pre_enter_cursor = editor->get_canvas_cursor ();
+
if (_mouse_state == SelectTouchDragging) {
- note_selected(ev, true);
+ note_selected (ev, true);
}
- char buf[12];
- snprintf (buf, sizeof (buf), "%s (%d)", Evoral::midi_note_name (ev->note()->note()).c_str(), (int) ev->note()->note());
- PublicEditor& editor (trackview.editor());
- editor.show_verbose_canvas_cursor_with (buf);
+ show_verbose_canvas_cursor (ev->note ());
}
void
MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*)
{
- PublicEditor& editor (trackview.editor());
- editor.hide_verbose_canvas_cursor ();
+ Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
+
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ (*i)->hide_velocity ();
+ }
+
+ editor->hide_verbose_canvas_cursor ();
+
+ if (pre_enter_cursor) {
+ editor->set_canvas_cursor (pre_enter_cursor);
+ pre_enter_cursor = 0;
+ }
+}
+
+void
+MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev)
+{
+ ostringstream s;
+ s << ((int) ev->patch()->program() + 1) << ":" << (ev->patch()->bank() + 1);
+ trackview.editor().show_verbose_canvas_cursor_with (s.str().c_str(), 10, 20);
}
+void
+MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *)
+{
+ trackview.editor().hide_verbose_canvas_cursor ();
+}
void
-MidiRegionView::switch_source(boost::shared_ptr<Source> src)
+MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, bool can_set_cursor)
{
- boost::shared_ptr<MidiSource> msrc = boost::dynamic_pointer_cast<MidiSource>(src);
- if (msrc)
- display_model(msrc->model());
+ Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
+
+ if (x_fraction > 0.0 && x_fraction < 0.25) {
+ editor->set_canvas_cursor (editor->cursors()->left_side_trim);
+ } else if (x_fraction >= 0.75 && 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);
+ }
+ }
}
void
}
_last_channel_selection = mask;
+
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
if (op != Copy) {
- start_delta_command();
+ start_note_diff_command();
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
switch (op) {
break;
case Cut:
case Clear:
- delta_remove_note (*i);
+ note_diff_remove_note (*i);
break;
}
}
- apply_delta();
+ apply_diff();
}
}
}
void
-MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb)
+MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
{
if (mcb.empty()) {
return;
}
- start_delta_command (_("paste"));
+ start_note_diff_command (_("paste"));
Evoral::MusicalTime beat_delta;
Evoral::MusicalTime paste_pos_beats;
Evoral::MusicalTime duration;
- Evoral::MusicalTime end_point;
+ Evoral::MusicalTime end_point = 0;
duration = (*mcb.notes().rbegin())->end_time() - (*mcb.notes().begin())->time();
paste_pos_beats = frames_to_beats (pos - _region->position());
beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats;
paste_pos_beats = 0;
- _selection.clear ();
+ clear_selection ();
for (int n = 0; n < (int) times; ++n) {
- cerr << "Pasting " << mcb.notes().size() << " for the " << n+1 << "th time\n";
-
for (Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) {
boost::shared_ptr<NoteType> copied_note (new NoteType (*((*i).get())));
/* make all newly added notes selected */
- delta_add_note (copied_note, true);
+ note_diff_add_note (copied_note, true);
end_point = copied_note->end_time();
}
/* if we pasted past the current end of the region, extend the region */
- nframes64_t end_frame = _region->position() + beats_to_frames (end_point);
- nframes64_t region_end = _region->position() + _region->length() - 1;
+ framepos_t end_frame = _region->position() + beats_to_frames (end_point);
+ framepos_t region_end = _region->position() + _region->length() - 1;
if (end_frame > region_end) {
- cerr << "region end is now " << end_frame << " to extend from " << region_end << endl;
-
trackview.session()->begin_reversible_command (_("paste"));
- _region->clear_history ();
+ _region->clear_changes ();
_region->set_length (end_frame, this);
trackview.session()->add_command (new StatefulDiffCommand (_region));
}
- cerr << "region end finally at " << _region->position() + _region->length() - 1;
- apply_delta ();
+ apply_diff ();
}
struct EventNoteTimeEarlyFirstComparator {
void
MidiRegionView::goto_next_note ()
{
- // nframes64_t pos = -1;
+ // framepos_t pos = -1;
bool use_next = false;
if (_events.back()->selected()) {
void
MidiRegionView::goto_previous_note ()
{
- // nframes64_t pos = -1;
+ // framepos_t pos = -1;
bool use_next = false;
if (_events.front()->selected()) {
}
}
}
+
+void
+MidiRegionView::update_ghost_note (double x, double y)
+{
+ _last_ghost_x = x;
+ _last_ghost_y = y;
+
+ _note_group->w2i (x, y);
+ framepos_t f = trackview.editor().pixel_to_frame (x) + _region->position ();
+ trackview.editor().snap_to (f);
+ f -= _region->position ();
+
+ bool success;
+ Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, f);
+
+ if (!success) {
+ beats = 1;
+ }
+
+ double length = frames_to_beats (snap_frame_to_frame (f + beats_to_frames (beats)) - f);
+
+ _ghost_note->note()->set_time (frames_to_beats (f + _region->start()));
+ _ghost_note->note()->set_length (length);
+ _ghost_note->note()->set_note (midi_stream_view()->y_to_note (y));
+
+ update_note (_ghost_note);
+
+ show_verbose_canvas_cursor (_ghost_note->note ());
+}
+
+void
+MidiRegionView::create_ghost_note (double x, double y)
+{
+ delete _ghost_note;
+ _ghost_note = 0;
+
+ boost::shared_ptr<NoteType> g (new NoteType);
+ _ghost_note = new NoEventCanvasNote (*this, *_note_group, g);
+ update_ghost_note (x, y);
+ _ghost_note->show ();
+
+ _last_ghost_x = x;
+ _last_ghost_y = y;
+
+ show_verbose_canvas_cursor (_ghost_note->note ());
+}
+
+void
+MidiRegionView::snap_changed ()
+{
+ if (!_ghost_note) {
+ return;
+ }
+
+ create_ghost_note (_last_ghost_x, _last_ghost_y);
+}
+
+void
+MidiRegionView::show_verbose_canvas_cursor (boost::shared_ptr<NoteType> n) const
+{
+ char buf[24];
+ snprintf (buf, sizeof (buf), "%s (%d)\nVel %d",
+ Evoral::midi_note_name (n->note()).c_str(),
+ (int) n->note (),
+ (int) n->velocity());
+ trackview.editor().show_verbose_canvas_cursor_with (buf, 10, 20);
+}
+
+void
+MidiRegionView::drop_down_keys ()
+{
+ _mouse_state = None;
+}
+
+void
+MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, double y)
+{
+ double note = midi_stream_view()->y_to_note(y);
+ Events e;
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+
+ uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
+
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+ get_events (e, Evoral::Sequence<Evoral::MusicalTime>::PitchGreaterThanOrEqual, (uint8_t) floor (note), chn_mask);
+ } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ get_events (e, Evoral::Sequence<Evoral::MusicalTime>::PitchLessThanOrEqual, (uint8_t) floor (note), chn_mask);
+ } else {
+ return;
+ }
+
+ bool add_mrv_selection = false;
+
+ if (_selection.empty()) {
+ add_mrv_selection = true;
+ }
+
+ for (Events::iterator i = e.begin(); i != e.end(); ++i) {
+ if (_selection.insert (*i).second) {
+ (*i)->set_selected (true);
+ }
+ }
+
+ if (add_mrv_selection) {
+ PublicEditor& editor (trackview.editor());
+ editor.get_selection().add (this);
+ }
+}
+
+void
+MidiRegionView::color_handler ()
+{
+ RegionView::color_handler ();
+
+ for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+ (*i)->set_selected ((*i)->selected()); // will change color
+ }
+
+ /* XXX probably more to do here */
+}
+
+void
+MidiRegionView::enable_display (bool yn)
+{
+ RegionView::enable_display (yn);
+ if (yn) {
+ redisplay_model ();
+ }
+}
+
+void
+MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos)
+{
+ if (_step_edit_cursor == 0) {
+ ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+
+ _step_edit_cursor = new ArdourCanvas::SimpleRect (*group);
+ _step_edit_cursor->property_y1() = 0;
+ _step_edit_cursor->property_y2() = midi_stream_view()->contents_height();
+ _step_edit_cursor->property_fill_color_rgba() = RGBA_TO_UINT (45,0,0,90);
+ _step_edit_cursor->property_outline_color_rgba() = RGBA_TO_UINT (85,0,0,90);
+ }
+
+ move_step_edit_cursor (pos);
+ _step_edit_cursor->show ();
+}
+
+void
+MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos)
+{
+ _step_edit_cursor_position = pos;
+
+ if (_step_edit_cursor) {
+ double pixel = trackview.editor().frame_to_pixel (beats_to_frames (pos));
+ _step_edit_cursor->property_x1() = pixel;
+ set_step_edit_cursor_width (_step_edit_cursor_width);
+ }
+}
+
+void
+MidiRegionView::hide_step_edit_cursor ()
+{
+ if (_step_edit_cursor) {
+ _step_edit_cursor->hide ();
+ }
+}
+
+void
+MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
+{
+ _step_edit_cursor_width = beats;
+
+ if (_step_edit_cursor) {
+ _step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + trackview.editor().frame_to_pixel (beats_to_frames (beats));
+ }
+}
+
+/** Called when a diskstream on our track has received some data. Update the view, if applicable.
+ * @param buf Data that has been recorded.
+ * @param w Source that this data will end up in.
+ */
+void
+MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_ptr<MidiSource> w)
+{
+ if (!_active_notes) {
+ /* we aren't actively being recorded to */
+ return;
+ }
+
+ boost::shared_ptr<MidiSource> src = w.lock ();
+ if (!src || src != midi_region()->midi_source()) {
+ /* recorded data was not destined for our source */
+ return;
+ }
+
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (&trackview);
+ BeatsFramesConverter converter (trackview.session()->tempo_map(), mtv->midi_track()->get_capture_start_frame (0));
+
+ framepos_t back = max_framepos;
+
+ for (MidiBuffer::iterator i = buf->begin(); i != buf->end(); ++i) {
+ Evoral::MIDIEvent<MidiBuffer::TimeType> const ev (*i, false);
+ assert (ev.buffer ());
+
+ Evoral::MusicalTime const time_beats = converter.from (ev.time () - converter.origin_b ());
+
+ if (ev.type() == MIDI_CMD_NOTE_ON) {
+
+ boost::shared_ptr<Evoral::Note<Evoral::MusicalTime> > note (
+ new Evoral::Note<Evoral::MusicalTime> (ev.channel(), time_beats, 0, ev.note(), ev.velocity())
+ );
+
+ add_note (note, true);
+
+ /* fix up our note range */
+ if (ev.note() < _current_range_min) {
+ midi_stream_view()->apply_note_range (ev.note(), _current_range_max, true);
+ } else if (ev.note() > _current_range_max) {
+ midi_stream_view()->apply_note_range (_current_range_min, ev.note(), true);
+ }
+
+ } else if (ev.type() == MIDI_CMD_NOTE_OFF) {
+ resolve_note (ev.note (), time_beats);
+ }
+
+ back = ev.time ();
+ }
+
+ midi_stream_view()->check_record_layers (region(), back);
+}
+
+void
+MidiRegionView::trim_front_starting ()
+{
+ /* Reparent the note group to the region view's parent, so that it doesn't change
+ when the region view is trimmed.
+ */
+ _temporary_note_group = new ArdourCanvas::Group (*group->property_parent ());
+ _temporary_note_group->move (group->property_x(), group->property_y());
+ _note_group->reparent (*_temporary_note_group);
+}
+
+void
+MidiRegionView::trim_front_ending ()
+{
+ _note_group->reparent (*group);
+ delete _temporary_note_group;
+ _temporary_note_group = 0;
+
+ if (_region->start() < 0) {
+ /* Trim drag made start time -ve; fix this */
+ midi_region()->fix_negative_start ();
+ }
+}
+
+/** @return channel (counted from 0) to add an event to, based on the current setting
+ * of the channel selector.
+ */
+uint8_t
+MidiRegionView::get_channel_for_add () const
+{
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+ uint16_t const chn_mask = mtv->channel_selector().get_selected_channels();
+ int chn_cnt = 0;
+ uint8_t channel = 0;
+
+ /* pick the highest selected channel, unless all channels are selected,
+ which is interpreted to mean channel 1 (zero)
+ */
+
+ for (uint16_t i = 0; i < 16; ++i) {
+ if (chn_mask & (1<<i)) {
+ channel = i;
+ chn_cnt++;
+ }
+ }
+
+ if (chn_cnt == 16) {
+ channel = 0;
+ }
+
+ return channel;
+}
+
+void
+MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc)
+{
+ PatchChangeDialog d (&_time_converter, trackview.session(), *pc->patch (), Gtk::Stock::APPLY);
+ if (d.run () != Gtk::RESPONSE_ACCEPT) {
+ return;
+ }
+
+ change_patch_change (pc->patch(), d.patch ());
+}
projects / ardour.git / blobdiff