/*
- Copyright (C) 2001-2007 Paul Davis
- Author: Dave Robillard
+ Copyright (C) 2001-2011 Paul Davis
+ Author: David Robillard
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "automation_time_axis.h"
#include "canvas-hit.h"
#include "canvas-note.h"
-#include "canvas-program-change.h"
+#include "canvas_patch_change.h"
+#include "debug.h"
#include "editor.h"
#include "ghostregion.h"
#include "gui_thread.h"
#include "keyboard.h"
+#include "midi_channel_dialog.h"
#include "midi_cut_buffer.h"
#include "midi_list_editor.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 "streamview.h"
#include "utils.h"
#include "mouse_cursors.h"
+#include "patch_change_dialog.h"
+#include "verbose_cursor.h"
#include "i18n.h"
using Gtkmm2ext::Keyboard;
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
- boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
+ boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
: RegionView (parent, tv, r, spu, basic_color)
, _force_channel(-1)
, _last_channel_selection(0xFFFF)
, _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)
+ , _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)
+ , _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (0)
- , pre_enter_cursor (0)
+ , _pre_enter_cursor (0)
{
_note_group->raise_to_top();
- PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+ PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
connect_to_diskstream ();
}
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
- boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color,
- TimeAxisViewItem::Visibility visibility)
+ boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color,
+ TimeAxisViewItem::Visibility visibility)
: RegionView (parent, tv, r, spu, basic_color, false, visibility)
, _force_channel(-1)
, _last_channel_selection(0xFFFF)
, _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)
+ , _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)
+ , _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));
+ PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
connect_to_diskstream ();
}
, _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)
+ , _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)
+ , _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (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)
+ , _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)
+ , _no_sound_notes (false)
, _last_event_x (0)
, _last_event_y (0)
{
void
MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
{
- PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+ 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());
+ CanvasNoteEvent::CanvasNoteEventDeleted.connect (note_delete_connection, MISSING_INVALIDATOR,
+ ui_bind (&MidiRegionView::maybe_remove_deleted_note_from_selection, this, _1),
+ gui_context());
if (wfd) {
midi_region()->midi_source(0)->load_model();
}
group->raise_to_top();
- group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false);
+ group->signal_event().connect(
+ sigc::mem_fun(this, &MidiRegionView::canvas_event), false);
midi_view()->signal_channel_mode_changed().connect(
- sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
+ sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
midi_view()->signal_midi_patch_settings_changed().connect(
- sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+ 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 ());
+ 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 ());
+ midi_view()->midi_track()->DataRecorded.connect(
+ *this, invalidator(*this),
+ ui_bind(&MidiRegionView::data_recorded, this, _1, _2),
+ gui_context());
}
bool
default:
break;
}
-
+
if (!trackview.editor().internal_editing()) {
return false;
}
- /* 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:
- return scroll (&ev->scroll);
+ return scroll (&ev->scroll);
case GDK_KEY_PRESS:
- return key_press (&ev->key);
+ return key_press (&ev->key);
case GDK_KEY_RELEASE:
- return key_release (&ev->key);
+ return key_release (&ev->key);
case GDK_BUTTON_PRESS:
- return button_press (&ev->button);
+ return button_press (&ev->button);
case GDK_2BUTTON_PRESS:
return true;
case GDK_BUTTON_RELEASE:
- return button_release (&ev->button);
-
+ return button_release (&ev->button);
+
case GDK_ENTER_NOTIFY:
- return enter_notify (&ev->crossing);
+ return enter_notify (&ev->crossing);
case GDK_LEAVE_NOTIFY:
- return leave_notify (&ev->crossing);
+ return leave_notify (&ev->crossing);
case GDK_MOTION_NOTIFY:
- return motion (&ev->motion);
+ return motion (&ev->motion);
- default:
- break;
+ default:
+ break;
}
return false;
void
MidiRegionView::remove_ghost_note ()
{
- delete _ghost_note;
- _ghost_note = 0;
+ delete _ghost_note;
+ _ghost_note = 0;
}
bool
{
trackview.editor().MouseModeChanged.connect (
_mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
- );
+ );
- Keyboard::magic_widget_grab_focus();
- group->grab_focus();
+ Keyboard::magic_widget_grab_focus();
+ group->grab_focus();
if (trackview.editor().current_mouse_mode() == MouseRange) {
create_ghost_note (ev->x, ev->y);
}
- return false;
+ return false;
}
bool
MidiRegionView::leave_notify (GdkEventCrossing*)
{
_mouse_mode_connection.disconnect ();
-
- trackview.editor().hide_verbose_canvas_cursor ();
+
+ trackview.editor().verbose_cursor()->hide ();
remove_ghost_note ();
- return false;
+ return false;
}
void
create_ghost_note (_last_event_x, _last_event_y);
} else {
remove_ghost_note ();
- trackview.editor().hide_verbose_canvas_cursor ();
+ trackview.editor().verbose_cursor()->hide ();
}
}
bool
MidiRegionView::button_press (GdkEventButton* ev)
{
- _last_x = ev->x;
- _last_y = ev->y;
- group->w2i (_last_x, _last_y);
-
- if (_mouse_state != SelectTouchDragging && ev->button == 1) {
- _pressed_button = ev->button;
- _mouse_state = Pressed;
- return true;
- }
-
- _pressed_button = ev->button;
+ if (ev->button != 1) {
+ return false;
+ }
+
+ _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;
+
+ return true;
+ }
- return true;
+ _pressed_button = ev->button;
+
+ return true;
}
bool
double event_x, event_y;
framepos_t event_frame = 0;
- 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);
-
- if (ev->button == 3) {
- return false;
- } else if (_pressed_button != 1) {
- return false;
- }
-
- switch (_mouse_state) {
- case Pressed: // Clicked
- switch (trackview.editor().current_mouse_mode()) {
- case MouseObject:
- case MouseTimeFX:
- clear_selection();
- maybe_select_by_position (ev, event_x, event_y);
- 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;
-
- 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), true);
- }
-
- delete _drag_rect;
- _drag_rect = 0;
-
- create_ghost_note (ev->x, ev->y);
-
- default:
- break;
- }
-
- return false;
+ if (ev->button != 1) {
+ return false;
+ }
+
+ 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);
+
+ 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;
+ }
+ 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;
+
+ 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(), frames_to_beats(length), true);
+ }
+ }
+
+ delete _drag_rect;
+ _drag_rect = 0;
+
+ create_ghost_note (ev->x, ev->y);
+
+ default:
+ break;
+ }
+
+ return false;
}
bool
double event_x, event_y;
framepos_t event_frame = 0;
- event_x = ev->x;
- event_y = ev->y;
- group->w2i(event_x, event_y);
+ event_x = ev->x;
+ event_y = ev->y;
+ group->w2i(event_x, event_y);
+
+ // convert event_x to global frame
+ event_frame = snap_pixel_to_frame (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) {
- // 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();
+ delete _ghost_note;
+ _ghost_note = 0;
- if (_ghost_note) {
- update_ghost_note (ev->x, ev->y);
- }
+ trackview.editor().verbose_cursor()->hide ();
+ } 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 */
- /* any motion immediately hides velocity text that may have been visible */
-
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
(*i)->hide_velocity ();
}
- 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) {
- 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;
+ 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 && trackview.editor().current_mouse_mode() == MouseObject
+ && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+ // Select 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;
+
+ _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;
+
+ } else if (trackview.editor().internal_editing()) {
// 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;
- return true;
- }
-
- return false;
-
- case SelectRectDragging: // Select drag motion
- 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 = trackview.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;
- }
-
- 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;
-
- update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y);
- }
-
- _last_x = event_x;
- _last_y = event_y;
-
- case SelectTouchDragging:
- return false;
-
- default:
- break;
- }
-
- return false;
+
+ 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().verbose_cursor()->hide ();
+ }
+
+ return true;
+ }
+
+ return false;
+
+ case SelectRectDragging: // Select drag motion
+ 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 = trackview.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;
+ }
+ }
+
+ 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;
+ }
+
+ update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y);
+ }
+
+ _last_x = event_x;
+ _last_y = event_y;
+
+ case SelectTouchDragging:
+ return false;
+
+ default:
+ break;
+ }
+
+ return false;
}
bool
MidiRegionView::scroll (GdkEventScroll* ev)
{
- if (_selection.empty()) {
- return false;
- }
+ if (_selection.empty()) {
+ return false;
+ }
+
+ trackview.editor().verbose_cursor()->hide ();
- trackview.editor().hide_verbose_canvas_cursor ();
+ bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
- 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;
+ 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;
+{
+ /* 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;
+
+ } else if (ev->keyval == GDK_c) {
+ channel_edit ();
+ 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;
+ if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R) {
+ _mouse_state = None;
+ return true;
+ }
+ return false;
+}
+
+void
+MidiRegionView::channel_edit ()
+{
+ bool first = true;
+ bool mixed = false;
+ uint8_t current_channel;
+
+ if (_selection.empty()) {
+ return;
+ }
+
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ Selection::iterator next = i;
+ if (first) {
+ current_channel = (*i)->note()->channel ();
+ first = false;
+ } else {
+ if (current_channel != (*i)->note()->channel()) {
+ mixed = true;
+ }
+ }
+ }
+
+ MidiChannelDialog channel_dialog (current_channel);
+ int ret = channel_dialog.run ();
+
+ switch (ret) {
+ case Gtk::RESPONSE_OK:
+ break;
+ default:
+ return;
+ }
+
+ uint8_t new_channel = channel_dialog.active_channel ();
+
+ start_note_diff_command (_("channel edit"));
+
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+ Selection::iterator next = i;
+ ++next;
+ change_note_channel (*i, new_channel);
+ i = next;
+ }
+
+ apply_diff ();
}
void
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
- framepos_t const start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
+ framepos_t const start_frames = snap_pixel_to_frame (x);
assert(start_frames >= 0);
// Snap length
length = frames_to_beats(
- snap_frame_to_frame(start_frames + beats_to_frames(length)) - start_frames);
+ snap_frame_to_frame(start_frames + beats_to_frames(length)) - start_frames);
assert (length != 0);
length = frames_to_beats (beats_to_frames (length) - 1);
}
- uint16_t 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)
- */
+ const boost::shared_ptr<NoteType> new_note (new NoteType (mtv->get_channel_for_add (),
+ frames_to_beats(start_frames + _region->start()), length,
+ (uint8_t)note, 0x40));
- for (uint16_t i = 0; i < 16; ++i) {
- if (chn_mask & (1<<i)) {
- channel = i;
- chn_cnt++;
- }
- }
-
- if (chn_cnt == 16) {
- channel = 0;
- }
-
- const boost::shared_ptr<NoteType> new_note (new NoteType (channel,
- frames_to_beats(start_frames + _region->start()), length,
- (uint8_t)note, 0x40));
-
- if (_model->contains (new_note)) {
- return;
- }
+ if (_model->contains (new_note)) {
+ return;
+ }
view->update_note_range(new_note->note());
}
_events.clear();
- _pgm_changes.clear();
+ _patch_changes.clear();
_sys_exes.clear();
_optimization_iterator = _events.end();
}
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::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
- MidiModel::NoteDiffCommand::Property property,
- uint8_t val)
+ MidiModel::NoteDiffCommand::Property property,
+ uint8_t val)
{
if (_note_diff_command) {
_note_diff_command->change (ev->note(), property, val);
void
MidiRegionView::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
- MidiModel::NoteDiffCommand::Property property,
- Evoral::MusicalTime val)
+ MidiModel::NoteDiffCommand::Property property,
+ Evoral::MusicalTime val)
{
if (_note_diff_command) {
_note_diff_command->change (ev->note(), property, val);
}
void
-MidiRegionView::apply_diff ()
+MidiRegionView::apply_diff (bool as_subcommand)
{
- bool add_or_remove;
+ bool add_or_remove;
if (!_note_diff_command) {
return;
}
- 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(*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_velocity.clear();
-}
-
-void
-MidiRegionView::apply_diff_as_subcommand ()
-{
- bool add_or_remove;
-
- if (!_note_diff_command) {
- return;
+ 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());
+ }
}
- 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());
- }
- }
+ if (as_subcommand) {
+ _model->apply_command_as_subcommand (*trackview.session(), _note_diff_command);
+ } else {
+ _model->apply_command (*trackview.session(), _note_diff_command);
+ }
- _model->apply_command_as_subcommand(*trackview.session(), _note_diff_command);
_note_diff_command = 0;
midi_view()->midi_track()->playlist_modified();
- if (add_or_remove) {
- _marked_for_selection.clear();
- }
+ if (add_or_remove) {
+ _marked_for_selection.clear();
+ }
+
_marked_for_velocity.clear();
}
-
void
MidiRegionView::abort_command()
{
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);
+ 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);
- }
- }
+ for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+ CanvasNoteEvent* cne = find_canvas_note (*n);
+ if (cne) {
+ e.push_back (cne);
+ }
+ }
}
void
}
if (!_model) {
- cerr << "MidiRegionView::redisplay_model called without a model" << endmsg;
return;
}
}
}
- _pgm_changes.clear();
+ _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 ()
{
MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
- for (uint8_t i = 0; i < 16; ++i) {
- if (chn_mask & (1<<i)) {
- display_program_changes_on_channel (i);
- }
- }
+ for (uint8_t i = 0; i < 16; ++i) {
+ if (chn_mask & (1<<i)) {
+ display_patch_changes_on_channel (i);
+ }
+ }
}
void
-MidiRegionView::display_program_changes_on_channel(uint8_t channel)
+MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
{
- boost::shared_ptr<Evoral::Control> control =
- _model->control(Evoral::MIDI::ProgramChange (MidiPgmChangeAutomation, channel));
-
- if (!control) {
- return;
- }
+ for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) {
- Glib::Mutex::Lock lock (control->list()->lock());
-
- 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);
-
- // 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_double(true, event_time) + 0.5));
- }
-
- // 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_double(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);
+ _model_name, _custom_device_mode, channel, patch_key);
if (patch != 0) {
- add_pgm_change(program_change, patch->name());
+ add_canvas_patch_change (*i, patch->name());
} else {
- char buf[4];
- // program_number is zero-based: convert to one-based
- snprintf(buf, 4, "%d", int(program_number+1));
- add_pgm_change(program_change, buf);
+ char buf[16];
+ /* program and bank numbers are zero-based: convert to one-based */
+ snprintf (buf, 16, "%d\n%d", (*i)->program() + 1, (*i)->bank() + 1);
+ add_canvas_patch_change (*i, buf);
}
}
}
double height = midi_stream_view()->contents_height();
boost::shared_ptr<CanvasSysEx> sysex = boost::shared_ptr<CanvasSysEx>(
- new CanvasSysEx(*this, *_note_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 ();
+ trackview.editor().verbose_cursor()->hide ();
- note_delete_connection.disconnect ();
+ note_delete_connection.disconnect ();
delete _list_editor;
delete _note_group;
delete _note_diff_command;
- delete _step_edit_cursor;
+ delete _step_edit_cursor;
delete _temporary_note_group;
}
if (_enable_display) {
redisplay_model();
}
-
- move_step_edit_cursor (_step_edit_cursor_position);
- set_step_edit_cursor_width (_step_edit_cursor_width);
+
+ 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 (PgmChanges::iterator x = _pgm_changes.begin(); x != _pgm_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();
- }
+ 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();
+ }
}
if (mtv && mtv->midi_view()) {
/* if ghost is inserted into midi track, use a dedicated midi ghost canvas group
to allow having midi notes on top of note lines and waveforms.
- */
+ */
ghost = new MidiGhostRegion (*mtv->midi_view(), trackview, unit_position);
} else {
ghost = new MidiGhostRegion (tv, trackview, unit_position);
}
- ghost->set_height ();
- ghost->set_duration (_region->length() / samples_per_unit);
- ghosts.push_back (ghost);
-
for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
if ((note = dynamic_cast<CanvasNote*>(*i)) != 0) {
ghost->add_note(note);
}
}
+ ghost->set_height ();
+ ghost->set_duration (_region->length() / samples_per_unit);
+ ghosts.push_back (ghost);
+
GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
return ghost;
}
if (_active_notes && _active_notes[note]) {
- const framepos_t end_time_frames = beats_to_frames(end_time) - _region->start();
+
+ 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)
{
- if (no_sound_notes || !trackview.editor().sound_notes()) {
+ if (_no_sound_notes || !trackview.editor().sound_notes()) {
return;
}
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
-
- if (!route_ui || !route_ui->midi_track()) {
- return;
- }
- NotePlayer* np = new NotePlayer (route_ui->midi_track());
- np->add (note);
- np->play ();
+ if (!route_ui || !route_ui->midi_track()) {
+ return;
+ }
+
+ NotePlayer* np = new NotePlayer (route_ui->midi_track());
+ np->add (note);
+ np->play ();
}
void
MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
{
- if (no_sound_notes || !trackview.editor().sound_notes()) {
+ if (_no_sound_notes || !trackview.editor().sound_notes()) {
return;
}
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
-
- if (!route_ui || !route_ui->midi_track()) {
- return;
- }
- NotePlayer* np = new NotePlayer (route_ui->midi_track());
+ if (!route_ui || !route_ui->midi_track()) {
+ return;
+ }
- for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
- np->add (*n);
- }
+ NotePlayer* np = new NotePlayer (route_ui->midi_track());
+
+ for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
+ np->add (*n);
+ }
- np->play ();
+ np->play ();
}
return !outside;
}
+/** Update a canvas note's size from its model note.
+ * @param ev Canvas note to update.
+ * @param update_ghost_regions true to update the note in any ghost regions that we have, otherwise false.
+ */
void
-MidiRegionView::update_note (CanvasNote* ev)
+MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions)
{
boost::shared_ptr<NoteType> note = ev->note();
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) {
/* outline all edges */
ev->property_outline_what() = (guint32) 0xF;
}
+
+ if (update_ghost_regions) {
+ for (std::vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+ MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*i);
+ if (gr) {
+ gr->update_note (ev);
+ }
+ }
+ }
}
double
assert(note->time() >= 0);
assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
+ //ArdourCanvas::Group* const group = (ArdourCanvas::Group*) get_canvas_group();
+
if (midi_view()->note_mode() == Sustained) {
CanvasNote* ev_rect = new CanvasNote(*this, *_note_group, note);
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
framepos_t region_end = _region->position() + _region->length() - 1;
if (end_frame > region_end) {
- _region->set_length (end_frame - _region->position(), this);
+ _region->set_length (end_frame - _region->position());
}
- _marked_for_selection.clear ();
- clear_selection ();
+ 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;
+ // last_step_edit_note = new_note;
}
void
MidiRegionView::step_sustain (Evoral::MusicalTime beats)
{
- change_note_lengths (false, false, beats, false, true);
+ change_note_lengths (false, false, beats, false, true);
}
void
-MidiRegionView::add_pgm_change(PCEvent& program, const string& displaytext)
+MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext)
{
- assert(program.time >= 0);
+ assert (patch->time() >= 0);
- const double x = trackview.editor().frame_to_pixel(beats_to_frames(program.time));
+ 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, *_note_group,
- displaytext,
- height,
- x, 1.0,
- _model_name,
- _custom_device_mode,
- program.time, program.channel, program.value));
+ 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,
+ patch)
+ );
- // Show unless program change is beyond the region bounds
- if (program.time - _region->start() >= _region->length() || program.time < _region->start()) {
- pgm_change->hide();
+ // Show unless patch change is beyond the region bounds
+ if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) {
+ patch_change->hide();
} else {
- pgm_change->show();
+ patch_change->show();
}
- _pgm_changes.push_back(pgm_change);
+ _patch_changes.push_back (patch_change);
}
void
-MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
+MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
{
- Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK);
- boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
- double msb = 0.0;
- if (msb_control != 0) {
- msb = int(msb_control->get_double(true, time));
- }
-
- Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK);
- boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
- double lsb = 0.0;
- if (lsb_control != 0) {
- lsb = lsb_control->get_double(true, time);
+ MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time);
+ while (i != _model->patch_changes().end() && (*i)->channel() != channel) {
+ ++i;
}
- Evoral::Parameter program_change(MidiPgmChangeAutomation, channel, 0);
- boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
- double program_number = -1.0;
- if (program_control != 0) {
- program_number = program_control->get_double(true, time);
+ if (i != _model->patch_changes().end()) {
+ key.msb = (*i)->bank_msb ();
+ key.lsb = (*i)->bank_lsb ();
+ key.program_number = (*i)->program ();
+ } else {
+ key.msb = key.lsb = key.program_number = 0;
}
- 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());
+ assert (key.is_sane());
}
void
-MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch)
+MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch)
{
- // 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_double(double(new_patch.msb), true, old_program.time);
- }
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change"));
- // 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_double(double(new_patch.lsb), true, old_program.time);
+ if (pc.patch()->program() != new_patch.program_number) {
+ c->change_program (pc.patch (), new_patch.program_number);
}
- Evoral::Parameter program_change(MidiPgmChangeAutomation, old_program.channel, 0);
- boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
+ int const new_bank = (new_patch.msb << 7) | new_patch.lsb;
+ if (pc.patch()->bank() != new_bank) {
+ c->change_bank (pc.patch (), new_bank);
+ }
- assert(program_control != 0);
- program_control->set_double(float(new_patch.program_number), true, old_program.time);
+ _model->apply_command (*trackview.session(), c);
- _pgm_changes.clear ();
- display_program_changes (); // XXX would be nice to limit to just old_program.channel
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
-MidiRegionView::move_program_change (PCEvent pc, double t)
+MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const Evoral::PatchChange<Evoral::MusicalTime> & new_change)
{
- boost::shared_ptr<Evoral::Control> control = _model->control (Evoral::Parameter (MidiPgmChangeAutomation, pc.channel, 0));
- assert (control);
+ 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());
+ }
+
+ 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());
+ }
+
+ if (old_change->bank() != new_change.bank()) {
+ c->change_bank (old_change, new_change.bank());
+ }
- control->list()->erase (pc.time, pc.value);
- control->list()->add (t, pc.value);
+ _model->apply_command (*trackview.session(), c);
- _pgm_changes.clear ();
- display_program_changes ();
+ _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
+ * MidiTimeAxisView::get_channel_for_add())
+ */
void
-MidiRegionView::delete_program_change (CanvasProgramChange* pc)
+MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange<Evoral::MusicalTime> const & patch)
{
- boost::shared_ptr<Evoral::Control> control = _model->control (Evoral::Parameter (MidiPgmChangeAutomation, pc->channel(), 0));
- assert (control);
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+
+ 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()), mtv->get_channel_for_add(), patch.program(), patch.bank()
+ )
+ ));
+
+ _model->apply_command (*trackview.session(), c);
- control->list()->erase (pc->event_time(), pc->program());
- _pgm_changes.clear ();
- display_program_changes ();
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
-MidiRegionView::program_selected(CanvasProgramChange& program, const MIDI::Name::PatchPrimaryKey& new_patch)
+MidiRegionView::move_patch_change (CanvasPatchChange& pc, Evoral::MusicalTime t)
{
- 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 (_("move patch change"));
+ c->change_time (pc.patch (), t);
+ _model->apply_command (*trackview.session(), c);
+
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
-MidiRegionView::previous_program(CanvasProgramChange& program)
+MidiRegionView::delete_patch_change (CanvasPatchChange* pc)
{
- if (program.program() < 127) {
- MIDI::Name::PatchPrimaryKey key;
- get_patch_key_at(program.event_time(), program.channel(), key);
- PCEvent program_change_event(program.event_time(), program.program(), program.channel());
+ MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("delete patch change"));
+ c->remove (pc->patch ());
+ _model->apply_command (*trackview.session(), c);
- key.program_number++;
- alter_program_change(program_change_event, key);
- }
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
-MidiRegionView::next_program(CanvasProgramChange& program)
+MidiRegionView::previous_patch (CanvasPatchChange& patch)
{
- if (program.program() > 0) {
- MIDI::Name::PatchPrimaryKey key;
- get_patch_key_at(program.event_time(), program.channel(), key);
- PCEvent program_change_event(program.event_time(), program.program(), program.channel());
+ 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);
+ }
+}
- key.program_number--;
- alter_program_change(program_change_event, 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
MidiRegionView::maybe_remove_deleted_note_from_selection (CanvasNoteEvent* cne)
{
- if (_selection.empty()) {
- return;
- }
-
- if (_selection.erase (cne) > 0) {
- cerr << "Erased a CNE from selection\n";
- }
+ if (_selection.empty()) {
+ return;
+ }
+
+ if (_selection.erase (cne) > 0) {
+ cerr << "Erased a CNE from selection\n";
+ }
}
void
_note_diff_command->remove (n);
apply_diff ();
- trackview.editor().hide_verbose_canvas_cursor ();
+ trackview.editor().verbose_cursor()->hide ();
}
void
}
}
+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 (!add) {
+ clear_selection ();
+ }
if (extend && _selection.empty()) {
extend = false;
high_note = max (high_note, notenum);
}
- no_sound_notes = true;
+ _no_sound_notes = true;
for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
if (select) {
if ((cne = find_canvas_note (note)) != 0) {
- // extend is false because we've taken care of it,
+ // extend is false because we've taken care of it,
// since it extends by time range, not pitch.
note_selected (cne, add, false);
}
}
-
+
add = true; // we need to add all remaining matching notes, even if the passed in value was false (for "set")
}
- no_sound_notes = false;
+ _no_sound_notes = false;
}
void
/* 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.
- */
+ 1) this is computing "touched by", not "contained by" the rect.
+ 2) this does not require that events be sorted in time.
+ */
const double ix1 = (*i)->x1();
const double ix2 = (*i)->x2();
if (_selection.insert (ev).second) {
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, double cumulative_dy)
{
- typedef vector<boost::shared_ptr<NoteType> > PossibleChord;
- PossibleChord to_play;
- Evoral::MusicalTime earliest = Evoral::MaxMusicalTime;
+ 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();
- }
- }
+ 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());
- }
+ 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 (dy && !_selection.empty() && !_no_sound_notes && trackview.editor().sound_notes()) {
- if (to_play.size() > 1) {
+ if (to_play.size() > 1) {
- PossibleChord shifted;
+ 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);
- }
+ 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);
+ play_midi_chord (shifted);
- } else if (!to_play.empty()) {
+ } 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);
- }
- }
+ 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
}
/*
- cerr << "dnote: " << (int) dnote << endl;
- cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note())
- << " highest note (streamview): " << int(midi_stream_view()->highest_note()) << endl;
- cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): "
- << int(highest_note_in_selection) << endl;
- cerr << "selection size: " << _selection.size() << endl;
- cerr << "Highest note in selection: " << (int) highest_note_in_selection << endl;
+ cerr << "dnote: " << (int) dnote << endl;
+ cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note())
+ << " highest note (streamview): " << int(midi_stream_view()->highest_note()) << endl;
+ cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): "
+ << int(highest_note_in_selection) << endl;
+ cerr << "selection size: " << _selection.size() << endl;
+ cerr << "Highest note in selection: " << (int) highest_note_in_selection << endl;
*/
// Make sure the note pitch does not exceed the MIDI standard range
// keep original pitch if note is dragged outside valid midi range
if ((original_pitch != 0 && new_pitch == 0)
- || (original_pitch != 127 && new_pitch == 127)) {
+ || (original_pitch != 127 && new_pitch == 127)) {
new_pitch = original_pitch;
}
framepos_t
MidiRegionView::snap_pixel_to_frame(double x)
{
- PublicEditor& editor = trackview.editor();
- // x is region relative, convert it to global absolute frames
- framepos_t frame = editor.pixel_to_frame(x) + _region->position();
- editor.snap_to(frame);
- return frame - _region->position(); // convert back to region relative
+ PublicEditor& editor (trackview.editor());
+ return snap_frame_to_frame (editor.pixel_to_frame (x));
}
-framepos_t
-MidiRegionView::snap_frame_to_frame(framepos_t x)
+/** Snap a frame offset within our region using the current snap settings.
+ * @param x Frame offset from this region's position.
+ * @return Snapped frame offset from this region's position.
+ */
+frameoffset_t
+MidiRegionView::snap_frame_to_frame (frameoffset_t x)
{
PublicEditor& editor = trackview.editor();
- // x is region relative, convert it to global absolute frames
- framepos_t frame = x + _region->position();
- editor.snap_to(frame);
- return frame - _region->position(); // convert back to region relative
+
+ /* x is region relative, convert it to global absolute frames */
+ framepos_t const session_frame = x + _region->position();
+
+ /* try a snap in either direction */
+ framepos_t frame = session_frame;
+ editor.snap_to (frame, 0);
+
+ /* if we went off the beginning of the region, snap forwards */
+ if (frame < _region->position ()) {
+ frame = session_frame;
+ editor.snap_to (frame, 1);
+ }
+
+ /* back to region relative */
+ return frame - _region->position();
}
double
// create a new SimpleRect from the note which will be the resize preview
SimpleRect *resize_rect = new SimpleRect(
- *_note_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(
- ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(),
- 128);
+ ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(),
+ 128);
// make the resize preview notes more transparent and bright
fill_color = UINT_INTERPOLATE(fill_color, 0xFFFFFF40, 0.5);
// calculate color based on note velocity
resize_rect->property_fill_color_rgba() = UINT_INTERPOLATE(
- CanvasNoteEvent::meter_style_fill_color(note->note()->velocity(), note->selected()),
- fill_color,
- 0.85);
+ CanvasNoteEvent::meter_style_fill_color(note->note()->velocity(), note->selected()),
+ fill_color,
+ 0.85);
resize_rect->property_outline_color_rgba() = CanvasNoteEvent::calculate_outline(
- ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get());
+ ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get());
resize_data->resize_rect = resize_rect;
_resize_data.push_back(resize_data);
/** 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 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
void
MidiRegionView::update_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at_front, double delta_x, bool relative)
{
- bool cursor_set = false;
+ bool cursor_set = false;
for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
SimpleRect* resize_rect = (*i)->resize_rect;
resize_rect->property_x1() = canvas_note->x1();
}
- if (!cursor_set) {
- double beats;
+ if (!cursor_set) {
+ double beats;
- beats = snap_pixel_to_frame (current_x);
- beats = frames_to_beats (beats);
-
- double len;
+ beats = snap_pixel_to_frame (current_x);
+ beats = frames_to_beats (beats);
- 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;
- }
- }
+ double len;
- char buf[16];
- snprintf (buf, sizeof (buf), "%.3g beats", len);
- trackview.editor().show_verbose_canvas_cursor_with (buf);
+ 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;
+ }
+ }
- cursor_set = true;
- }
+ char buf[16];
+ snprintf (buf, sizeof (buf), "%.3g beats", len);
+ show_verbose_cursor (buf, 0, 0);
+
+ cursor_set = true;
+ }
}
}
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;
}
- event->set_selected (event->selected()); // change color
-
+ event->set_selected (event->selected()); // change color
+
note_diff_add_change (event, MidiModel::NoteDiffCommand::Velocity, new_velocity);
}
/* NOTE: the semantics of the two delta arguments are slightly subtle:
front_delta: if positive - move the start of the note later in time (shortening it)
- if negative - move the start of the note earlier in time (lengthening it)
+ if negative - move the start of the note earlier in time (lengthening it)
end_delta: if positive - move the end of the note later in time (lengthening it)
- if negative - move the end of the note earlier in time (shortening it)
- */
+ if negative - move the end of the note earlier in time (shortening it)
+ */
if (front_delta) {
if (front_delta < 0) {
}
}
+void
+MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t chn, bool relative)
+{
+ uint8_t new_channel;
+
+ if (relative) {
+ if (chn < 0.0) {
+ if (event->note()->channel() < -chn) {
+ new_channel = 0;
+ } else {
+ new_channel = event->note()->channel() + chn;
+ }
+ } else {
+ new_channel = event->note()->channel() + chn;
+ }
+ } else {
+ new_channel = (uint8_t) chn;
+ }
+
+ note_diff_add_change (event, MidiModel::NoteDiffCommand::Channel, new_channel);
+}
+
void
MidiRegionView::change_note_time (CanvasNoteEvent* event, Evoral::MusicalTime delta, bool relative)
{
}
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);
- }
+
+ if (!_selection.empty()) {
+ char buf[24];
+ snprintf (buf, sizeof (buf), "Vel %d",
+ (int) (*_selection.begin())->note()->velocity());
+ show_verbose_cursor (buf, 10, 10);
+ }
}
void
MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTime delta, bool start, bool end)
{
- 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 (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;
framepos_t distance;
if (trackview.editor().snap_mode() == Editing::SnapOff) {
-
+
/* grid is off - use nudge distance */
distance = trackview.editor().get_nudge_distance (ref_point, unused);
if (forward) {
if (max_framepos - 1 < next_pos) {
- next_pos += 1;
- }
+ next_pos += 1;
+ }
} else {
if (next_pos == 0) {
return;
MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
{
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);
}
- show_verbose_canvas_cursor (ev->note ());
+ show_verbose_cursor (ev->note ());
}
void
(*i)->hide_velocity ();
}
- editor->hide_verbose_canvas_cursor ();
+ 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;
+ }
+}
+
+void
+MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev)
+{
+ ostringstream s;
+ s << ((int) ev->patch()->program() + 1) << ":" << (ev->patch()->bank() + 1);
+ show_verbose_cursor (s.str(), 10, 20);
+}
+
+void
+MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *)
+{
+ trackview.editor().verbose_cursor()->hide ();
}
void
{
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);
- }
- }
+ 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
MidiRegionView::set_frame_color()
{
- if (frame) {
- if (_selected && should_show_selection) {
- frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
- } else {
- frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get();
- }
+ uint32_t f;
+
+ TimeAxisViewItem::set_frame_color ();
+
+ if (!frame) {
+ return;
}
+
+ if (_selected) {
+ f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
+ } else if (high_enough_for_name) {
+ f= ARDOUR_UI::config()->canvasvar_MidiFrameBase.get();
+ } else {
+ f = fill_color;
+ }
+
+ if (!rect_visible) {
+ f = UINT_RGBA_CHANGE_A (f, 0);
+ }
+
+ frame->property_fill_color_rgba() = f;
}
void
}
_last_channel_selection = mask;
+
+ _patch_changes.clear ();
+ display_patch_changes ();
}
void
PublicEditor& editor (trackview.editor());
switch (op) {
+ case Delete:
+ /* XXX what to do ? */
+ break;
case Cut:
case Copy:
editor.get_cut_buffer().add (selection_as_cut_buffer());
break;
}
- if (op != Copy) {
+ if (op != Copy) {
+
+ start_note_diff_command();
+
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ switch (op) {
+ case Copy:
+ break;
+ case Delete:
+ case Cut:
+ case Clear:
+ note_diff_remove_note (*i);
+ break;
+ }
+ }
- start_note_diff_command();
-
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
- switch (op) {
- case Copy:
- break;
- case Cut:
- case Clear:
- note_diff_remove_note (*i);
- break;
- }
- }
-
- apply_diff();
- }
+ apply_diff();
+ }
}
MidiCutBuffer*
Notes notes;
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
- NoteType* n = (*i)->note().get();
+ NoteType* n = (*i)->note().get();
notes.insert (boost::shared_ptr<NoteType> (new NoteType (*n)));
}
return cb;
}
+/** This method handles undo */
void
MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
{
return;
}
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("MIDI paste @ %1 times %2\n", pos, times));
+
+ trackview.session()->begin_reversible_command (_("paste"));
+
start_note_diff_command (_("paste"));
Evoral::MusicalTime beat_delta;
beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats;
paste_pos_beats = 0;
- clear_selection ();
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6 ; beat delta = %7\n",
+ (*mcb.notes().begin())->time(),
+ (*mcb.notes().rbegin())->end_time(),
+ duration, pos, _region->position(),
+ paste_pos_beats, beat_delta));
+
+ clear_selection ();
for (int n = 0; n < (int) times; ++n) {
if (end_frame > region_end) {
- trackview.session()->begin_reversible_command (_("paste"));
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste extended region from %1 to %2\n", region_end, end_frame));
- _region->clear_changes ();
- _region->set_length (end_frame, this);
+ _region->clear_changes ();
+ _region->set_length (end_frame);
trackview.session()->add_command (new StatefulDiffCommand (_region));
}
- apply_diff ();
+ apply_diff (true);
+
+ trackview.session()->commit_reversible_command ();
}
struct EventNoteTimeEarlyFirstComparator {
- bool operator() (CanvasNoteEvent* a, CanvasNoteEvent* b) {
- return a->note()->time() < b->note()->time();
- }
+ bool operator() (CanvasNoteEvent* a, CanvasNoteEvent* b) {
+ return a->note()->time() < b->note()->time();
+ }
};
void
void
MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_selected)
{
- bool had_selected = false;
+ bool had_selected = false;
time_sort_events ();
for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
if ((*i)->selected()) {
selected.insert ((*i)->note());
- had_selected = true;
+ had_selected = true;
}
}
-
- if (allow_all_if_none_selected && !had_selected) {
- for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
- selected.insert ((*i)->note());
+
+ if (allow_all_if_none_selected && !had_selected) {
+ for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+ selected.insert ((*i)->note());
}
}
}
void
MidiRegionView::update_ghost_note (double x, double y)
{
+ MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+
_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 ();
+ framepos_t const f = snap_pixel_to_frame (x);
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));
+ _ghost_note->note()->set_channel (mtv->get_channel_for_add ());
- update_note (_ghost_note);
+ /* the ghost note does not appear in ghost regions, so pass false in here */
+ update_note (_ghost_note, false);
- show_verbose_canvas_cursor (_ghost_note->note ());
+ show_verbose_cursor (_ghost_note->note ());
}
void
boost::shared_ptr<NoteType> g (new NoteType);
_ghost_note = new NoEventCanvasNote (*this, *_note_group, g);
+ _ghost_note->property_outline_color_rgba() = 0x000000aa;
update_ghost_note (x, y);
_ghost_note->show ();
_last_ghost_x = x;
_last_ghost_y = y;
- show_verbose_canvas_cursor (_ghost_note->note ());
+ show_verbose_cursor (_ghost_note->note ());
}
void
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);
+ create_ghost_note (_last_ghost_x, _last_ghost_y);
}
void
MidiRegionView::drop_down_keys ()
{
- _mouse_state = None;
+ _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;
+ Events e;
MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
-
- cerr << "Selecting by position\n";
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;
- }
+ 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;
add_mrv_selection = true;
}
- for (Events::iterator i = e.begin(); i != e.end(); ++i) {
- if (_selection.insert (*i).second) {
- (*i)->set_selected (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 ();
+ RegionView::color_handler ();
for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
- (*i)->set_selected ((*i)->selected()); // will change color
- }
+ (*i)->set_selected ((*i)->selected()); // will change color
+ }
- /* XXX probably more to do here */
+ /* XXX probably more to do here */
}
void
void
MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos)
{
- if (_step_edit_cursor == 0) {
- ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+ 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);
- }
+ _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 ();
+ move_step_edit_cursor (pos);
+ _step_edit_cursor->show ();
}
void
MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos)
{
- _step_edit_cursor_position = 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);
- }
+ 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 ();
- }
+ if (_step_edit_cursor) {
+ _step_edit_cursor->hide ();
+ }
}
void
MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
{
- _step_edit_cursor_width = 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));
- }
+ 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.
/* 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 */
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 ());
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())
- );
+ boost::shared_ptr<NoteType> note (
+ new NoteType (ev.channel(), time_beats, 0, ev.note(), ev.velocity())
+ );
add_note (note, 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);
}
midi_region()->fix_negative_start ();
}
}
+
+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 ());
+}
+
+
+void
+MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
+{
+ char buf[24];
+ snprintf (buf, sizeof (buf), "%s (%d) Chn %d\nVel %d",
+ Evoral::midi_note_name (n->note()).c_str(),
+ (int) n->note (),
+ (int) n->channel() + 1,
+ (int) n->velocity());
+
+ show_verbose_cursor (buf, 10, 20);
+}
+
+void
+MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double yoffset) const
+{
+ double wx, wy;
+
+ trackview.editor().get_pointer_position (wx, wy);
+
+ wx += xoffset;
+ wy += yoffset;
+
+ /* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */
+
+ double x1, y1, x2, y2;
+ trackview.editor().verbose_cursor()->canvas_item()->get_bounds (x1, y1, x2, y2);
+
+ if ((wy + y2 - y1) > trackview.editor().canvas_height()) {
+ wy -= (y2 - y1) + 2 * yoffset;
+ }
+
+ trackview.editor().verbose_cursor()->set (text, wx, wy);
+ trackview.editor().verbose_cursor()->show ();
+}
projects / ardour.git / blobdiff