#include <pbd/error.h>
#include <gtkmm2ext/utils.h>
#include <pbd/memento_command.h>
+#include <pbd/basename.h>
#include "ardour_ui.h"
#include "editor.h"
#include <ardour/route.h>
#include <ardour/audio_track.h>
#include <ardour/audio_diskstream.h>
+#include <ardour/midi_diskstream.h>
#include <ardour/playlist.h>
#include <ardour/audioplaylist.h>
#include <ardour/audioregion.h>
#include <ardour/dB.h>
#include <ardour/utils.h>
#include <ardour/region_factory.h>
+#include <ardour/source_factory.h>
#include <bitset>
using namespace Gtk;
using namespace Editing;
-nframes_t
-Editor::event_frame (GdkEvent* event, double* pcx, double* pcy)
+const static double ZERO_GAIN_FRACTION = gain_to_slider_position(dB_to_coefficient(0.0));
+
+bool
+Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const
+{
+ int x, y;
+ double wx, wy;
+ Gdk::ModifierType mask;
+ Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas.get_window();
+ Glib::RefPtr<const Gdk::Window> pointer_window;
+
+ pointer_window = canvas_window->get_pointer (x, y, mask);
+
+ if (pointer_window == track_canvas.get_bin_window()) {
+
+ track_canvas.window_to_world (x, y, wx, wy);
+ in_track_canvas = true;
+
+ } else {
+ in_track_canvas = false;
+
+ if (pointer_window == time_canvas.get_bin_window()) {
+ time_canvas.window_to_world (x, y, wx, wy);
+ } else {
+ return false;
+ }
+ }
+
+ wx += horizontal_adjustment.get_value();
+ wy += vertical_adjustment.get_value();
+
+ GdkEvent event;
+ event.type = GDK_BUTTON_RELEASE;
+ event.button.x = wx;
+ event.button.y = wy;
+
+ where = event_frame (&event, 0, 0);
+ return true;
+}
+
+nframes64_t
+Editor::event_frame (GdkEvent* event, double* pcx, double* pcy) const
{
double cx, cy;
set_mouse_mode (m);
}
break;
+
+ case MouseNote:
+ if (mouse_note_button.get_active()) {
+ set_mouse_mode (m);
+ }
+ break;
default:
break;
}
}
- /* XXX the hack of unsetting all other buttongs should go
+ /* XXX the hack of unsetting all other buttons should go
away once GTK2 allows us to use regular radio buttons drawn like
normal buttons, rather than my silly GroupedButton hack.
*/
case MouseObject:
mouse_move_button.set_active (true);
- current_canvas_cursor = grabber_cursor;
+ if (Profile->get_sae()) {
+ current_canvas_cursor = timebar_cursor;
+ } else {
+ current_canvas_cursor = grabber_cursor;
+ }
break;
case MouseGain:
mouse_audition_button.set_active (true);
current_canvas_cursor = speaker_cursor;
break;
+
+ case MouseNote:
+ mouse_note_button.set_active (true);
+ set_midi_edit_cursor (current_midi_edit_mode());
+ break;
}
+ if (mouse_mode == MouseNote)
+ midi_toolbar_frame.show();
+ else
+ midi_toolbar_frame.hide();
+
ignore_mouse_mode_toggle = false;
if (is_drawable()) {
- track_canvas.get_window()->set_cursor(*current_canvas_cursor);
+ track_canvas.get_window()->set_cursor(*current_canvas_cursor);
}
}
if (next) set_mouse_mode (MouseObject);
else set_mouse_mode (MouseTimeFX);
break;
+
+ case MouseNote:
+ if (next) set_mouse_mode (MouseObject);
+ else set_mouse_mode (MouseAudition);
+ break;
}
}
void
-Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
+Editor::midi_edit_mode_toggled (MidiEditMode m)
+{
+ if (ignore_midi_edit_mode_toggle) {
+ return;
+ }
+
+ switch (m) {
+ case MidiEditPencil:
+ if (midi_tool_pencil_button.get_active())
+ set_midi_edit_mode (m);
+ break;
+
+ case MidiEditSelect:
+ if (midi_tool_select_button.get_active())
+ set_midi_edit_mode (m);
+ break;
+
+ case MidiEditErase:
+ if (midi_tool_erase_button.get_active())
+ set_midi_edit_mode (m);
+ break;
+
+ default:
+ break;
+ }
+
+ set_midi_edit_cursor(m);
+}
+
+
+void
+Editor::set_midi_edit_mode (MidiEditMode m, bool force)
+{
+ if (drag_info.item) {
+ return;
+ }
+
+ if (!force && m == midi_edit_mode) {
+ return;
+ }
+
+ midi_edit_mode = m;
+
+ instant_save ();
+
+ ignore_midi_edit_mode_toggle = true;
+
+ switch (midi_edit_mode) {
+ case MidiEditPencil:
+ midi_tool_pencil_button.set_active (true);
+ break;
+
+ case MidiEditSelect:
+ midi_tool_select_button.set_active (true);
+ break;
+
+ case MidiEditErase:
+ midi_tool_erase_button.set_active (true);
+ break;
+ }
+
+ ignore_midi_edit_mode_toggle = false;
+
+ set_midi_edit_cursor (current_midi_edit_mode());
+
+ if (is_drawable()) {
+ track_canvas.get_window()->set_cursor(*current_canvas_cursor);
+ }
+}
+
+void
+Editor::set_midi_edit_cursor (MidiEditMode m)
{
- bool commit = false;
+ switch (midi_edit_mode) {
+ case MidiEditPencil:
+ current_canvas_cursor = midi_pencil_cursor;
+ break;
+
+ case MidiEditSelect:
+ current_canvas_cursor = midi_select_cursor;
+ break;
+ case MidiEditErase:
+ current_canvas_cursor = midi_erase_cursor;
+ break;
+ }
+}
+
+void
+Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
+{
/* in object/audition/timefx mode, any button press sets
the selection if the object can be selected. this is a
bit of hack, because we want to avoid this if the
switch (item_type) {
case RegionItem:
- case RegionViewNameHighlight:
- case RegionViewName:
+ if (mouse_mode != MouseRange) {
+ set_selected_regionview_from_click (press, op, true);
+ } else if (event->type == GDK_BUTTON_PRESS) {
+ set_selected_track_as_side_effect ();
+ }
+ break;
+
+ case RegionViewNameHighlight:
+ case RegionViewName:
+ if (mouse_mode != MouseRange) {
+ set_selected_regionview_from_click (press, op, true);
+ } else if (event->type == GDK_BUTTON_PRESS) {
+ set_selected_track_as_side_effect ();
+ }
+ break;
+
+
case FadeInHandleItem:
case FadeInItem:
case FadeOutHandleItem:
case FadeOutItem:
if (mouse_mode != MouseRange) {
- commit = set_selected_regionview_from_click (press, op, true);
+ set_selected_regionview_from_click (press, op, true);
} else if (event->type == GDK_BUTTON_PRESS) {
- commit = set_selected_track_from_click (press, op, false);
+ set_selected_track_as_side_effect ();
}
break;
- case CrossfadeViewItem:
- commit = set_selected_track_from_click (press, op, false);
- break;
-
case ControlPointItem:
- commit = set_selected_track_from_click (press, op, true);
+ set_selected_track_as_side_effect ();
if (mouse_mode != MouseRange) {
- commit |= set_selected_control_point_from_click (op, false);
+ set_selected_control_point_from_click (op, false);
}
break;
case StreamItem:
/* for context click or range selection, select track */
if (event->button.button == 3) {
- commit = set_selected_track_from_click (press, op, true);
+ set_selected_track_as_side_effect ();
} else if (event->type == GDK_BUTTON_PRESS && mouse_mode == MouseRange) {
- commit = set_selected_track_from_click (press, op, false);
+ set_selected_track_as_side_effect ();
}
break;
case AutomationTrackItem:
- commit = set_selected_track_from_click (press, op, true);
+ set_selected_track_as_side_effect (true);
break;
default:
break;
}
-
-// if (commit) {
-// commit_reversible_command ();
-// }
}
bool
*/
switch (item_type) {
- case EditCursorItem:
case PlayheadCursorItem:
start_cursor_grab (item, event);
return true;
case MarkerItem:
- if (Keyboard::modifier_state_equals (event->button.state,
- Keyboard::ModifierMask(Keyboard::Control|Keyboard::Shift))) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
hide_marker (item, event);
} else {
start_marker_grab (item, event);
return true;
case TempoMarkerItem:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
start_tempo_marker_copy_grab (item, event);
} else {
start_tempo_marker_grab (item, event);
return true;
case MeterMarkerItem:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
start_meter_marker_copy_grab (item, event);
} else {
start_meter_marker_grab (item, event);
return true;
break;
+ case CdMarkerBarItem:
+ start_range_markerbar_op (item, event, CreateCDMarker);
+ return true;
+ break;
+
case TransportMarkerBarItem:
start_range_markerbar_op (item, event, CreateTransportMarker);
return true;
case SelectionItem:
if (Keyboard::modifier_state_contains
- (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
+ (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) {
// contains and not equals because I can't use alt as a modifier alone.
start_selection_grab (item, event);
- } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
+ } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
/* grab selection for moving */
start_selection_op (item, event, SelectionMove);
- }
- else {
+ } else {
/* this was debated, but decided the more common action was to
make a new selection */
start_selection_op (item, event, CreateSelection);
break;
case MouseObject:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Control|Keyboard::Alt)) &&
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) &&
event->type == GDK_BUTTON_PRESS) {
start_rubberband_select (item, event);
return true;
case RegionItem:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
start_region_copy_grab (item, event);
} else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
start_region_brush_grab (item, event);
break;
case MouseAudition:
- /* handled in release */
+ _scrubbing = true;
+ scrub_reversals = 0;
+ scrub_reverse_distance = 0;
+ last_scrub_x = event->button.x;
+ scrubbing_direction = 0;
+ track_canvas.get_window()->set_cursor (*transparent_cursor);
+ /* rest handled in motion & release */
break;
+ case MouseNote:
+ start_create_region_grab (item, event);
+ break;
+
default:
break;
}
if (event->type == GDK_BUTTON_PRESS) {
switch (item_type) {
case RegionItem:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
start_region_copy_grab (item, event);
} else {
start_region_grab (item, event);
}
-
+ return true;
break;
case ControlPointItem:
start_control_point_grab (item, event);
case MouseZoom:
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
temporal_zoom_session();
} else {
temporal_zoom_to_frame (true, event_frame(event));
case FadeOutHandleItem:
popup_fade_context_menu (1, event->button.time, item, item_type);
break;
-
+
case StreamItem:
+ popup_track_context_menu (1, event->button.time, item_type, false, where);
+ break;
+
case RegionItem:
case RegionViewNameHighlight:
case RegionViewName:
+ popup_track_context_menu (1, event->button.time, item_type, false, where);
+ break;
+
case SelectionItem:
+ popup_track_context_menu (1, event->button.time, item_type, true, where);
+ break;
+
case AutomationTrackItem:
- case CrossfadeViewItem:
- popup_track_context_menu (1, event->button.time, where);
+ popup_track_context_menu (1, event->button.time, item_type, false, where);
break;
case MarkerBarItem:
case RangeMarkerBarItem:
- case TransportMarkerBarItem:
+ case TransportMarkerBarItem:
+ case CdMarkerBarItem:
case TempoBarItem:
case MeterBarItem:
popup_ruler_menu (pixel_to_frame(event->button.x), item_type);
case MeterMarkerItem:
tm_marker_context_menu (&event->button, item);
break;
+
+ case CrossfadeViewItem:
+ popup_track_context_menu (1, event->button.time, item_type, false, where);
+ break;
#ifdef WITH_CMT
case ImageFrameItem:
switch (item_type) {
/* see comments in button_press_handler */
- case EditCursorItem:
case PlayheadCursorItem:
case MarkerItem:
case GainLineItem:
mouse_add_new_marker (where);
return true;
+ case CdMarkerBarItem:
+ // if we get here then a dragged range wasn't done
+ if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
+ snap_to (where, 0, true);
+ }
+ mouse_add_new_marker (where, true);
+ return true;
+
case TempoBarItem:
if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
snap_to (where);
break;
case MouseAudition:
- switch (item_type) {
- case RegionItem:
- audition_selected_region ();
- break;
- default:
- break;
- }
+ _scrubbing = false;
+ track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+ if (scrubbing_direction == 0) {
+ /* no drag, just a click */
+ switch (item_type) {
+ case RegionItem:
+ play_selected_region ();
+ break;
+ default:
+ break;
+ }
+ } else {
+ /* make sure we stop */
+ session->request_transport_speed (0.0);
+ }
break;
-
+
default:
break;
case 2:
switch (mouse_mode) {
+ case MouseObject:
+ switch (item_type) {
+ case RegionItem:
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ raise_region ();
+ } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::TertiaryModifier|Keyboard::SecondaryModifier))) {
+ lower_region ();
+ } else {
+ // Button2 click is unused
+ }
+ return true;
+
+ break;
+
+ default:
+ break;
+ }
+ break;
+
case MouseRange:
// x_style_paste (where, 1.0);
set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y);
show_verbose_canvas_cursor ();
- if (is_drawable()) {
- track_canvas.get_window()->set_cursor (*fader_cursor);
+ if (is_drawable() && !_scrubbing) {
+ track_canvas.get_window()->set_cursor (*fader_cursor);
}
}
break;
-
+
case GainLineItem:
if (mouse_mode == MouseGain) {
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
}
break;
- case EditCursorItem:
case PlayheadCursorItem:
if (is_drawable()) {
track_canvas.get_window()->set_cursor (*grabber_cursor);
case AutomationTrackItem:
if (is_drawable()) {
- Gdk::Cursor *cursor;
+ Gdk::Cursor *cursor;
switch (mouse_mode) {
case MouseRange:
cursor = selector_cursor;
case MarkerBarItem:
case RangeMarkerBarItem:
case TransportMarkerBarItem:
+ case CdMarkerBarItem:
case MeterBarItem:
case TempoBarItem:
if (is_drawable()) {
if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
break;
}
+ entered_marker = marker;
marker->set_color_rgba (ARDOUR_UI::config()->canvasvar_EnteredMarker.get());
// fall through
case MeterMarkerItem:
case RegionViewNameHighlight:
case StartSelectionTrimItem:
case EndSelectionTrimItem:
- case EditCursorItem:
case PlayheadCursorItem:
#ifdef WITH_CMT
case RangeMarkerBarItem:
case TransportMarkerBarItem:
+ case CdMarkerBarItem:
case MeterBarItem:
case TempoBarItem:
case MarkerBarItem:
if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
break;
}
- loc = find_location_from_marker (marker, is_start);
- if (loc) location_flags_changed (loc, this);
+ entered_marker = 0;
+ if ((loc = find_location_from_marker (marker, is_start)) != 0) {
+ location_flags_changed (loc, this);
+ }
// fall through
case MeterMarkerItem:
case TempoMarkerItem:
bool
Editor::motion_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type, bool from_autoscroll)
{
- gint x, y;
+ if (event->motion.is_hint) {
+ gint x, y;
+
+ /* We call this so that MOTION_NOTIFY events continue to be
+ delivered to the canvas. We need to do this because we set
+ Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces
+ the density of the events, at the expense of a round-trip
+ to the server. Given that this will mostly occur on cases
+ where DISPLAY = :0.0, and given the cost of what the motion
+ event might do, its a good tradeoff.
+ */
+
+ track_canvas.get_pointer (x, y);
+ }
- /* We call this so that MOTION_NOTIFY events continue to be
- delivered to the canvas. We need to do this because we set
- Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces
- the density of the events, at the expense of a round-trip
- to the server. Given that this will mostly occur on cases
- where DISPLAY = :0.0, and given the cost of what the motion
- event might do, its a good tradeoff.
- */
-
- track_canvas.get_pointer (x, y);
-
if (current_stepping_trackview) {
/* don't keep the persistent stepped trackview if the mouse moves */
current_stepping_trackview = 0;
}
drag_info.item_type = item_type;
+ drag_info.last_pointer_x = drag_info.current_pointer_x;
+ drag_info.last_pointer_y = drag_info.current_pointer_y;
drag_info.current_pointer_frame = event_frame (event, &drag_info.current_pointer_x,
&drag_info.current_pointer_y);
+ switch (mouse_mode) {
+ case MouseAudition:
+ if (_scrubbing) {
+
+ double delta;
+
+ if (scrubbing_direction == 0) {
+ /* first move */
+ session->request_locate (drag_info.current_pointer_frame, false);
+ session->request_transport_speed (0.1);
+ scrubbing_direction = 1;
+
+ } else {
+
+ if (last_scrub_x > drag_info.current_pointer_x) {
+
+ /* pointer moved to the left */
+
+ if (scrubbing_direction > 0) {
+
+ /* we reversed direction to go backwards */
+
+ scrub_reversals++;
+ scrub_reverse_distance += (int) (last_scrub_x - drag_info.current_pointer_x);
+
+ } else {
+
+ /* still moving to the left (backwards) */
+
+ scrub_reversals = 0;
+ scrub_reverse_distance = 0;
+
+ delta = 0.01 * (last_scrub_x - drag_info.current_pointer_x);
+ session->request_transport_speed (session->transport_speed() - delta);
+ }
+
+ } else {
+ /* pointer moved to the right */
+
+ if (scrubbing_direction < 0) {
+ /* we reversed direction to go forward */
+
+ scrub_reversals++;
+ scrub_reverse_distance += (int) (drag_info.current_pointer_x - last_scrub_x);
+
+ } else {
+ /* still moving to the right */
+
+ scrub_reversals = 0;
+ scrub_reverse_distance = 0;
+
+ delta = 0.01 * (drag_info.current_pointer_x - last_scrub_x);
+ session->request_transport_speed (session->transport_speed() + delta);
+ }
+ }
+
+ /* if there have been more than 2 opposite motion moves detected, or one that moves
+ back more than 10 pixels, reverse direction
+ */
+
+ if (scrub_reversals >= 2 || scrub_reverse_distance > 10) {
+
+ if (scrubbing_direction > 0) {
+ /* was forwards, go backwards */
+ session->request_transport_speed (-0.1);
+ scrubbing_direction = -1;
+ } else {
+ /* was backwards, go forwards */
+ session->request_transport_speed (0.1);
+ scrubbing_direction = 1;
+ }
+
+ scrub_reverse_distance = 0;
+ scrub_reversals = 0;
+ }
+ }
+
+ last_scrub_x = drag_info.current_pointer_x;
+ }
+
+ default:
+ break;
+ }
+
+
if (!from_autoscroll && drag_info.item) {
/* item != 0 is the best test i can think of for dragging.
*/
if (!drag_info.move_threshold_passed) {
- bool x_threshold_passed = (abs ((nframes64_t) (drag_info.current_pointer_x - drag_info.grab_x)) > 4LL);
- bool y_threshold_passed = (abs ((nframes64_t) (drag_info.current_pointer_y - drag_info.grab_y)) > 4LL);
+ bool x_threshold_passed = (::llabs ((nframes64_t) (drag_info.current_pointer_x - drag_info.grab_x)) > 4LL);
+ bool y_threshold_passed = (::llabs ((nframes64_t) (drag_info.current_pointer_y - drag_info.grab_y)) > 4LL);
drag_info.move_threshold_passed = (x_threshold_passed || y_threshold_passed);
switch (item_type) {
case PlayheadCursorItem:
- case EditCursorItem:
case MarkerItem:
case ControlPointItem:
case TempoMarkerItem:
case MouseRange:
case MouseZoom:
case MouseTimeFX:
+ case MouseNote:
if (drag_info.item && (event->motion.state & GDK_BUTTON1_MASK ||
(event->motion.state & GDK_BUTTON2_MASK))) {
if (!from_autoscroll) {
cursor = grabber_cursor;
}
- // if dragging with button2, the motion is x constrained, with Alt-button2 it is y constrained
+ // if dragging with button2, the motion is x constrained, with Alt-button2 it is y constrained
if (event->button.button == 2) {
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Alt)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
drag_info.y_constrained = true;
drag_info.x_constrained = false;
} else {
drag_info.current_pointer_frame = drag_info.grab_frame;
drag_info.current_pointer_x = drag_info.grab_x;
drag_info.current_pointer_y = drag_info.grab_y;
+ drag_info.last_pointer_x = drag_info.current_pointer_x;
+ drag_info.last_pointer_y = drag_info.current_pointer_y;
drag_info.cumulative_x_drag = 0;
drag_info.cumulative_y_drag = 0;
drag_info.first_move = true;
drag_info.item->ungrab (event->button.time);
if (drag_info.finished_callback) {
+ drag_info.last_pointer_x = drag_info.current_pointer_x;
+ drag_info.last_pointer_y = drag_info.current_pointer_y;
(this->*(drag_info.finished_callback)) (item, event);
}
return did_drag;
}
-void
-Editor::set_edit_cursor (GdkEvent* event)
-{
- nframes_t pointer_frame = event_frame (event);
-
- if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
- if (snap_type != SnapToEditCursor) {
- snap_to (pointer_frame);
- }
- }
-
- edit_cursor->set_position (pointer_frame);
- edit_cursor_clock.set (pointer_frame);
-}
-
-void
-Editor::set_playhead_cursor (GdkEvent* event)
-{
- nframes_t pointer_frame = event_frame (event);
-
- if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
- snap_to (pointer_frame);
- }
-
- if (session) {
- session->request_locate (pointer_frame, session->transport_rolling());
- }
-}
-
void
Editor::start_fade_in_grab (ArdourCanvas::Item* item, GdkEvent* event)
{
}
if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
- if (cursor != edit_cursor || snap_type != SnapToEditCursor) {
+ if (cursor == playhead_cursor) {
snap_to (adjusted_frame);
}
}
cursor->set_position (adjusted_frame);
- if (cursor == edit_cursor) {
- edit_cursor_clock.set (cursor->current_frame);
- } else {
- UpdateAllTransportClocks (cursor->current_frame);
- }
+ UpdateAllTransportClocks (cursor->current_frame);
show_verbose_time_cursor (cursor->current_frame, 10);
if (session) {
session->request_locate (playhead_cursor->current_frame, drag_info.was_rolling);
}
- } else if (item == &edit_cursor->canvas_item) {
- edit_cursor->set_position (edit_cursor->current_frame);
- edit_cursor_clock.set (edit_cursor->current_frame);
}
}
double x2 = frame_to_pixel (location->end());
if (location->is_mark()) {
- marker_drag_line_points.front().set_x(x1);
+ marker_drag_line_points.front().set_x(x1);
marker_drag_line_points.back().set_x(x1);
marker_drag_line->property_points() = marker_drag_line_points;
}
start_grab (event);
+ _dragging_edit_point = true;
+
drag_info.copied_location = new Location (*location);
drag_info.pointer_frame_offset = drag_info.grab_frame - (is_start ? location->start() : location->end());
update_marker_drag_item (location);
if (location->is_mark()) {
- marker_drag_line->show();
- marker_drag_line->raise_to_top();
- }
- else {
+ // marker_drag_line->show();
+ // marker_drag_line->raise_to_top();
+ } else {
range_marker_drag_rect->show();
range_marker_drag_rect->raise_to_top();
}
-
- if (is_start) show_verbose_time_cursor (location->start(), 10);
- else show_verbose_time_cursor (location->end(), 10);
+
+ if (is_start) {
+ show_verbose_time_cursor (location->start(), 10);
+ } else {
+ show_verbose_time_cursor (location->end(), 10);
+ }
+
+ Selection::Operation op = Keyboard::selection_type (event->button.state);
+
+ switch (op) {
+ case Selection::Toggle:
+ selection->toggle (marker);
+ break;
+ case Selection::Set:
+ selection->set (marker);
+ break;
+ case Selection::Extend:
+ selection->add (marker);
+ break;
+ case Selection::Add:
+ selection->add (marker);
+ break;
+ }
}
void
bool is_start;
bool move_both = false;
-
nframes_t newframe;
if (drag_info.pointer_frame_offset <= drag_info.current_pointer_frame) {
newframe = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
/* call this to find out if its the start or end */
- real_location = find_location_from_marker (marker, is_start);
+ if ((real_location = find_location_from_marker (marker, is_start)) == 0) {
+ return;
+ }
+
+ if (real_location->locked()) {
+ return;
+ }
/* use the copy that we're "dragging" around */
f_delta = copy_location->end() - copy_location->start();
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
move_both = true;
}
LocationMarkers* lm = find_location_markers (real_location);
lm->set_position (copy_location->start(), copy_location->end());
-
+ edit_point_clock.set (copy_location->start());
+
show_verbose_time_cursor (newframe, 10);
}
marker_drag_motion_callback (item, event);
}
+
+ _dragging_edit_point = false;
Marker* marker = (Marker *) drag_info.data;
bool is_start;
-
begin_reversible_command ( _("move marker") );
XMLNode &before = session->locations()->get_state();
Location * location = find_location_from_marker (marker, is_start);
-
+
if (location) {
+
+ if (location->locked()) {
+ return;
+ }
+
if (location->is_mark()) {
location->set_start (drag_info.copied_location->start());
} else {
}
drag_info.item = item;
+ drag_info.copy = false;
drag_info.data = marker;
drag_info.motion_callback = &Editor::meter_marker_drag_motion_callback;
drag_info.finished_callback = &Editor::meter_marker_drag_finished_callback;
if (drag_info.copy == true) {
begin_reversible_command (_("copy meter mark"));
- XMLNode &before = map.get_state();
+ XMLNode &before = map.get_state();
map.add_meter (marker->meter(), when);
XMLNode &after = map.get_state();
- session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
+ session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
commit_reversible_command ();
-
+
// delete the dummy marker we used for visual representation of copying.
// a new visual marker will show up automatically.
delete marker;
XMLNode &before = map.get_state();
map.move_meter (marker->meter(), when);
XMLNode &after = map.get_state();
- session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
+ session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
commit_reversible_command ();
}
}
}
drag_info.item = item;
+ drag_info.copy = false;
drag_info.data = marker;
drag_info.motion_callback = &Editor::tempo_marker_drag_motion_callback;
drag_info.finished_callback = &Editor::tempo_marker_drag_finished_callback;
delete marker;
} else {
begin_reversible_command (_("move tempo mark"));
- XMLNode &before = map.get_state();
+ XMLNode &before = map.get_state();
map.move_tempo (marker->tempo(), when);
- XMLNode &after = map.get_state();
- session->add_command (new MementoCommand<TempoMap>(map, &before, &after));
+ XMLNode &after = map.get_state();
+ session->add_command (new MementoCommand<TempoMap>(map, &before, &after));
commit_reversible_command ();
}
}
start_grab (event, fader_cursor);
+ // start the grab at the center of the control point so
+ // the point doesn't 'jump' to the mouse after the first drag
+ drag_info.grab_x = control_point->get_x();
+ drag_info.grab_y = control_point->get_y();
+ control_point->line().parent_group().i2w(drag_info.grab_x, drag_info.grab_y);
+ track_canvas.w2c(drag_info.grab_x, drag_info.grab_y, drag_info.grab_x, drag_info.grab_y);
+
+ drag_info.grab_frame = pixel_to_frame(drag_info.grab_x);
+
control_point->line().start_drag (control_point, drag_info.grab_frame, 0);
double fraction = 1.0 - ((control_point->get_y() - control_point->line().y_position()) / (double)control_point->line().height());
{
ControlPoint* cp = reinterpret_cast<ControlPoint *> (drag_info.data);
- double cx = drag_info.current_pointer_x;
- double cy = drag_info.current_pointer_y;
+ double dx = drag_info.current_pointer_x - drag_info.last_pointer_x;
+ double dy = drag_info.current_pointer_y - drag_info.last_pointer_y;
+
+ if (event->button.state & Keyboard::SecondaryModifier) {
+ dx *= 0.1;
+ dy *= 0.1;
+ }
+
+ double cx = drag_info.grab_x + drag_info.cumulative_x_drag + dx;
+ double cy = drag_info.grab_y + drag_info.cumulative_y_drag + dy;
- drag_info.cumulative_x_drag = cx - drag_info.grab_x ;
- drag_info.cumulative_y_drag = cy - drag_info.grab_y ;
+ // calculate zero crossing point. back off by .01 to stay on the
+ // positive side of zero
+ double _unused = 0;
+ double zero_gain_y = (1.0 - ZERO_GAIN_FRACTION) * cp->line().height() - .01;
+ cp->line().parent_group().i2w(_unused, zero_gain_y);
+
+ // make sure we hit zero when passing through
+ if ((cy < zero_gain_y and (cy - dy) > zero_gain_y)
+ or (cy > zero_gain_y and (cy - dy) < zero_gain_y)) {
+ cy = zero_gain_y;
+ }
if (drag_info.x_constrained) {
cx = drag_info.grab_x;
cy = drag_info.grab_y;
}
+ drag_info.cumulative_x_drag = cx - drag_info.grab_x;
+ drag_info.cumulative_y_drag = cy - drag_info.grab_y;
+
cp->line().parent_group().w2i (cx, cy);
cx = max (0.0, cx);
bool push;
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::PrimaryModifier)) {
push = true;
} else {
push = false;
/* just a click */
- if ((event->type == GDK_BUTTON_RELEASE) && (event->button.button == 1) && Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
+ if ((event->type == GDK_BUTTON_RELEASE) && (event->button.button == 1) && Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
reset_point_selection ();
}
Editor::line_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
{
AutomationLine* line = reinterpret_cast<AutomationLine *> (drag_info.data);
+
+ double dy = drag_info.current_pointer_y - drag_info.last_pointer_y;
+
+ if (event->button.state & Keyboard::SecondaryModifier) {
+ dy *= 0.1;
+ }
+
double cx = drag_info.current_pointer_x;
- double cy = drag_info.current_pointer_y;
+ double cy = drag_info.grab_y + drag_info.cumulative_y_drag + dy;
+
+ // calculate zero crossing point. back off by .01 to stay on the
+ // positive side of zero
+ double _unused = 0;
+ double zero_gain_y = (1.0 - ZERO_GAIN_FRACTION) * line->height() - .01;
+ line->parent_group().i2w(_unused, zero_gain_y);
+
+ // make sure we hit zero when passing through
+ if ((cy < zero_gain_y and (cy - dy) > zero_gain_y)
+ or (cy > zero_gain_y and (cy - dy) < zero_gain_y)) {
+ cy = zero_gain_y;
+ }
+
+ drag_info.cumulative_y_drag = cy - drag_info.grab_y;
line->parent_group().w2i (cx, cy);
-
+
+ cy = max (0.0, cy);
+ cy = min ((double) line->height(), cy);
+
const double fraction = 1.0 - ((cy - line->y_position()) / (double)line->height());
bool push;
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::PrimaryModifier)) {
push = false;
} else {
push = true;
drag_info.copy = false;
drag_info.item = item;
drag_info.data = clicked_regionview;
- drag_info.motion_callback = &Editor::region_drag_motion_callback;
- drag_info.finished_callback = &Editor::region_drag_finished_callback;
+
+ if (Config->get_edit_mode() == Splice) {
+ drag_info.motion_callback = &Editor::region_drag_splice_motion_callback;
+ drag_info.finished_callback = &Editor::region_drag_splice_finished_callback;
+ } else {
+ drag_info.motion_callback = &Editor::region_drag_motion_callback;
+ drag_info.finished_callback = &Editor::region_drag_finished_callback;
+ }
start_grab (event);
begin_reversible_command (_("move region(s)"));
}
+void
+Editor::start_create_region_grab (ArdourCanvas::Item* item, GdkEvent* event)
+{
+ drag_info.copy = false;
+ drag_info.item = item;
+ drag_info.data = clicked_axisview;
+ drag_info.last_trackview = clicked_axisview;
+ drag_info.motion_callback = &Editor::create_region_drag_motion_callback;
+ drag_info.finished_callback = &Editor::create_region_drag_finished_callback;
+
+ start_grab (event);
+}
+
void
Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
{
void
Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event)
{
- if (selection->regions.empty() || clicked_regionview == 0) {
+ if (selection->regions.empty() || clicked_regionview == 0 || Config->get_edit_mode() == Splice) {
return;
}
}
void
-Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
+Editor::possibly_copy_regions_during_grab (GdkEvent* event)
{
- double x_delta;
- double y_delta = 0;
- RegionView* rv = reinterpret_cast<RegionView*> (drag_info.data);
- nframes_t pending_region_position = 0;
- int32_t pointer_y_span = 0, canvas_pointer_y_span = 0, original_pointer_order;
- int32_t visible_y_high = 0, visible_y_low = 512; //high meaning higher numbered.. not the height on the screen
- bool clamp_y_axis = false;
- vector<int32_t> height_list(512) ;
- vector<int32_t>::iterator j;
-
if (drag_info.copy && drag_info.move_threshold_passed && drag_info.want_move_threshold) {
drag_info.want_move_threshold = false; // don't copy again
vector<RegionView*> new_regionviews;
for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
+
RegionView* rv;
RegionView* nrv;
}
/* reset selection to new regionviews */
-
+
selection->set (new_regionviews);
-
+
/* reset drag_info data to reflect the fact that we are dragging the copies */
drag_info.data = new_regionviews.front();
swap_grab (new_regionviews.front()->get_canvas_group (), 0, event->motion.time);
}
+}
+bool
+Editor::check_region_drag_possible (RouteTimeAxisView** tv)
+{
/* Which trackview is this ? */
TimeAxisView* tvp = trackview_by_y_position (drag_info.current_pointer_y);
- RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
+ (*tv) = dynamic_cast<RouteTimeAxisView*>(tvp);
/* The region motion is only processed if the pointer is over
an audio track.
*/
- if (!tv || !tv->is_track()) {
+ if (!(*tv) || !(*tv)->is_track()) {
/* To make sure we hide the verbose canvas cursor when the mouse is
- not held over a track.
+ not held over and audiotrack.
*/
hide_verbose_canvas_cursor ();
- return;
+ return false;
}
+ return true;
+}
+
+struct RegionSelectionByPosition {
+ bool operator() (RegionView*a, RegionView* b) {
+ return a->region()->position () < b->region()->position();
+ }
+};
+
+void
+Editor::region_drag_splice_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
+{
+ RouteTimeAxisView* tv;
+
+ if (!check_region_drag_possible (&tv)) {
+ return;
+ }
+
+ if (!drag_info.move_threshold_passed) {
+ return;
+ }
+
+ int dir;
+
+ if (drag_info.current_pointer_x - drag_info.grab_x > 0) {
+ dir = 1;
+ } else {
+ dir = -1;
+ }
+
+ RegionSelection copy (selection->regions);
+
+ RegionSelectionByPosition cmp;
+ copy.sort (cmp);
+
+ for (RegionSelection::iterator i = copy.begin(); i != copy.end(); ++i) {
+
+ RouteTimeAxisView* atv = dynamic_cast<RouteTimeAxisView*> (&(*i)->get_time_axis_view());
+
+ if (!atv) {
+ continue;
+ }
+
+ boost::shared_ptr<Playlist> playlist;
+
+ if ((playlist = atv->playlist()) == 0) {
+ continue;
+ }
+
+ if (!playlist->region_is_shuffle_constrained ((*i)->region())) {
+ continue;
+ }
+
+ if (dir > 0) {
+ if (drag_info.current_pointer_frame < (*i)->region()->last_frame() + 1) {
+ continue;
+ }
+ } else {
+ if (drag_info.current_pointer_frame > (*i)->region()->first_frame()) {
+ continue;
+ }
+ }
+
+
+ playlist->shuffle ((*i)->region(), dir);
+
+ drag_info.grab_x = drag_info.current_pointer_x;
+ }
+}
+
+void
+Editor::region_drag_splice_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
+{
+}
+
+void
+Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
+{
+ double x_delta;
+ double y_delta = 0;
+ RegionView* rv = reinterpret_cast<RegionView*> (drag_info.data);
+ nframes_t pending_region_position = 0;
+ int32_t pointer_y_span = 0, canvas_pointer_y_span = 0, original_pointer_order;
+ int32_t visible_y_high = 0, visible_y_low = 512; //high meaning higher numbered.. not the height on the screen
+ bool clamp_y_axis = false;
+ vector<int32_t> height_list(512) ;
+ vector<int32_t>::iterator j;
+ RouteTimeAxisView* tv;
+
+ possibly_copy_regions_during_grab (event);
+
+ if (!check_region_drag_possible (&tv)) {
+ return;
+ }
+
original_pointer_order = drag_info.last_trackview->order;
/************************************************************
- Y-Delta Computation
+ Y-Delta Computation
************************************************************/
if (drag_info.brushing) {
pointer_y_span = 0;
goto y_axis_done;
}
-
+
if ((pointer_y_span = (drag_info.last_trackview->order - tv->order)) != 0) {
int32_t children = 0, numtracks = 0;
}
/************************************************************
- X DELTA COMPUTATION
+ X DELTA COMPUTATION
************************************************************/
/* compute the amount of pointer motion in frames, and where
if (pending_region_position != drag_info.last_frame_position && !drag_info.x_constrained) {
- /* now compute the canvas unit distance we need to move the regiondrag_info.last_trackview->order
+ /* now compute the canvas unit distance we need to move the regionview
to make it appear at the new location.
*/
}
/*************************************************************
- PREPARE TO MOVE
+ PREPARE TO MOVE
************************************************************/
if (x_delta == 0 && (pointer_y_span == 0)) {
}
/*************************************************************
- MOTION
+ MOTION
************************************************************/
bool do_move;
pair<set<boost::shared_ptr<Playlist> >::iterator,bool> insert_result;
const list<RegionView*>& layered_regions = selection->regions.by_layer();
-
+
for (list<RegionView*>::const_iterator i = layered_regions.begin(); i != layered_regions.end(); ++i) {
RegionView* rv = (*i);
tvp2 = trackview_by_y_position (iy1 + y_delta);
temp_rtv = dynamic_cast<RouteTimeAxisView*>(tvp2);
rv->set_y_position_and_height (0, temp_rtv->height);
-
+
/* if you un-comment the following, the region colours will follow the track colours whilst dragging,
personally, i think this can confuse things, but never mind.
*/
rv->fake_set_opaque (true);
}
-
+
if (drag_info.brushing) {
mouse_brush_insert_region (rv, pending_region_position);
} else {
Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
{
nframes_t where;
- RegionView* rv = reinterpret_cast<RegionView *> (drag_info.data);
+ RegionView* rvdi = reinterpret_cast<RegionView *> (drag_info.data);
pair<set<boost::shared_ptr<Playlist> >::iterator,bool> insert_result;
bool nocommit = true;
double speed;
bool regionview_y_movement;
bool regionview_x_movement;
vector<RegionView*> copies;
+ list <boost::shared_ptr<Playlist > > used_playlists;
+ list <sigc::connection > used_connections;
+ bool preserve_selection = false;
/* first_move is set to false if the regionview has been moved in the
motion handler.
region_drag_motion_callback (item, event);
+ if (Config->get_edit_mode() == Splice && !pre_drag_region_selection.empty()) {
+ selection->set (pre_drag_region_selection);
+ pre_drag_region_selection.clear ();
+ }
+
if (drag_info.brushing) {
/* all changes were made during motion event handlers */
speed = rtv->get_diskstream()->speed();
}
- regionview_x_movement = (drag_info.last_frame_position != (nframes_t) (rv->region()->position()/speed));
- regionview_y_movement = (drag_info.last_trackview != &rv->get_time_axis_view());
+ regionview_x_movement = (drag_info.last_frame_position != (nframes_t) (rvdi->region()->position()/speed));
+ regionview_y_movement = (drag_info.last_trackview != &rvdi->get_time_axis_view());
//printf ("last_frame: %s position is %lu %g\n", rv->get_time_axis_view().name().c_str(), drag_info.last_frame_position, speed);
//printf ("last_rackview: %s \n", drag_info.last_trackview->name().c_str());
if (regionview_y_movement) {
- /* moved to a different audio track. */
+ /* moved to a different track. */
vector<RegionView*> new_selection;
-
+
for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ) {
- RegionView* rv = (*i);
+ RegionView* rv = (*i);
double ix1, ix2, iy1, iy2;
rv->get_canvas_frame()->get_bounds (ix1, iy1, ix2, iy2);
rv->get_canvas_group()->i2w (ix1, iy1);
- TimeAxisView* tvp2 = trackview_by_y_position (iy1);
- RouteTimeAxisView* rtv2 = dynamic_cast<RouteTimeAxisView*>(tvp2);
+
+ RouteTimeAxisView* rtv2 = dynamic_cast<RouteTimeAxisView*>(trackview_by_y_position (iy1));
boost::shared_ptr<Playlist> from_playlist = rv->region()->playlist();
boost::shared_ptr<Playlist> to_playlist = rtv2->playlist();
-
+
where = (nframes_t) (unit_to_frame (ix1) * speed);
boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
+ if (! to_playlist->frozen()) {
+ /*
+ we haven't seen this playlist before.
+ we want to freeze it because we don't want to relayer per-region.
+ its much better to do that just once if the playlist is large.
+ */
+
+ /*
+ connect so the selection is changed when the new regionview finally appears (after thaw).
+ keep track of it so we can disconnect later.
+ */
+
+ sigc::connection c = rtv2->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_and_select_new_region_view));
+ used_connections.push_back (c);
+
+ /* undo */
+ session->add_command (new MementoCommand<Playlist>(*to_playlist, &to_playlist->get_state(), 0));
+
+ /* remember used playlists so we can thaw them later */
+ used_playlists.push_back(to_playlist);
+ to_playlist->freeze();
+ }
+
/* undo the previous hide_dependent_views so that xfades don't
disappear on copying regions
*/
} else {
/* the regionview we dragged around is a temporary copy, queue it for deletion */
-
+
copies.push_back (rv);
}
- latest_regionview = 0;
-
+ latest_regionviews.clear ();
sigc::connection c = rtv2->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
session->add_command (new MementoCommand<Playlist>(*to_playlist, &to_playlist->get_state(), 0));
+
to_playlist->add_region (new_region, where);
session->add_command (new MementoCommand<Playlist>(*to_playlist, 0, &to_playlist->get_state()));
c.disconnect ();
- if (latest_regionview) {
- new_selection.push_back (latest_regionview);
+ if (!latest_regionviews.empty()) {
+ new_selection.insert (new_selection.end(), latest_regionviews.begin(), latest_regionviews.end());
}
/* OK, this is where it gets tricky. If the playlist was being used by >1 tracks, and the region
EXCEPT .... if we are doing a copy drag, then the selection hasn't been modified and
we can just iterate.
+
*/
if (drag_info.copy) {
if (selection->regions.empty()) {
break;
} else {
- i = selection->regions.by_layer().begin();
+ /*
+ XXX see above .. but we just froze the playlists.. we have to keep iterating, right?
+ */
+
+ //i = selection->regions.by_layer().begin();
+ ++i;
}
}
- }
-
- selection->set (new_selection);
+ }
} else {
list<RegionView*> regions = selection->regions.by_layer();
- if (drag_info.copy) {
- selection->clear_regions();
- }
-
for (list<RegionView*>::iterator i = regions.begin(); i != regions.end(); ++i) {
- rv = (*i);
+ RegionView* rv = (*i);
+ boost::shared_ptr<Playlist> to_playlist = (*i)->region()->playlist();
+ RouteTimeAxisView* from_rtv = dynamic_cast<RouteTimeAxisView*> (&(rv->get_time_axis_view()));
if (!rv->region()->can_move()) {
continue;
if (regionview_x_movement) {
double ownspeed = 1.0;
- rtv = dynamic_cast<RouteTimeAxisView*> (&(rv->get_time_axis_view()));
- if (rtv && rtv->get_diskstream()) {
- ownspeed = rtv->get_diskstream()->speed();
+ if (from_rtv && from_rtv->get_diskstream()) {
+ ownspeed = from_rtv->get_diskstream()->speed();
}
/* base the new region position on the current position of the regionview.*/
where = rv->region()->position();
}
- boost::shared_ptr<Playlist> to_playlist = rv->region()->playlist();
-
- assert (to_playlist);
+ if (! to_playlist->frozen()) {
+ sigc::connection c = from_rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_and_select_new_region_view));
+ used_connections.push_back (c);
- /* add the undo */
+ /* add the undo */
+ session->add_command (new MementoCommand<Playlist>(*to_playlist, &to_playlist->get_state(), 0));
- session->add_command (new MementoCommand<Playlist>(*to_playlist, &to_playlist->get_state(), 0));
+ used_playlists.push_back(to_playlist);
+ to_playlist->freeze();
+ }
if (drag_info.copy) {
/* add it */
- latest_regionview = 0;
+ latest_regionviews.clear ();
sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
to_playlist->add_region (newregion, (nframes_t) (where * rtv->get_diskstream()->speed()));
c.disconnect ();
-
- if (latest_regionview) {
- rtv->reveal_dependent_views (*latest_regionview);
- selection->add (latest_regionview);
+
+ if (!latest_regionviews.empty()) {
+ // XXX why just the first one ? we only expect one
+ rtv->reveal_dependent_views (*latest_regionviews.front());
+ selection->add (latest_regionviews);
}
} else {
/* just change the model */
rv->region()->set_position (where, (void*) this);
+ preserve_selection = true;
}
- /* add the redo */
+ }
+
+ }
+ if (! preserve_selection) {
+ //selection->clear_regions();
+ }
+ while (used_playlists.size() > 0) {
- session->add_command (new MementoCommand<Playlist>(*to_playlist, 0, &to_playlist->get_state()));
+ list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
+ (*i)->thaw();
- if (drag_info.copy) {
- copies.push_back (rv);
- }
+ if (used_connections.size()) {
+ sigc::connection c = used_connections.front();
+ c.disconnect();
+ used_connections.pop_front();
}
+ /* add the redo */
+
+ session->add_command (new MementoCommand<Playlist>(*(*i), 0, &(*i)->get_state()));
+ used_playlists.pop_front();
}
out:
}
}
+
+void
+Editor::create_region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
+{
+ if (drag_info.move_threshold_passed) {
+ if (drag_info.first_move) {
+ // TODO: create region-create-drag region view here
+ drag_info.first_move = false;
+ }
+
+ // TODO: resize region-create-drag region view here
+ }
+}
+
+void
+Editor::create_region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
+{
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (drag_info.last_trackview);
+ if (!mtv)
+ return;
+
+ const boost::shared_ptr<MidiDiskstream> diskstream =
+ boost::dynamic_pointer_cast<MidiDiskstream>(mtv->view()->trackview().track()->diskstream());
+
+ if (!diskstream) {
+ warning << "Cannot create non-MIDI region" << endl;
+ return;
+ }
+
+ if (drag_info.first_move) {
+ begin_reversible_command (_("create region"));
+ XMLNode &before = mtv->playlist()->get_state();
+
+ nframes_t start = drag_info.grab_frame;
+ snap_to (start, -1);
+ const Meter& m = session->tempo_map().meter_at(start);
+ const Tempo& t = session->tempo_map().tempo_at(start);
+ double length = floor (m.frames_per_bar(t, session->frame_rate()));
+
+ boost::shared_ptr<Source> src = session->create_midi_source_for_session(*diskstream.get());
+
+ mtv->playlist()->add_region (boost::dynamic_pointer_cast<MidiRegion>
+ (RegionFactory::create(src, 0, (nframes_t) length,
+ PBD::basename_nosuffix(src->name()))), start);
+ XMLNode &after = mtv->playlist()->get_state();
+ session->add_command(new MementoCommand<Playlist>(*mtv->playlist().get(), &before, &after));
+ commit_reversible_command();
+
+ } else {
+ create_region_drag_motion_callback (item, event);
+ // TODO: create region-create-drag region here
+ }
+}
+
void
Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event)
{
this is an alignment click (control used)
*/
- if (Keyboard::modifier_state_contains (event->state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_contains (event->state, Keyboard::PrimaryModifier)) {
TimeAxisView* tv = &rv.get_time_axis_view();
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(tv);
double speed = 1.0;
speed = rtv->get_diskstream()->speed();
}
- if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Alt))) {
-
- align_region (rv.region(), SyncPoint, (nframes_t) (edit_cursor->current_frame * speed));
-
- } else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift))) {
+ nframes64_t where = get_preferred_edit_position();
- align_region (rv.region(), End, (nframes_t) (edit_cursor->current_frame * speed));
+ if (where >= 0) {
- } else {
-
- align_region (rv.region(), Start, (nframes_t) (edit_cursor->current_frame * speed));
+ if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+
+ align_region (rv.region(), SyncPoint, (nframes_t) (where * speed));
+
+ } else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+
+ align_region (rv.region(), End, (nframes_t) (where * speed));
+
+ } else {
+
+ align_region (rv.region(), Start, (nframes_t) (where * speed));
+ }
}
}
}
void
Editor::collect_new_region_view (RegionView* rv)
{
- latest_regionview = rv;
+ latest_regionviews.push_back (rv);
+}
+
+void
+Editor::collect_and_select_new_region_view (RegionView* rv)
+{
+ selection->add(rv);
+ latest_regionviews.push_back (rv);
}
void
set the regionview we want to then drag.
*/
- latest_regionview = 0;
+ latest_regionviews.clear();
sigc::connection c = clicked_routeview->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
/* A selection grab currently creates two undo/redo operations, one for
c.disconnect ();
- if (latest_regionview == 0) {
+ if (latest_regionviews.empty()) {
/* something went wrong */
return;
}
/* we need to deselect all other regionviews, and select this one
- i'm ignoring undo stuff, because the region creation will take care of it */
- selection->set (latest_regionview);
+ i'm ignoring undo stuff, because the region creation will take care of it
+ */
+ selection->set (latest_regionviews);
- drag_info.item = latest_regionview->get_canvas_group();
- drag_info.data = latest_regionview;
+ drag_info.item = latest_regionviews.front()->get_canvas_group();
+ drag_info.data = latest_regionviews.front();
drag_info.motion_callback = &Editor::region_drag_motion_callback;
drag_info.finished_callback = &Editor::region_drag_finished_callback;
start_grab (event);
drag_info.last_trackview = clicked_axisview;
- drag_info.last_frame_position = latest_regionview->region()->position();
+ drag_info.last_frame_position = latest_regionviews.front()->region()->position();
drag_info.pointer_frame_offset = drag_info.grab_frame - drag_info.last_frame_position;
show_verbose_time_cursor (drag_info.last_frame_position, 10);
void
Editor::cancel_selection ()
{
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(*i)->hide_selection ();
}
- begin_reversible_command (_("cancel selection"));
selection->clear ();
clicked_selection = 0;
- commit_reversible_command ();
}
void
switch (op) {
case CreateSelection:
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
drag_info.copy = true;
} else {
drag_info.copy = false;
start_grab (event, trimmer_cursor);
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
trim_op = ContentsTrim;
} else {
/* These will get overridden for a point trim.*/
boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
insert_result = motion_frozen_playlists.insert (pl);
if (insert_result.second) {
- session->add_command(new MementoCommand<Playlist>(*pl, &pl->get_state(), 0));
+ session->add_command(new MementoCommand<Playlist>(*pl, &pl->get_state(), 0));
+ pl->freeze();
}
}
}
case StartTrim:
if ((left_direction == false) && (drag_info.current_pointer_frame <= rv->region()->first_frame()/speed)) {
break;
- } else {
+ } else {
for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
single_start_trim (**i, frame_delta, left_direction, obey_snap);
}
{
bool swap_direction = false;
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
swap_direction = true;
}
if (!drag_info.first_move) {
trim_motion_callback (item, event);
- if (!clicked_regionview->get_selected()) {
+ if (!selection->selected (clicked_regionview)) {
thaw_region_after_trim (*clicked_regionview);
} else {
}
for (set<boost::shared_ptr<Playlist> >::iterator p = motion_frozen_playlists.begin(); p != motion_frozen_playlists.end(); ++p) {
- //(*p)->thaw ();
-
session->add_command (new MementoCommand<Playlist>(*(*p).get(), 0, &(*p)->get_state()));
- }
+ (*p)->thaw ();
+ session->add_command (new MementoCommand<Playlist>(*(*p).get(), 0, &(*p)->get_state()));
+ }
motion_frozen_playlists.clear ();
trim_op = StartTrim;
begin_reversible_command (_("Start point trim"));
- if (rv->get_selected()) {
+ if (selection->selected (rv)) {
for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin();
i != selection->regions.by_layer().end(); ++i)
{
if (!(*i)->region()->locked()) {
boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
- XMLNode &before = pl->get_state();
+ XMLNode &before = pl->get_state();
(*i)->region()->trim_front (new_bound, this);
- XMLNode &after = pl->get_state();
-
session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ XMLNode &after = pl->get_state();
+ session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
}
}
boost::shared_ptr<Playlist> pl = rv->region()->playlist();
XMLNode &before = pl->get_state();
rv->region()->trim_front (new_bound, this);
- XMLNode &after = pl->get_state();
+ XMLNode &after = pl->get_state();
session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
}
}
trim_op = EndTrim;
begin_reversible_command (_("End point trim"));
- if (rv->get_selected()) {
+ if (selection->selected (rv)) {
for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i)
{
boost::shared_ptr<Playlist> pl = rv->region()->playlist();
XMLNode &before = pl->get_state();
rv->region()->trim_end (new_bound, this);
- XMLNode &after = pl->get_state();
+ XMLNode &after = pl->get_state();
session->add_command (new MementoCommand<Playlist>(*pl.get(), &before, &after));
}
}
}
region->thaw (_("trimmed region"));
- XMLNode &after = region->playlist()->get_state();
+ XMLNode &after = region->playlist()->get_state();
session->add_command (new MementoCommand<Playlist>(*(region->playlist()), 0, &after));
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
switch (op) {
case CreateRangeMarker:
case CreateTransportMarker:
-
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
+ case CreateCDMarker:
+
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
drag_info.copy = true;
} else {
drag_info.copy = false;
switch (range_marker_op) {
case CreateRangeMarker:
case CreateTransportMarker:
+ case CreateCDMarker:
if (drag_info.first_move) {
snap_to (drag_info.grab_frame);
}
{
Location * newloc = 0;
string rangename;
+ int flags;
if (!drag_info.first_move) {
drag_range_markerbar_op (item, event);
switch (range_marker_op) {
case CreateRangeMarker:
+ case CreateCDMarker:
{
begin_reversible_command (_("new range marker"));
- XMLNode &before = session->locations()->get_state();
+ XMLNode &before = session->locations()->get_state();
session->locations()->next_available_name(rangename,"unnamed");
- newloc = new Location(temp_location->start(), temp_location->end(), rangename, Location::IsRangeMarker);
+ if (range_marker_op == CreateCDMarker) {
+ flags = Location::IsRangeMarker|Location::IsCDMarker;
+ }
+ else {
+ flags = Location::IsRangeMarker;
+ }
+ newloc = new Location(temp_location->start(), temp_location->end(), rangename, (Location::Flags) flags);
session->locations()->add (newloc, true);
- XMLNode &after = session->locations()->get_state();
+ XMLNode &after = session->locations()->get_state();
session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
commit_reversible_command ();
} else {
/* just a click, no pointer movement. remember that context menu stuff was handled elsewhere */
- if (Keyboard::no_modifier_keys_pressed (&event->button)) {
+ if (Keyboard::no_modifier_keys_pressed (&event->button) && range_marker_op != CreateCDMarker) {
nframes_t start;
nframes_t end;
prompter.show_all ();
switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT:
- string str;
+ string str;
prompter.get_result(str);
if (str.length()) {
clicked_regionview->region()->set_name (str);
if (drag_info.first_move) {
return;
}
+
+ if (drag_info.last_pointer_frame < clicked_regionview->region()->position()) {
+ /* backwards drag of the left edge - not usable */
+ return;
+ }
nframes_t newlen = drag_info.last_pointer_frame - clicked_regionview->region()->position();
- float percentage = (float) ((double) newlen - (double) clicked_regionview->region()->length()) / ((double) newlen) * 100.0f;
-
+
+ float percentage = (double) newlen / (double) clicked_regionview->region()->length();
+
+#ifndef USE_RUBBERBAND
+ // Soundtouch uses percentage / 100 instead of normal (/ 1)
+ if (clicked_regionview->region()->data_type() == DataType::AUDIO) {
+ percentage = (float) ((double) newlen - (double) clicked_regionview->region()->length()) / ((double) newlen) * 100.0f;
+#endif
+ }
+
begin_reversible_command (_("timestretch"));
- if (run_timestretch (selection->regions, percentage) == 0) {
+ // XXX how do timeFX on multiple regions ?
+
+ RegionSelection rs;
+ rs.add (clicked_regionview);
+
+ if (time_stretch (rs, percentage) == 0) {
session->commit_reversible_command ();
}
}
}
switch (snap_type) {
- case SnapToFrame:
case SnapToMark:
- case SnapToEditCursor:
return;
default:
boost::shared_ptr<Playlist> playlist = rtv->playlist();
double speed = rtv->get_diskstream()->speed();
- XMLNode &before = playlist->get_state();
+ XMLNode &before = playlist->get_state();
playlist->add_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (arv->audio_region())), (nframes_t) (pos * speed));
- XMLNode &after = playlist->get_state();
+ XMLNode &after = playlist->get_state();
session->add_command(new MementoCommand<Playlist>(*playlist.get(), &before, &after));
// playlist is frozen, so we have to update manually
}
return true;
}
+
projects / ardour.git / blobdiff