/*
- Copyright (C) 2000-2001 Paul Davis
+ Copyright (C) 2000-2001 Paul Davis
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 <algorithm>
#include "pbd/error.h"
+#include "pbd/enumwriter.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/tearoff.h>
#include "pbd/memento_command.h"
#include "pbd/basename.h"
+#include "pbd/stateful_diff_command.h"
#include "ardour_ui.h"
+#include "actions.h"
#include "editor.h"
#include "time_axis_view.h"
#include "audio_time_axis.h"
#include "ardour/utils.h"
#include "ardour/region_factory.h"
#include "ardour/source_factory.h"
+#include "ardour/session.h"
#include <bitset>
using namespace std;
using namespace ARDOUR;
using namespace PBD;
-using namespace sigc;
using namespace Gtk;
using namespace Editing;
+using Gtkmm2ext::Keyboard;
bool
Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const
if (!canvas_window) {
return false;
}
-
+
pointer_window = canvas_window->get_pointer (x, y, mask);
if (pointer_window == track_canvas->get_bin_window()) {
event.type = GDK_BUTTON_RELEASE;
event.button.x = wx;
event.button.y = wy;
-
+
where = event_frame (&event, 0, 0);
return true;
}
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
-
*pcx = event->button.x;
*pcy = event->button.y;
_trackview_group->w2i(*pcx, *pcy);
break;
case GDK_MOTION_NOTIFY:
-
*pcx = event->motion.x;
*pcy = event->motion.y;
_trackview_group->w2i(*pcx, *pcy);
position is negative (as can be the case with motion events in particular),
the frame location is always positive.
*/
-
+
return pixel_to_frame (*pcx);
}
-void
-Editor::mouse_mode_toggled (MouseMode m)
+Gdk::Cursor*
+Editor::which_grabber_cursor ()
{
- if (ignore_mouse_mode_toggle) {
- return;
- }
+ Gdk::Cursor* c = grabber_cursor;
- switch (m) {
- case MouseRange:
- if (mouse_select_button.get_active()) {
- set_mouse_mode (m);
- }
- break;
+ if (_internal_editing) {
+ switch (mouse_mode) {
+ case MouseRange:
+ c = midi_pencil_cursor;
+ break;
- case MouseObject:
- if (mouse_move_button.get_active()) {
- set_mouse_mode (m);
- }
- break;
+ case MouseObject:
+ c = grabber_cursor;
+ break;
- case MouseGain:
- if (mouse_gain_button.get_active()) {
- set_mouse_mode (m);
+ case MouseTimeFX:
+ c = midi_resize_cursor;
+ break;
+
+ default:
+ break;
}
- break;
- case MouseZoom:
- if (mouse_zoom_button.get_active()) {
- set_mouse_mode (m);
+ } else {
+
+ switch (_edit_point) {
+ case EditAtMouse:
+ c = grabber_edit_point_cursor;
+ break;
+ default:
+ break;
}
- break;
+ }
- case MouseTimeFX:
- if (mouse_timefx_button.get_active()) {
- set_mouse_mode (m);
+ return c;
+}
+
+void
+Editor::set_canvas_cursor ()
+{
+ if (_internal_editing) {
+
+ switch (mouse_mode) {
+ case MouseRange:
+ current_canvas_cursor = midi_pencil_cursor;
+ break;
+
+ case MouseObject:
+ current_canvas_cursor = which_grabber_cursor();
+ break;
+
+ case MouseTimeFX:
+ current_canvas_cursor = midi_resize_cursor;
+ break;
+
+ default:
+ return;
}
- break;
- case MouseAudition:
- if (mouse_audition_button.get_active()) {
- set_mouse_mode (m);
+ } else {
+
+ switch (mouse_mode) {
+ case MouseRange:
+ current_canvas_cursor = selector_cursor;
+ break;
+
+ case MouseObject:
+ current_canvas_cursor = which_grabber_cursor();
+ break;
+
+ case MouseGain:
+ current_canvas_cursor = cross_hair_cursor;
+ break;
+
+ case MouseZoom:
+ current_canvas_cursor = zoom_cursor;
+ break;
+
+ case MouseTimeFX:
+ current_canvas_cursor = time_fx_cursor; // just use playhead
+ break;
+
+ case MouseAudition:
+ current_canvas_cursor = speaker_cursor;
+ break;
}
+ }
+
+ switch (_join_object_range_state) {
+ case JOIN_OBJECT_RANGE_NONE:
break;
-
- case MouseNote:
- if (mouse_note_button.get_active()) {
- set_mouse_mode (m);
- }
+ case JOIN_OBJECT_RANGE_OBJECT:
+ current_canvas_cursor = which_grabber_cursor ();
break;
-
- default:
+ case JOIN_OBJECT_RANGE_RANGE:
+ current_canvas_cursor = selector_cursor;
break;
}
-}
-Gdk::Cursor*
-Editor::which_grabber_cursor ()
-{
- switch (_edit_point) {
- case EditAtMouse:
- return grabber_edit_point_cursor;
- break;
- default:
- break;
+ if (is_drawable()) {
+ track_canvas->get_window()->set_cursor(*current_canvas_cursor);
}
- return grabber_cursor;
}
void
-Editor::set_canvas_cursor ()
+Editor::set_mouse_mode (MouseMode m, bool force)
{
- switch (mouse_mode) {
+ if (_drags->active ()) {
+ return;
+ }
+
+ if (!force && m == mouse_mode) {
+ return;
+ }
+
+ Glib::RefPtr<Action> act;
+
+ switch (m) {
case MouseRange:
- current_canvas_cursor = selector_cursor;
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
break;
case MouseObject:
- current_canvas_cursor = which_grabber_cursor();
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
break;
case MouseGain:
- current_canvas_cursor = cross_hair_cursor;
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain"));
break;
case MouseZoom:
- current_canvas_cursor = zoom_cursor;
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-zoom"));
break;
case MouseTimeFX:
- current_canvas_cursor = time_fx_cursor; // just use playhead
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx"));
break;
case MouseAudition:
- current_canvas_cursor = speaker_cursor;
- break;
-
- case MouseNote:
- set_midi_edit_cursor (current_midi_edit_mode());
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition"));
break;
}
- if (is_drawable()) {
- track_canvas->get_window()->set_cursor(*current_canvas_cursor);
- }
+ assert (act);
+
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+ assert (tact);
+
+ /* go there and back to ensure that the toggled handler is called to set up mouse_mode */
+ tact->set_active (false);
+ tact->set_active (true);
}
void
-Editor::set_mouse_mode (MouseMode m, bool force)
+Editor::mouse_mode_toggled (MouseMode m)
{
- if (_drag) {
- return;
- }
-
- if (!force && m == mouse_mode) {
- return;
- }
-
mouse_mode = m;
instant_save ();
- if (mouse_mode != MouseRange) {
+ if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
- /* in all modes except range, hide the range selection,
+ /* in all modes except range and joined object/range, hide the range selection,
show the object (region) selection.
*/
} else {
- /*
- in range mode,show the range selection.
+ /*
+ in range or object/range mode, show the range selection.
*/
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- if ((*i)->get_selected()) {
- (*i)->show_selection (selection->time);
- }
+ (*i)->show_selection (selection->time);
}
}
- /* 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.
- */
-
- ignore_mouse_mode_toggle = true;
-
- switch (mouse_mode) {
- case MouseRange:
- mouse_select_button.set_active (true);
- break;
-
- case MouseObject:
- mouse_move_button.set_active (true);
- break;
-
- case MouseGain:
- mouse_gain_button.set_active (true);
- break;
-
- case MouseZoom:
- mouse_zoom_button.set_active (true);
- break;
-
- case MouseTimeFX:
- mouse_timefx_button.set_active (true);
- break;
-
- case MouseAudition:
- mouse_audition_button.set_active (true);
- break;
-
- case MouseNote:
- mouse_note_button.set_active (true);
- set_midi_edit_cursor (current_midi_edit_mode());
- break;
- }
-
- if (midi_tools_tearoff) {
- if (mouse_mode == MouseNote) {
- midi_tools_tearoff->show();
- } else {
- midi_tools_tearoff->hide();
- }
- }
-
- ignore_mouse_mode_toggle = false;
-
set_canvas_cursor ();
}
}
}
break;
-
+
case MouseGain:
if (next) set_mouse_mode (MouseTimeFX);
else set_mouse_mode (MouseZoom);
break;
-
+
case MouseTimeFX:
if (next) {
set_mouse_mode (MouseAudition);
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::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 MidiEditResize:
- if (midi_tool_resize_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) {
- 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 MidiEditResize:
- midi_tool_resize_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)
-{
- switch (midi_edit_mode) {
- case MidiEditPencil:
- current_canvas_cursor = midi_pencil_cursor;
- break;
-
- case MidiEditSelect:
- current_canvas_cursor = midi_select_cursor;
- break;
-
- case MidiEditResize:
- current_canvas_cursor = midi_resize_cursor;
- break;
-
- case MidiEditErase:
- current_canvas_cursor = midi_erase_cursor;
- break;
}
}
void
-Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
+Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemType item_type)
{
/* in object/audition/timefx/gain-automation mode,
any button press sets the selection if the object
*/
if (((mouse_mode != MouseObject) &&
+ (_join_object_range_state != JOIN_OBJECT_RANGE_OBJECT) &&
(mouse_mode != MouseAudition || item_type != RegionItem) &&
(mouse_mode != MouseTimeFX || item_type != RegionItem) &&
(mouse_mode != MouseGain) &&
(mouse_mode != MouseRange)) ||
((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
-
+
return;
}
if (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) {
if ((event->button.state & Keyboard::RelevantModifierKeyMask) && event->button.button != 1) {
-
+
/* almost no selection action on modified button-2 or button-3 events */
-
+
if (item_type != RegionItem && event->button.button != 2) {
return;
}
}
}
- Selection::Operation op = Keyboard::selection_type (event->button.state);
+ Selection::Operation op = ArdourKeyboard::selection_type (event->button.state);
bool press = (event->type == GDK_BUTTON_PRESS);
// begin_reversible_command (_("select on click"));
-
+
switch (item_type) {
case RegionItem:
- if (mouse_mode != MouseRange) {
+ if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
set_selected_regionview_from_click (press, op, true);
} else if (event->type == GDK_BUTTON_PRESS) {
- set_selected_track_as_side_effect ();
+ selection->clear_tracks ();
+ set_selected_track_as_side_effect (true);
+ }
+ if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) {
+ clicked_selection = select_range_around_region (selection->regions.front());
}
+
break;
-
+
case RegionViewNameHighlight:
case RegionViewName:
- if (mouse_mode != MouseRange) {
+ if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
set_selected_regionview_from_click (press, op, true);
} else if (event->type == GDK_BUTTON_PRESS) {
set_selected_track_as_side_effect ();
case FadeInItem:
case FadeOutHandleItem:
case FadeOutItem:
- if (mouse_mode != MouseRange) {
+ if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
set_selected_regionview_from_click (press, op, true);
} else if (event->type == GDK_BUTTON_PRESS) {
set_selected_track_as_side_effect ();
case ControlPointItem:
set_selected_track_as_side_effect ();
- if (mouse_mode != MouseRange) {
+ if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
set_selected_control_point_from_click (op, false);
}
break;
-
+
case StreamItem:
- /* for context click or range selection, select track */
+ /* for context click, select track */
if (event->button.button == 3) {
- set_selected_track_as_side_effect ();
- } else if (event->type == GDK_BUTTON_PRESS && mouse_mode == MouseRange) {
- set_selected_track_as_side_effect ();
+ selection->clear_tracks ();
+ set_selected_track_as_side_effect (true);
}
break;
-
+
case AutomationTrackItem:
set_selected_track_as_side_effect (true);
break;
-
+
default:
break;
}
}
bool
-Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
+Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
- Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
-
- if (canvas_window) {
- Glib::RefPtr<const Gdk::Window> pointer_window;
- int x, y;
- double wx, wy;
- Gdk::ModifierType mask;
-
- 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);
- allow_vertical_scroll = true;
- } else {
- allow_vertical_scroll = false;
- }
+ if (_drags->active ()) {
+ _drags->abort ();
}
- track_canvas->grab_focus();
+ /* single mouse clicks on any of these item types operate
+ independent of mouse mode, mostly because they are
+ not on the main track canvas or because we want
+ them to be modeless.
+ */
- if (session && session->actively_recording()) {
+ switch (item_type) {
+ case PlayheadCursorItem:
+ _drags->set (new CursorDrag (this, item, true), event);
return true;
- }
- button_selection (item, event, item_type);
+ case MarkerItem:
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+ hide_marker (item, event);
+ } else {
+ _drags->set (new MarkerDrag (this, item), event);
+ }
+ return true;
- if (_drag == 0 &&
- (Keyboard::is_delete_event (&event->button) ||
- Keyboard::is_context_menu_event (&event->button) ||
- Keyboard::is_edit_event (&event->button))) {
-
- /* handled by button release */
+ case TempoMarkerItem:
+ _drags->set (
+ new TempoMarkerDrag (
+ this,
+ item,
+ Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ ),
+ event
+ );
+ return true;
+
+ case MeterMarkerItem:
+ _drags->set (
+ new MeterMarkerDrag (
+ this,
+ item,
+ Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ ),
+ event
+ );
+ return true;
+
+ case MarkerBarItem:
+ case TempoBarItem:
+ case MeterBarItem:
+ if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
+ }
+ return true;
+ break;
+
+
+ case RangeMarkerBarItem:
+ if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
+ } else {
+ _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker), event);
+ }
+ return true;
+ break;
+
+ case CdMarkerBarItem:
+ if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
+ } else {
+ _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCDMarker), event);
+ }
+ return true;
+ break;
+
+ case TransportMarkerBarItem:
+ if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
+ } else {
+ _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateTransportMarker), event);
+ }
return true;
+ break;
+
+ default:
+ break;
}
- switch (event->button.button) {
- case 1:
+ if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
+ /* special case: allow trim of range selections in joined object mode;
+ in theory eff should equal MouseRange in this case, but it doesn't
+ because entering the range selection canvas item results in entered_regionview
+ being set to 0, so update_join_object_range_location acts as if we aren't
+ over a region.
+ */
+ if (item_type == StartSelectionTrimItem) {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
+ } else if (item_type == EndSelectionTrimItem) {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim), event);
+ }
+ }
- if (event->type == GDK_BUTTON_PRESS) {
+ Editing::MouseMode eff = effective_mouse_mode ();
- if (_drag) {
- _drag->item()->ungrab (event->button.time);
+ /* special case: allow drag of region fade in/out in object mode with join object/range enabled */
+ if (item_type == FadeInHandleItem || item_type == FadeOutHandleItem) {
+ eff = MouseObject;
+ }
+
+ switch (eff) {
+ case MouseRange:
+ switch (item_type) {
+ case StartSelectionTrimItem:
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
+ break;
+
+ case EndSelectionTrimItem:
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim), event);
+ break;
+
+ case SelectionItem:
+ if (Keyboard::modifier_state_contains
+ (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier))) {
+ // 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::SecondaryModifier)) {
+ /* grab selection for moving */
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event);
+ } else {
+ double const y = event->button.y + vertical_adjustment.get_value() - canvas_timebars_vsize;
+ pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
+ if (tvp.first) {
+ AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
+ if (join_object_range_button.get_active() && atv) {
+ /* smart "join" mode: drag automation */
+ _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event);
+ } else {
+ /* this was debated, but decided the more common action was to
+ make a new selection */
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ }
+ }
}
+ break;
- /* single mouse clicks on any of these item types operate
- independent of mouse mode, mostly because they are
- not on the main track canvas or because we want
- them to be modeless.
- */
+ default:
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ }
+ return true;
+ break;
+
+ case MouseObject:
+ switch (item_type) {
+ case NoteItem:
+ if (internal_editing()) {
+ /* Note: we don't get here if not in internal_editing() mode */
+ _drags->set (new NoteDrag (this, item), event);
+ return true;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) &&
+ event->type == GDK_BUTTON_PRESS) {
+
+ _drags->set (new RubberbandSelectDrag (this, item), event);
+
+ } else if (event->type == GDK_BUTTON_PRESS) {
+
switch (item_type) {
- case PlayheadCursorItem:
- assert (_drag == 0);
- _drag = new CursorDrag (this, item, true);
- _drag->start_grab (event);
+ case FadeInHandleItem:
+ {
+ RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+ _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
return true;
+ }
- case MarkerItem:
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
- hide_marker (item, event);
+ case FadeOutHandleItem:
+ {
+ RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+ _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
+ return true;
+ }
+
+ case RegionItem:
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
+ add_region_copy_drag (item, event, clicked_regionview);
+ } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
+ add_region_brush_drag (item, event, clicked_regionview);
} else {
- assert (_drag == 0);
- _drag = new MarkerDrag (this, item);
- _drag->start_grab (event);
+ add_region_drag (item, event, clicked_regionview);
}
- return true;
- case TempoMarkerItem:
- assert (_drag == 0);
- _drag = new TempoMarkerDrag (
- this,
- item,
- Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
- );
- _drag->start_grab (event);
- return true;
+ if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) {
+ _drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove));
+ }
- case MeterMarkerItem:
- assert (_drag == 0);
+ _drags->start_grab (event);
+ break;
- _drag = new MeterMarkerDrag (
- this,
- item,
- Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
- );
-
- _drag->start_grab (event);
+ case RegionViewNameHighlight:
+ {
+ RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+ _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
return true;
+ break;
+ }
- case MarkerBarItem:
- case TempoBarItem:
- case MeterBarItem:
- if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- assert (_drag == 0);
- _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false);
- _drag->start_grab (event);
- }
+ case RegionViewName:
+ {
+ /* rename happens on edit clicks */
+ RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+ _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer()), event);
return true;
break;
+ }
-
- case RangeMarkerBarItem:
- assert (_drag == 0);
- if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false);
- } else {
- _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker);
- }
- _drag->start_grab (event);
+ case ControlPointItem:
+ _drags->set (new ControlPointDrag (this, item), event);
return true;
break;
- case CdMarkerBarItem:
- assert (_drag == 0);
- if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false);
- } else {
- _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCDMarker);
- }
- _drag->start_grab (event);
+ case AutomationLineItem:
+ _drags->set (new LineDrag (this, item), event);
return true;
break;
- case TransportMarkerBarItem:
- assert (_drag == 0);
- if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false);
+ case StreamItem:
+ if (internal_editing()) {
+ _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
+ return true;
} else {
- _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateTransportMarker);
+ _drags->set (new RubberbandSelectDrag (this, item), event);
}
- _drag->start_grab (event);
- return true;
- break;
-
- default:
- break;
- }
- }
-
- switch (mouse_mode) {
- case MouseRange:
- switch (item_type) {
- case StartSelectionTrimItem:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim);
- _drag->start_grab (event);
break;
- case EndSelectionTrimItem:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim);
- _drag->start_grab (event);
+ case AutomationTrackItem:
+ /* rubberband drag to select automation points */
+ _drags->set (new RubberbandSelectDrag (this, item), event);
break;
case SelectionItem:
- if (Keyboard::modifier_state_contains
- (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::PrimaryModifier)) {
- /* grab selection for moving */
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionMove);
- _drag->start_grab (event);
- } else {
- /* this was debated, but decided the more common action was to
- make a new selection */
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection);
- _drag->start_grab (event);
+ {
+ if (join_object_range_button.get_active()) {
+ /* we're in "smart" joined mode, and we've clicked on a Selection */
+ double const y = event->button.y + vertical_adjustment.get_value() - canvas_timebars_vsize;
+ pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
+ if (tvp.first) {
+ /* if we're over an automation track, start a drag of its data */
+ AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
+ if (atv) {
+ _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event);
+ }
+
+ /* if we're over a track and a region, and in the `object' part of a region,
+ put a selection around the region and drag both
+ */
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
+ if (rtv && _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
+ boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (rtv->route ());
+ if (t) {
+ boost::shared_ptr<Playlist> pl = t->playlist ();
+ if (pl) {
+
+ boost::shared_ptr<Region> r = pl->top_region_at (event_frame (event));
+ if (r) {
+ RegionView* rv = rtv->view()->find_view (r);
+ clicked_selection = select_range_around_region (rv);
+ _drags->add (new SelectionDrag (this, item, SelectionDrag::SelectionMove));
+ list<RegionView*> rvs;
+ rvs.push_back (rv);
+ _drags->add (new RegionMoveDrag (this, item, rv, rvs, false, false));
+ _drags->start_grab (event);
+ }
+ }
+ }
+ }
+ }
}
break;
-
- default:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection);
- _drag->start_grab (event);
}
- return true;
- break;
-
- case MouseObject:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) &&
- event->type == GDK_BUTTON_PRESS) {
-
- assert (_drag == 0);
- _drag = new RubberbandSelectDrag (this, item);
- _drag->start_grab (event);
-
- } else if (event->type == GDK_BUTTON_PRESS) {
- switch (item_type) {
- case FadeInHandleItem:
- assert (_drag == 0);
- _drag = new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), selection->regions);
- _drag->start_grab (event);
- return true;
-
- case FadeOutHandleItem:
- assert (_drag == 0);
- _drag = new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), selection->regions);
- _drag->start_grab (event);
- return true;
-
- case RegionItem:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
- start_region_copy_grab (item, event, clicked_regionview);
- } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
- start_region_brush_grab (item, event, clicked_regionview);
- } else {
- start_region_grab (item, event, clicked_regionview);
- }
- break;
-
- case RegionViewNameHighlight:
- assert (_drag == 0);
- _drag = new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
- return true;
- break;
-
- case RegionViewName:
- /* rename happens on edit clicks */
- assert (_drag == 0);
- _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
- return true;
- break;
-
- case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
- return true;
- break;
-
- case AutomationLineItem:
- assert (_drag == 0);
- _drag = new LineDrag (this, item);
- _drag->start_grab (event);
- return true;
- break;
-
- case StreamItem:
- case AutomationTrackItem:
- assert (_drag == 0);
- _drag = new RubberbandSelectDrag (this, item);
- _drag->start_grab (event);
- break;
-
#ifdef WITH_CMT
- case ImageFrameHandleStartItem:
- imageframe_start_handle_op(item, event) ;
- return(true) ;
- break ;
- case ImageFrameHandleEndItem:
- imageframe_end_handle_op(item, event) ;
- return(true) ;
- break ;
- case MarkerViewHandleStartItem:
- markerview_item_start_handle_op(item, event) ;
- return(true) ;
- break ;
- case MarkerViewHandleEndItem:
- markerview_item_end_handle_op(item, event) ;
- return(true) ;
- break ;
- case MarkerViewItem:
- start_markerview_grab(item, event) ;
- break ;
- case ImageFrameItem:
- start_imageframe_grab(item, event) ;
- break ;
+ case ImageFrameHandleStartItem:
+ imageframe_start_handle_op(item, event) ;
+ return(true) ;
+ break ;
+ case ImageFrameHandleEndItem:
+ imageframe_end_handle_op(item, event) ;
+ return(true) ;
+ break ;
+ case MarkerViewHandleStartItem:
+ markerview_item_start_handle_op(item, event) ;
+ return(true) ;
+ break ;
+ case MarkerViewHandleEndItem:
+ markerview_item_end_handle_op(item, event) ;
+ return(true) ;
+ break ;
+ case MarkerViewItem:
+ start_markerview_grab(item, event) ;
+ break ;
+ case ImageFrameItem:
+ start_imageframe_grab(item, event) ;
+ break ;
#endif
- case MarkerBarItem:
-
- break;
-
- default:
- break;
- }
- }
- return true;
- break;
-
- case MouseGain:
- switch (item_type) {
- case RegionItem:
- /* start a grab so that if we finish after moving
- we can tell what happened.
- */
- assert (_drag == 0);
- _drag = new RegionGainDrag (this, item);
- _drag->start_grab (event, current_canvas_cursor);
- break;
-
- case GainLineItem:
- assert (_drag == 0);
- _drag = new LineDrag (this, item);
- _drag->start_grab (event);
- return true;
+ case MarkerBarItem:
- case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
- return true;
break;
default:
break;
}
- return true;
- break;
-
- switch (item_type) {
- case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
- break;
+ }
+ return true;
+ break;
- case AutomationLineItem:
- assert (_drag == 0);
- _drag = new LineDrag (this, item);
- _drag->start_grab (event);
- break;
+ case MouseGain:
+ switch (item_type) {
+ case RegionItem:
+ /* start a grab so that if we finish after moving
+ we can tell what happened.
+ */
+ _drags->set (new RegionGainDrag (this, item), event, current_canvas_cursor);
+ break;
- case RegionItem:
- // XXX need automation mode to identify which
- // line to use
- // start_line_grab_from_regionview (item, event);
- break;
+ case GainLineItem:
+ _drags->set (new LineDrag (this, item), event);
+ return true;
- default:
- break;
- }
+ case ControlPointItem:
+ _drags->set (new ControlPointDrag (this, item), event);
return true;
break;
- case MouseZoom:
- if (event->type == GDK_BUTTON_PRESS) {
- assert (_drag == 0);
- _drag = new MouseZoomDrag (this, item);
- _drag->start_grab (event);
- }
-
- return true;
+ default:
break;
+ }
+ return true;
+ break;
- case MouseTimeFX:
- if (item_type == RegionItem) {
- assert (_drag == 0);
- _drag = new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
- }
+ switch (item_type) {
+ case ControlPointItem:
+ _drags->set (new ControlPointDrag (this, item), event);
break;
- case MouseAudition:
- _drag = new ScrubDrag (this, item);
- _drag->start_grab (event);
- scrub_reversals = 0;
- scrub_reverse_distance = 0;
- last_scrub_x = event->button.x;
- scrubbing_direction = 0;
- track_canvas->get_window()->set_cursor (*transparent_cursor);
+ case AutomationLineItem:
+ _drags->set (new LineDrag (this, item), event);
break;
- case MouseNote:
- assert (_drag == 0);
- _drag = new RegionCreateDrag (this, item, clicked_axisview);
- _drag->start_grab (event);
+ case RegionItem:
+ // XXX need automation mode to identify which
+ // line to use
+ // start_line_grab_from_regionview (item, event);
break;
-
+
default:
break;
}
+ return true;
break;
- case 2:
- switch (mouse_mode) {
- case MouseObject:
- if (event->type == GDK_BUTTON_PRESS) {
- switch (item_type) {
- case RegionItem:
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
- start_region_copy_grab (item, event, clicked_regionview);
- } else {
- start_region_grab (item, event, clicked_regionview);
- }
- return true;
- break;
- case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
- return true;
- break;
-
- default:
- break;
- }
- }
-
-
- switch (item_type) {
- case RegionViewNameHighlight:
- assert (_drag == 0);
- _drag = new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
- return true;
- break;
-
- case RegionViewName:
- assert (_drag == 0);
- _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
- return true;
- break;
-
- default:
- break;
+ case MouseZoom:
+ if (event->type == GDK_BUTTON_PRESS) {
+ _drags->set (new MouseZoomDrag (this, item), event);
+ }
+
+ return true;
+ break;
+
+ case MouseTimeFX:
+ if (internal_editing() && item_type == NoteItem) {
+ /* drag notes if we're in internal edit mode */
+ _drags->set (new NoteResizeDrag (this, item), event);
+ return true;
+ } else if (!internal_editing() || dynamic_cast<AudioRegionView*> (clicked_regionview)) {
+ /* do time-FX if we're not in internal edit mode, or we are but we clicked on an audio region */
+ _drags->set (new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
+ return true;
+ }
+ break;
+
+ case MouseAudition:
+ _drags->set (new ScrubDrag (this, item), event);
+ scrub_reversals = 0;
+ scrub_reverse_distance = 0;
+ last_scrub_x = event->button.x;
+ scrubbing_direction = 0;
+ track_canvas->get_window()->set_cursor (*transparent_cursor);
+ return true;
+ break;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+bool
+Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
+{
+ Editing::MouseMode const eff = effective_mouse_mode ();
+ switch (eff) {
+ case MouseObject:
+ switch (item_type) {
+ case RegionItem:
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
+ add_region_copy_drag (item, event, clicked_regionview);
+ } else {
+ add_region_drag (item, event, clicked_regionview);
}
-
+ _drags->start_grab (event);
+ return true;
+ break;
+ case ControlPointItem:
+ _drags->set (new ControlPointDrag (this, item), event);
+ return true;
break;
- case MouseRange:
- if (event->type == GDK_BUTTON_PRESS) {
- /* relax till release */
- }
+ default:
+ break;
+ }
+
+ switch (item_type) {
+ case RegionViewNameHighlight:
+ _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
return true;
break;
-
-
- case MouseZoom:
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- temporal_zoom_session();
- } else {
- temporal_zoom_to_frame (true, event_frame(event));
- }
+
+ case RegionViewName:
+ _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer()), event);
return true;
break;
break;
+ case MouseRange:
+ /* relax till release */
+ return true;
+ break;
+
+
+ case MouseZoom:
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ temporal_zoom_session();
+ } else {
+ temporal_zoom_to_frame (true, event_frame(event));
+ }
+ return true;
+ break;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+bool
+Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
+{
+ if (event->type != GDK_BUTTON_PRESS) {
+ return false;
+ }
+
+ Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
+
+ if (canvas_window) {
+ Glib::RefPtr<const Gdk::Window> pointer_window;
+ int x, y;
+ double wx, wy;
+ Gdk::ModifierType mask;
+
+ 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);
+ allow_vertical_scroll = true;
+ } else {
+ allow_vertical_scroll = false;
+ }
+ }
+
+ track_canvas->grab_focus();
+
+ if (_session && _session->actively_recording()) {
+ return true;
+ }
+
+ button_selection (item, event, item_type);
+
+ if (!_drags->active () &&
+ (Keyboard::is_delete_event (&event->button) ||
+ Keyboard::is_context_menu_event (&event->button) ||
+ Keyboard::is_edit_event (&event->button))) {
+
+ /* handled by button release */
+ return true;
+ }
+
+ switch (event->button.button) {
+ case 1:
+ return button_press_handler_1 (item, event, item_type);
+ break;
+
+ case 2:
+ return button_press_handler_2 (item, event, item_type);
+ break;
+
case 3:
break;
{
nframes64_t where = event_frame (event, 0, 0);
AutomationTimeAxisView* atv = 0;
-
+
/* no action if we're recording */
-
- if (session && session->actively_recording()) {
+
+ if (_session && _session->actively_recording()) {
return true;
}
/* first, see if we're finishing a drag ... */
bool were_dragging = false;
- if (_drag) {
- bool const r = _drag->end_grab (event);
- delete _drag;
- _drag = 0;
+ if (_drags->active ()) {
+ bool const r = _drags->end_grab (event);
if (r) {
/* grab dragged, so do nothing else */
return true;
were_dragging = true;
}
-
+
button_selection (item, event, item_type);
/* edit events get handled here */
- if (_drag == 0 && Keyboard::is_edit_event (&event->button)) {
+ if (!_drags->active () && Keyboard::is_edit_event (&event->button)) {
switch (item_type) {
case RegionItem:
edit_region ();
case TempoMarkerItem:
edit_tempo_marker (item);
break;
-
+
case MeterMarkerItem:
edit_meter_marker (item);
break;
-
+
case RegionViewName:
if (clicked_regionview->name_active()) {
return mouse_rename_region (item, event);
if (Keyboard::is_context_menu_event (&event->button)) {
- if (_drag == 0) {
+ if (!_drags->active ()) {
/* no matter which button pops up the context menu, tell the menu
widget to use button 1 to drive menu selection.
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;
popup_track_context_menu (1, event->button.time, item_type, false, where);
break;
- case MarkerBarItem:
- case RangeMarkerBarItem:
+ case MarkerBarItem:
+ case RangeMarkerBarItem:
case TransportMarkerBarItem:
case CdMarkerBarItem:
case TempoBarItem:
break;
case TempoMarkerItem:
- tm_marker_context_menu (&event->button, item);
+ tempo_or_meter_marker_context_menu (&event->button, item);
break;
-
+
case MeterMarkerItem:
- tm_marker_context_menu (&event->button, item);
+ tempo_or_meter_marker_context_menu (&event->button, item);
break;
-
+
case CrossfadeViewItem:
popup_track_context_menu (1, event->button.time, item_type, false, where);
break;
popup_marker_time_axis_edit_menu(1, event->button.time, item, false) ;
break ;
#endif
-
+
default:
break;
}
/* delete events get handled here */
- if (_drag == 0 && Keyboard::is_delete_event (&event->button)) {
+ Editing::MouseMode const eff = effective_mouse_mode ();
+
+ if (!_drags->active () && Keyboard::is_delete_event (&event->button)) {
switch (item_type) {
case TempoMarkerItem:
remove_tempo_marker (item);
break;
-
+
case MeterMarkerItem:
remove_meter_marker (item);
break;
break;
case RegionItem:
- if (mouse_mode == MouseObject) {
+ if (eff == MouseObject) {
remove_clicked_region ();
}
break;
-
+
case ControlPointItem:
- if (mouse_mode == MouseGain) {
+ if (eff == MouseGain) {
remove_gain_control_point (item, event);
} else {
remove_control_point (item, event);
case MarkerBarItem:
if (!_dragging_playhead) {
- if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
- snap_to (where, 0, true);
- }
+ snap_to_with_modifier (where, event, 0, true);
mouse_add_new_marker (where);
}
return true;
case CdMarkerBarItem:
if (!_dragging_playhead) {
// 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);
- }
+ snap_to_with_modifier (where, event, 0, true);
mouse_add_new_marker (where, true);
}
return true;
case TempoBarItem:
if (!_dragging_playhead) {
- if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
- snap_to (where);
- }
+ snap_to_with_modifier (where, event);
mouse_add_new_tempo_event (where);
}
return true;
-
+
case MeterBarItem:
if (!_dragging_playhead) {
mouse_add_new_meter_event (pixel_to_frame (event->button.x));
- }
+ }
return true;
break;
default:
break;
}
-
- switch (mouse_mode) {
+
+ switch (eff) {
case MouseObject:
switch (item_type) {
case AutomationTrackItem:
atv = dynamic_cast<AutomationTimeAxisView*>(clicked_axisview);
if (atv) {
atv->add_automation_event (item, event, where, event->button.y);
- }
+ }
return true;
-
break;
-
+
default:
break;
}
}
return true;
break;
-
+
case AutomationTrackItem:
dynamic_cast<AutomationTimeAxisView*>(clicked_axisview)->
add_automation_event (item, event, where, event->button.y);
break;
}
break;
-
+
case MouseAudition:
track_canvas->get_window()->set_cursor (*current_canvas_cursor);
if (scrubbing_direction == 0) {
}
} else {
/* make sure we stop */
- session->request_transport_speed (0.0);
- }
+ _session->request_transport_speed (0.0);
+ }
break;
-
+
default:
break;
case 2:
- switch (mouse_mode) {
-
+ switch (eff) {
+
case MouseObject:
switch (item_type) {
case RegionItem:
// Button2 click is unused
}
return true;
-
+
break;
-
+
default:
break;
}
break;
-
+
case MouseRange:
-
+
// x_style_paste (where, 1.0);
return true;
break;
-
+
default:
break;
}
break;
-
+
case 3:
break;
-
+
default:
break;
}
ControlPoint* cp;
Marker * marker;
double fraction;
-
+
if (last_item_entered != item) {
last_item_entered = item;
last_item_entered_n = 0;
double at_x, at_y;
at_x = cp->get_x();
at_y = cp->get_y ();
- cp->item()->i2w (at_x, at_y);
+ cp->i2w (at_x, at_y);
at_x += 10.0;
at_y += 10.0;
fraction = 1.0 - (cp->get_y() / cp->line().height());
- if (is_drawable() && dynamic_cast<ScrubDrag*> (_drag) == 0) {
+ if (is_drawable() && !_drags->active ()) {
track_canvas->get_window()->set_cursor (*fader_cursor);
}
}
}
break;
-
+
case AutomationLineItem:
if (mouse_mode == MouseGain || mouse_mode == MouseObject) {
{
}
}
break;
-
+
case RegionViewNameHighlight:
if (is_drawable() && mouse_mode == MouseObject) {
track_canvas->get_window()->set_cursor (*trimmer_cursor);
break;
case RegionViewName:
-
+
/* when the name is not an active item, the entire name highlight is for trimming */
if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
if (mouse_mode == MouseObject && is_drawable()) {
track_canvas->get_window()->set_cursor (*trimmer_cursor);
}
- }
+ }
break;
rect->property_fill_color_rgba() = 0;
rect->property_outline_pixels() = 1;
}
+ track_canvas->get_window()->set_cursor (*grabber_cursor);
}
break;
cp->set_visible (false);
}
}
-
+
if (is_drawable()) {
track_canvas->get_window()->set_cursor (*current_canvas_cursor);
}
hide_verbose_canvas_cursor ();
break;
-
+
case RegionViewNameHighlight:
case StartSelectionTrimItem:
case EndSelectionTrimItem:
track_canvas->get_window()->set_cursor (*current_canvas_cursor);
}
break;
-
+
case MarkerItem:
if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
break;
// fall through
case MeterMarkerItem:
case TempoMarkerItem:
-
+
if (is_drawable()) {
track_canvas->get_window()->set_cursor (*timebar_cursor);
}
rect->property_outline_pixels() = 0;
}
}
+ track_canvas->get_window()->set_cursor (*current_canvas_cursor);
break;
case AutomationTrackItem:
if (is_drawable()) {
track_canvas->get_window()->set_cursor (*current_canvas_cursor);
clear_entered_track = true;
- Glib::signal_idle().connect (mem_fun(*this, &Editor::left_automation_track));
+ Glib::signal_idle().connect (sigc::mem_fun(*this, &Editor::left_automation_track));
}
break;
-
+
default:
break;
}
}
void
-Editor::scrub ()
+Editor::scrub (nframes64_t frame, double current_x)
{
double delta;
-
+
if (scrubbing_direction == 0) {
/* first move */
- session->request_locate (_drag->current_pointer_frame(), false);
- session->request_transport_speed (0.1);
+ _session->request_locate (frame, false);
+ _session->request_transport_speed (0.1);
scrubbing_direction = 1;
-
+
} else {
-
- if (last_scrub_x > _drag->current_pointer_x()) {
-
+
+ if (last_scrub_x > current_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->current_pointer_x());
-
+ scrub_reverse_distance += (int) (last_scrub_x - current_x);
+
} else {
-
+
/* still moving to the left (backwards) */
-
+
scrub_reversals = 0;
scrub_reverse_distance = 0;
-
- delta = 0.01 * (last_scrub_x - _drag->current_pointer_x());
- session->request_transport_speed (session->transport_speed() - delta);
+
+ delta = 0.01 * (last_scrub_x - current_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->current_pointer_x() - last_scrub_x);
-
+ scrub_reverse_distance += (int) (current_x - last_scrub_x);
+
} else {
/* still moving to the right */
-
+
scrub_reversals = 0;
scrub_reverse_distance = 0;
-
- delta = 0.01 * (_drag->current_pointer_x() - last_scrub_x);
- session->request_transport_speed (session->transport_speed() + delta);
+
+ delta = 0.01 * (current_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);
+ _session->request_transport_speed (-0.1);
scrubbing_direction = -1;
} else {
/* was backwards, go forwards */
- session->request_transport_speed (0.1);
+ _session->request_transport_speed (0.1);
scrubbing_direction = 1;
}
-
+
scrub_reverse_distance = 0;
scrub_reversals = 0;
}
}
-
- last_scrub_x = _drag->current_pointer_x();
+
+ last_scrub_x = current_x;
}
bool
-Editor::motion_handler (ArdourCanvas::Item* item, GdkEvent* event, bool from_autoscroll)
+Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from_autoscroll)
{
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.
+ 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 */
step_timeout.disconnect ();
}
- if (session && session->actively_recording()) {
+ if (_session && _session->actively_recording()) {
/* Sorry. no dragging stuff around while we record */
return true;
}
+ JoinObjectRangeState const old = _join_object_range_state;
+ update_join_object_range_location (event->motion.x, event->motion.y);
+ if (_join_object_range_state != old) {
+ set_canvas_cursor ();
+ }
+
bool handled = false;
- if (_drag) {
- handled = _drag->motion_handler (event, from_autoscroll);
+ if (_drags->active ()) {
+ handled = _drags->motion_handler (event, from_autoscroll);
}
if (!handled) {
}
void
-Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* event)
+Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/)
{
ControlPoint* control_point;
// We shouldn't remove the first or last gain point
if (control_point->line().is_last_point(*control_point) ||
- control_point->line().is_first_point(*control_point)) {
+ control_point->line().is_first_point(*control_point)) {
return;
}
}
void
-Editor::remove_control_point (ArdourCanvas::Item* item, GdkEvent* event)
+Editor::remove_control_point (ArdourCanvas::Item* item, GdkEvent* /*event*/)
{
ControlPoint* control_point;
{
*low = TimeAxisView::max_order ();
*high = 0;
-
+
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-
+
if (!rtv->hidden()) {
-
+
if (*high < rtv->order()) {
*high = rtv->order ();
}
-
+
if (*low > rtv->order()) {
*low = rtv->order ();
}
/* Either add to or set the set the region selection, unless
this is an alignment click (control used)
*/
-
+
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;
if (rtv && rtv->is_track()) {
- speed = rtv->get_diskstream()->speed();
+ speed = rtv->track()->speed();
}
nframes64_t where = get_preferred_edit_position();
if (where >= 0) {
if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
-
+
align_region (rv.region(), SyncPoint, (nframes64_t) (where * speed));
-
+
} else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
-
+
align_region (rv.region(), End, (nframes64_t) (where * speed));
-
+
} else {
-
+
align_region (rv.region(), Start, (nframes64_t) (where * speed));
}
}
}
void
-Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos)
+Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos)
{
char buf[128];
- SMPTE::Time smpte;
+ Timecode::Time timecode;
BBT_Time bbt;
int hours, mins;
nframes64_t frame_rate;
float secs;
- if (session == 0) {
+ if (_session == 0) {
return;
}
switch (m) {
case AudioClock::BBT:
- session->bbt_time (frame, bbt);
+ _session->bbt_time (frame, bbt);
snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, bbt.bars, bbt.beats, bbt.ticks);
break;
-
- case AudioClock::SMPTE:
- session->smpte_time (frame, smpte);
- snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, smpte.hours, smpte.minutes, smpte.seconds, smpte.frames);
+
+ case AudioClock::Timecode:
+ _session->timecode_time (frame, timecode);
+ snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
break;
case AudioClock::MinSec:
/* XXX this is copied from show_verbose_duration_cursor() */
- frame_rate = session->frame_rate();
+ frame_rate = _session->frame_rate();
hours = frame / (frame_rate * 3600);
frame = frame % (frame_rate * 3600);
mins = frame / (frame_rate * 60);
if (xpos >= 0 && ypos >=0) {
set_verbose_canvas_cursor (buf, xpos + offset, ypos + offset);
- }
- else {
- set_verbose_canvas_cursor (buf, _drag->current_pointer_x() + offset - horizontal_adjustment.get_value(), _drag->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize);
+ } else {
+ set_verbose_canvas_cursor (buf, _drags->current_pointer_x() + offset - horizontal_position(), _drags->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize);
}
show_verbose_canvas_cursor ();
}
void
-Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset, double xpos, double ypos)
+Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset, double xpos, double ypos)
{
char buf[128];
- SMPTE::Time smpte;
+ Timecode::Time timecode;
BBT_Time sbbt;
BBT_Time ebbt;
int hours, mins;
nframes64_t distance, frame_rate;
float secs;
- Meter meter_at_start(session->tempo_map().meter_at(start));
+ Meter meter_at_start(_session->tempo_map().meter_at(start));
- if (session == 0) {
+ if (_session == 0) {
return;
}
switch (m) {
case AudioClock::BBT:
- session->bbt_time (start, sbbt);
- session->bbt_time (end, ebbt);
+ _session->bbt_time (start, sbbt);
+ _session->bbt_time (end, ebbt);
/* subtract */
/* XXX this computation won't work well if the
ebbt.beats--;
ebbt.ticks = int(Meter::ticks_per_beat) + ebbt.ticks - sbbt.ticks;
}
-
+
snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, ebbt.bars, ebbt.beats, ebbt.ticks);
break;
-
- case AudioClock::SMPTE:
- session->smpte_duration (end - start, smpte);
- snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, smpte.hours, smpte.minutes, smpte.seconds, smpte.frames);
+
+ case AudioClock::Timecode:
+ _session->timecode_duration (end - start, timecode);
+ snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
break;
case AudioClock::MinSec:
/* XXX this stuff should be elsewhere.. */
distance = end - start;
- frame_rate = session->frame_rate();
+ frame_rate = _session->frame_rate();
hours = distance / (frame_rate * 3600);
distance = distance % (frame_rate * 3600);
mins = distance / (frame_rate * 60);
set_verbose_canvas_cursor (buf, xpos + offset, ypos + offset);
}
else {
- set_verbose_canvas_cursor (buf, _drag->current_pointer_x() + offset, _drag->current_pointer_y() + offset);
+ set_verbose_canvas_cursor (buf, _drags->current_pointer_x() + offset, _drags->current_pointer_y() + offset);
}
show_verbose_canvas_cursor ();
selection->clear ();
clicked_selection = 0;
-}
+}
void
-Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction, bool obey_snap)
+Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction)
{
boost::shared_ptr<Region> region (rv.region());
RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
if (tv && tv->is_track()) {
- speed = tv->get_diskstream()->speed();
+ speed = tv->track()->speed();
}
-
+
if (left_direction) {
if (swap_direction) {
new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
}
}
- if (obey_snap) {
- snap_to (new_bound);
- }
- region->trim_start ((nframes64_t) (new_bound * speed), this);
- rv.region_changed (StartChanged);
+ region->trim_start ((nframes64_t) (new_bound * speed), this);
+ rv.region_changed (PropertyChange (ARDOUR::Properties::start));
}
void
-Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap)
+Editor::single_start_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap)
{
- boost::shared_ptr<Region> region (rv.region());
+ boost::shared_ptr<Region> region (rv.region());
if (region->locked()) {
return;
}
- nframes64_t new_bound;
-
double speed = 1.0;
TimeAxisView* tvp = clicked_axisview;
RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
if (tv && tv->is_track()) {
- speed = tv->get_diskstream()->speed();
- }
-
- if (left_direction) {
- new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
- } else {
- new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
+ speed = tv->track()->speed();
}
- if (obey_snap) {
- snap_to (new_bound, (left_direction ? 0 : 1));
- }
-
nframes64_t pre_trim_first_frame = region->first_frame();
region->trim_front ((nframes64_t) (new_bound * speed), this);
-
+
if (no_overlap) {
//Get the next region on the left of this region and shrink/expand it.
boost::shared_ptr<Playlist> playlist (region->playlist());
boost::shared_ptr<Region> region_left = playlist->find_next_region (pre_trim_first_frame, End, 0);
-
+
bool regions_touching = false;
if (region_left != 0 && (pre_trim_first_frame == region_left->last_frame() + 1)){
}
//Only trim region on the left if the first frame has gone beyond the left region's last frame.
- if (region_left != 0 &&
- (region_left->last_frame() > region->first_frame() || regions_touching))
+ if (region_left != 0 &&
+ (region_left->last_frame() > region->first_frame() || regions_touching))
{
- region_left->trim_end(region->first_frame(), this);
+ region_left->trim_end(region->first_frame() - 1, this);
}
}
-
-
- rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged));
+ rv.region_changed (ARDOUR::bounds_change);
}
void
-Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap)
+Editor::single_end_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap)
{
boost::shared_ptr<Region> region (rv.region());
return;
}
- nframes64_t new_bound;
-
double speed = 1.0;
TimeAxisView* tvp = clicked_axisview;
RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
if (tv && tv->is_track()) {
- speed = tv->get_diskstream()->speed();
- }
-
- if (left_direction) {
- new_bound = (nframes64_t) ((region->last_frame() + 1)/speed) - frame_delta;
- } else {
- new_bound = (nframes64_t) ((region->last_frame() + 1)/speed) + frame_delta;
- }
-
- if (obey_snap) {
- snap_to (new_bound);
+ speed = tv->track()->speed();
}
nframes64_t pre_trim_last_frame = region->last_frame();
bool regions_touching = false;
- if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)){
- regions_touching = true;
+ if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)) {
+ regions_touching = true;
}
//Only trim region on the right if the last frame has gone beyond the right region's first frame.
if (region_right != 0 &&
- (region_right->first_frame() < region->last_frame() || regions_touching))
+ (region_right->first_frame() < region->last_frame() || regions_touching))
{
region_right->trim_front(region->last_frame() + 1, this);
}
-
- rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged));
- }
- else {
- rv.region_changed (LengthChanged);
+
+ rv.region_changed (ARDOUR::bounds_change);
+
+ } else {
+ rv.region_changed (PropertyChange (ARDOUR::Properties::length));
}
}
void
-Editor::point_trim (GdkEvent* event)
+Editor::point_trim (GdkEvent* event, nframes64_t new_bound)
{
RegionView* rv = clicked_regionview;
- nframes64_t new_bound = _drag->current_pointer_frame();
-
- if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
- snap_to (new_bound);
- }
-
/* Choose action dependant on which button was pressed */
switch (event->button.button) {
case 1:
}
if (!(*i)->region()->locked()) {
- boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
- XMLNode &before = pl->get_state();
-
+ (*i)->region()->clear_history ();
(*i)->region()->trim_front (new_bound, this);
-
- XMLNode &after = pl->get_state();
- session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ _session->add_command(new StatefulDiffCommand ((*i)->region()));
}
}
} else {
if (!rv->region()->locked()) {
- boost::shared_ptr<Playlist> pl = rv->region()->playlist();
- XMLNode &before = pl->get_state();
+ rv->region()->clear_history ();
rv->region()->trim_front (new_bound, this);
- XMLNode &after = pl->get_state();
- session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ _session->add_command(new StatefulDiffCommand (rv->region()));
}
}
commit_reversible_command();
-
+
break;
case 2:
begin_reversible_command (_("End point trim"));
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();
+ (*i)->region()->clear_history();
(*i)->region()->trim_end (new_bound, this);
- XMLNode &after = pl->get_state();
- session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ _session->add_command(new StatefulDiffCommand ((*i)->region()));
}
}
} else {
if (!rv->region()->locked()) {
- boost::shared_ptr<Playlist> pl = rv->region()->playlist();
- XMLNode &before = pl->get_state();
+ rv->region()->clear_history ();
rv->region()->trim_end (new_bound, this);
- XMLNode &after = pl->get_state();
- session->add_command (new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ _session->add_command (new StatefulDiffCommand (rv->region()));
}
}
commit_reversible_command();
-
+
break;
default:
break;
return;
}
- region->thaw (_("trimmed region"));
- XMLNode &after = region->playlist()->get_state();
- session->add_command (new MementoCommand<Playlist>(*(region->playlist()), 0, &after));
+ region->resume_property_changes ();
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
- if (arv)
+
+ if (arv) {
arv->unhide_envelope ();
+ }
}
void
-Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* event)
+Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/)
{
Marker* marker;
bool is_start;
/*NOTREACHED*/
}
- Location* location = find_location_from_marker (marker, is_start);
+ Location* location = find_location_from_marker (marker, is_start);
location->set_hidden (true, this);
}
gint
-Editor::mouse_rename_region (ArdourCanvas::Item* item, GdkEvent* event)
+Editor::mouse_rename_region (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/)
{
using namespace Gtkmm2ext;
{
/* no brushing without a useful snap setting */
- switch (snap_mode) {
+ switch (_snap_mode) {
case SnapMagnetic:
return; /* can't work because it allows region to be placed anywhere */
default:
break; /* OK */
}
- switch (snap_type) {
+ switch (_snap_type) {
case SnapToMark:
return;
}
/* don't brush a copy over the original */
-
+
if (pos == rv->region()->position()) {
return;
}
}
boost::shared_ptr<Playlist> playlist = rtv->playlist();
- double speed = rtv->get_diskstream()->speed();
-
- XMLNode &before = playlist->get_state();
- playlist->add_region (RegionFactory::create (rv->region()), (nframes64_t) (pos * speed));
- XMLNode &after = playlist->get_state();
- session->add_command(new MementoCommand<Playlist>(*playlist.get(), &before, &after));
-
- // playlist is frozen, so we have to update manually
-
- playlist->Modified(); /* EMIT SIGNAL */
+ double speed = rtv->track()->speed();
+
+ playlist->clear_history ();
+ boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
+ playlist->add_region (new_region, (nframes64_t) (pos * speed));
+ _session->add_command (new StatefulDiffCommand (playlist));
+
+ // playlist is frozen, so we have to update manually XXX this is disgusting
+
+ playlist->RegionAdded (new_region); /* EMIT SIGNAL */
}
gint
}
void
-Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view)
+Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view)
{
assert (region_view);
_region_motion_group->raise_to_top ();
-
- assert (_drag == 0);
-
+
if (Config->get_edit_mode() == Splice) {
- _drag = new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer());
+ _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer()));
} else {
- _drag = new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, false);
+ RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+ _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, false));
}
-
- _drag->start_grab (event);
-
- begin_reversible_command (_("move region(s)"));
/* sync the canvas to what we think is its current state */
- track_canvas->update_now();
+ update_canvas_now();
}
void
-Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view)
+Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view)
{
assert (region_view);
- assert (_drag == 0);
-
+
_region_motion_group->raise_to_top ();
- _drag = new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, true);
- _drag->start_grab(event);
+
+ RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+ _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, true));
}
void
-Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view)
+Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view)
{
assert (region_view);
- assert (_drag == 0);
-
+
if (Config->get_edit_mode() == Splice) {
return;
}
- _drag = new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), true, false);
- _drag->start_grab (event);
-
+ RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+ _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), true, false));
+
begin_reversible_command (_("Drag region brush"));
}
* the section of the clicked region that lies within the time range.
*/
void
-Editor::start_selection_grab (ArdourCanvas::Item* item, GdkEvent* event)
+Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
{
if (clicked_regionview == 0) {
return;
}
/* XXX fix me one day to use all new regions */
-
+
boost::shared_ptr<Region> region (new_regions.front());
/* add it to the current stream/playlist.
catch the signal it sends when it creates the regionview to
set the regionview we want to then drag.
*/
-
+
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
+ sigc::connection c = clicked_routeview->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
+
+ /* A selection grab currently creates two undo/redo operations, one for
creating the new region and another for moving it.
*/
boost::shared_ptr<Playlist> playlist = clicked_axisview->playlist();
- XMLNode *before = &(playlist->get_state());
+ playlist->clear_history ();
clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start);
- XMLNode *after = &(playlist->get_state());
- session->add_command(new MementoCommand<Playlist>(*playlist, before, after));
+ _session->add_command(new StatefulDiffCommand (playlist));
commit_reversible_command ();
-
+
c.disconnect ();
-
+
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
+ i'm ignoring undo stuff, because the region creation will take care of it
*/
selection->set (latest_regionviews);
-
- assert (_drag == 0);
- _drag = new RegionMoveDrag (this, latest_regionviews.front()->get_canvas_group(), latest_regionviews.front(), latest_regionviews, false, false);
- _drag->start_grab (event);
+
+ _drags->set (new RegionMoveDrag (this, latest_regionviews.front()->get_canvas_group(), latest_regionviews.front(), latest_regionviews, false, false), event);
+}
+
+void
+Editor::escape ()
+{
+ if (_drags->active ()) {
+ _drags->abort ();
+ } else {
+ selection->clear ();
+ }
+}
+
+void
+Editor::set_internal_edit (bool yn)
+{
+ _internal_editing = yn;
+
+ if (yn) {
+ mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil")))));
+ mouse_select_button.get_image ()->show ();
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i);
+ if (mtv) {
+ mtv->start_step_editing ();
+ }
+ }
+ start_step_editing ();
+
+ } else {
+
+ mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range")))));
+ mouse_select_button.get_image ()->show ();
+ stop_step_editing ();
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i);
+ if (mtv) {
+ mtv->stop_step_editing ();
+ }
+ }
+ }
+
+ set_canvas_cursor ();
+
+
}
+/** Update _join_object_range_state which indicate whether we are over the top or bottom half of a region view,
+ * used by the `join object/range' tool mode.
+ */
void
-Editor::break_drag ()
+Editor::update_join_object_range_location (double x, double y)
+{
+ /* XXX: actually, this decides based on whether the mouse is in the top or bottom half of a RouteTimeAxisView;
+ entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region
+ that we're over requires searching the playlist.
+ */
+
+ if (join_object_range_button.get_active() == false || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+ _join_object_range_state = JOIN_OBJECT_RANGE_NONE;
+ return;
+ }
+
+ if (mouse_mode == MouseObject) {
+ _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT;
+ } else if (mouse_mode == MouseRange) {
+ _join_object_range_state = JOIN_OBJECT_RANGE_RANGE;
+ }
+
+ /* XXX: maybe we should make entered_track work in all cases, rather than resorting to this */
+ pair<TimeAxisView*, int> tvp = trackview_by_y_position (y + vertical_adjustment.get_value() - canvas_timebars_vsize);
+
+ if (tvp.first) {
+
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
+ if (rtv) {
+
+ double cx = 0;
+ double cy = y;
+ rtv->canvas_display()->w2i (cx, cy);
+
+ bool const top_half = cy < rtv->current_height () / 2;
+
+ _join_object_range_state = top_half ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
+ }
+ }
+}
+
+Editing::MouseMode
+Editor::effective_mouse_mode () const
{
- if (_drag) {
- _drag->break_drag ();
+ if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
+ return MouseObject;
+ } else if (_join_object_range_state == JOIN_OBJECT_RANGE_RANGE) {
+ return MouseRange;
}
+
+ return mouse_mode;
}
projects / ardour.git / blobdiff