#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 "canvas-note.h"
#include "editor.h"
#include "time_axis_view.h"
#include "audio_time_axis.h"
#include "rgb_macros.h"
#include "control_point_dialog.h"
#include "editor_drag.h"
+#include "automation_region_view.h"
+#include "edit_note_dialog.h"
#include "ardour/types.h"
#include "ardour/profile.h"
using Gtkmm2ext::Keyboard;
bool
-Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const
+Editor::mouse_frame (framepos_t& where, bool& in_track_canvas) const
{
int x, y;
double wx, wy;
return true;
}
-nframes64_t
+framepos_t
Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const
{
double cx, cy;
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);
break;
case MouseObject:
- c = grabber_cursor;
+ c = grabber_note_cursor;
break;
case MouseTimeFX:
c = grabber_edit_point_cursor;
break;
default:
+ boost::shared_ptr<Movable> m = _movable.lock();
+ if (m && m->locked()) {
+ c = speaker_cursor;
+ }
break;
}
}
return c;
}
+void
+Editor::set_current_trimmable (boost::shared_ptr<Trimmable> t)
+{
+ boost::shared_ptr<Trimmable> st = _trimmable.lock();
+
+ if (!st || st == t) {
+ _trimmable = t;
+ set_canvas_cursor ();
+ }
+
+}
+
+void
+Editor::set_current_movable (boost::shared_ptr<Movable> m)
+{
+ boost::shared_ptr<Movable> sm = _movable.lock();
+
+ if (!sm || sm != m) {
+ _movable = m;
+ set_canvas_cursor ();
+ }
+}
+
void
Editor::set_canvas_cursor ()
{
break;
case MouseZoom:
- current_canvas_cursor = zoom_cursor;
+ if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
+ current_canvas_cursor = zoom_out_cursor;
+ } else {
+ current_canvas_cursor = zoom_in_cursor;
+ }
break;
case MouseTimeFX:
}
}
- if (is_drawable()) {
- track_canvas->get_window()->set_cursor(*current_canvas_cursor);
+ switch (_join_object_range_state) {
+ case JOIN_OBJECT_RANGE_NONE:
+ break;
+ case JOIN_OBJECT_RANGE_OBJECT:
+ current_canvas_cursor = which_grabber_cursor ();
+ break;
+ case JOIN_OBJECT_RANGE_RANGE:
+ current_canvas_cursor = selector_cursor;
+ break;
+ }
+
+ /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
+ if (join_object_range_button.get_active() && last_item_entered) {
+ if (last_item_entered->property_parent() && (*last_item_entered->property_parent()).get_data (X_("timeselection"))) {
+ pair<TimeAxisView*, int> tvp = trackview_by_y_position (_last_motion_y + vertical_adjustment.get_value() - canvas_timebars_vsize);
+ if (dynamic_cast<AutomationTimeAxisView*> (tvp.first)) {
+ current_canvas_cursor = up_down_cursor;
+ }
+ }
}
+
+ set_canvas_cursor (current_canvas_cursor, true);
}
void
Editor::set_mouse_mode (MouseMode m, bool force)
{
- if (_drag) {
+ if (_drags->active ()) {
return;
}
mouse_mode = m;
instant_save ();
-
- if (mouse_mode != MouseRange) {
-
- /* in all modes except range, hide the range selection,
- show the object (region) selection.
- */
-
- for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
- (*i)->set_should_show_selection (true);
- }
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->hide_selection ();
- }
-
- } else {
-
- /*
- in range mode, show the range selection.
- */
-
- for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- (*i)->show_selection (selection->time);
- }
- }
+
+ if (!internal_editing()) {
+ if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
+
+ /* in all modes except range and joined object/range, hide the range selection,
+ show the object (region) selection.
+ */
+
+ for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+ (*i)->set_should_show_selection (true);
+ }
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->hide_selection ();
+ }
+
+ } else {
+
+ /*
+ in range or object/range mode, show the range selection.
+ */
+
+ for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+ (*i)->show_selection (selection->time);
+ }
+ }
+ }
set_canvas_cursor ();
}
region alignment.
note: not dbl-click or triple-click
+
+ Also note that there is no region selection in internal edit mode, otherwise
+ for operations operating on the selection (e.g. cut) it is not obvious whether
+ to cut notes or regions.
*/
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)) {
+ ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) ||
+ internal_editing()) {
return;
}
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 (op, 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) {
+ case LeftFrameHandle:
+ case RightFrameHandle:
+ 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 ();
+ set_selected_track_as_side_effect (op);
}
break;
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 ();
+ set_selected_track_as_side_effect (op);
}
break;
case ControlPointItem:
- set_selected_track_as_side_effect ();
- if (mouse_mode != MouseRange) {
+ set_selected_track_as_side_effect (op, true);
+ 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, select track */
if (event->button.button == 3) {
- set_selected_track_as_side_effect ();
+ selection->clear_tracks ();
+ set_selected_track_as_side_effect (op, true);
}
break;
case AutomationTrackItem:
- set_selected_track_as_side_effect (true);
+ set_selected_track_as_side_effect (op, true);
break;
default:
bool
Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
- if (_drag) {
- _drag->item()->ungrab (event->button.time);
- delete _drag;
- _drag = 0;
- }
-
/* 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
switch (item_type) {
case PlayheadCursorItem:
- assert (_drag == 0);
- _drag = new CursorDrag (this, item, true);
- _drag->start_grab (event);
+ _drags->set (new CursorDrag (this, item, true), event);
return true;
case MarkerItem:
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
hide_marker (item, event);
} else {
- assert (_drag == 0);
- _drag = new MarkerDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new MarkerDrag (this, item), event);
}
return true;
case TempoMarkerItem:
- assert (_drag == 0);
- _drag = new TempoMarkerDrag (
- this,
- item,
- Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ _drags->set (
+ new TempoMarkerDrag (
+ this,
+ item,
+ Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ ),
+ event
);
- _drag->start_grab (event);
return true;
case MeterMarkerItem:
- assert (_drag == 0);
- _drag = new MeterMarkerDrag (
- this,
- item,
- Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ _drags->set (
+ new MeterMarkerDrag (
+ this,
+ item,
+ Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ ),
+ event
);
- _drag->start_grab (event);
return true;
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);
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), 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);
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
} else {
- _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker);
+ _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker), event);
}
- _drag->start_grab (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);
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
} else {
- _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCDMarker);
+ _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCDMarker), event);
}
- _drag->start_grab (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);
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), event);
} else {
- _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateTransportMarker);
+ _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateTransportMarker), event);
}
- _drag->start_grab (event);
return true;
break;
break;
}
- switch (mouse_mode) {
+ 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);
+ }
+ }
+
+ Editing::MouseMode eff = effective_mouse_mode ();
+
+ /* 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:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim);
- _drag->start_grab (event);
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
break;
case EndSelectionTrimItem:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim);
- _drag->start_grab (event);
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim), event);
break;
case SelectionItem:
if (Keyboard::modifier_state_contains
- (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) {
+ (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::PrimaryModifier)) {
+ } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
/* grab selection for moving */
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionMove);
- _drag->start_grab (event);
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), 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);
+ 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, up_down_cursor);
+ } 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;
+ case NoteItem:
+ if (internal_editing()) {
+ /* trim notes if we're in internal edit mode and near the ends of the note */
+ ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
+ cerr << "NoteItem button press, cursor = " << current_canvas_cursor << endl;
+ if (cn->mouse_near_ends()) {
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+ } else {
+ _drags->set (new NoteDrag (this, item), event);
+ }
+ }
+ return true;
+
+ case StreamItem:
+ if (internal_editing()) {
+ if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
+ _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
+ return true;
+ }
+ } else {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ return true;
+ }
+ break;
+
+ case RegionViewNameHighlight:
+ case LeftFrameHandle:
+ case RightFrameHandle:
+ if (!clicked_regionview->region()->locked()) {
+ 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;
+
default:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection);
- _drag->start_grab (event);
+ if (!internal_editing()) {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ }
}
return true;
break;
switch (item_type) {
case NoteItem:
if (internal_editing()) {
- /* Note: we don't get here if not in internal_editing() mode */
- assert (_drag == 0);
- _drag = new NoteDrag (this, item);
- _drag->start_grab (event);
+ ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
+ if (cn->mouse_near_ends()) {
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+ } else {
+ _drags->set (new NoteDrag (this, item), event);
+ }
return true;
}
break;
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);
+ _drags->set (new RubberbandSelectDrag (this, item), event);
} else if (event->type == GDK_BUTTON_PRESS) {
switch (item_type) {
case FadeInHandleItem:
{
- assert (_drag == 0);
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s);
- _drag->start_grab (event);
+ 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 FadeOutHandleItem:
{
- assert (_drag == 0);
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s);
- _drag->start_grab (event);
+ 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 FeatureLineItem:
+ {
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
+ remove_transient(item);
+ return true;
+ }
+
+ _drags->set (new FeatureLineDrag (this, item), event);
return true;
+ break;
}
case RegionItem:
+ if (dynamic_cast<AutomationRegionView*> (clicked_regionview)) {
+ /* click on an automation region view; do nothing here and let the ARV's signal handler
+ sort it out.
+ */
+ break;
+ }
+
+ if (internal_editing ()) {
+ /* no region drags in internal edit mode */
+ break;
+ }
+
+ /* click on a normal region view */
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);
+ 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 {
- start_region_grab (item, event, clicked_regionview);
+ add_region_drag (item, event, clicked_regionview);
}
+
+ 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));
+ }
+
+ _drags->start_grab (event);
break;
case RegionViewNameHighlight:
- {
- assert (_drag == 0);
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new TrimDrag (this, item, clicked_regionview, s.by_layer());
- _drag->start_grab (event);
- return true;
+ case LeftFrameHandle:
+ case RightFrameHandle:
+ if (!internal_editing () && !clicked_regionview->region()->locked()) {
+ 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 RegionViewName:
{
/* rename happens on edit clicks */
- assert (_drag == 0);
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer());
- _drag->start_grab (event);
+ 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 ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new ControlPointDrag (this, item), event);
return true;
break;
case AutomationLineItem:
- assert (_drag == 0);
- _drag = new LineDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new LineDrag (this, item), event);
return true;
break;
case StreamItem:
if (internal_editing()) {
- assert (_drag == 0);
- _drag = new RegionCreateDrag (this, item, clicked_axisview);
- _drag->start_grab (event);
+ if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
+ _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
+ }
return true;
+ } else {
+ _drags->set (new RubberbandSelectDrag (this, item), event);
}
- /* fallthru */
+ break;
+
case AutomationTrackItem:
- assert (_drag == 0);
- _drag = new RubberbandSelectDrag (this, item);
- _drag->start_grab (event);
+ /* rubberband drag to select automation points */
+ _drags->set (new RubberbandSelectDrag (this, item), event);
+ break;
+
+ case SelectionItem:
+ {
+ 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, up_down_cursor);
+ }
+
+ /* 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;
+ }
#ifdef WITH_CMT
case ImageFrameHandleStartItem:
/* 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);
+ _drags->set (new RegionGainDrag (this, item), event, current_canvas_cursor);
break;
case GainLineItem:
- assert (_drag == 0);
- _drag = new LineDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new LineDrag (this, item), event);
return true;
case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new ControlPointDrag (this, item), event);
return true;
break;
switch (item_type) {
case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new ControlPointDrag (this, item), event);
break;
case AutomationLineItem:
- assert (_drag == 0);
- _drag = new LineDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new LineDrag (this, item), event);
break;
case RegionItem:
case MouseZoom:
if (event->type == GDK_BUTTON_PRESS) {
- assert (_drag == 0);
- _drag = new MouseZoomDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new MouseZoomDrag (this, item), event);
}
return true;
case MouseTimeFX:
if (internal_editing() && item_type == NoteItem) {
- assert (_drag == 0);
- _drag = new NoteResizeDrag (this, item);
- _drag->start_grab (event);
+ /* drag notes if we're in internal edit mode */
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
return true;
- } else if (!internal_editing() && item_type == RegionItem) {
- assert (_drag == 0);
- _drag = new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
+ } else if ((!internal_editing() || dynamic_cast<AudioRegionView*> (clicked_regionview)) && 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:
- _drag = new ScrubDrag (this, item);
- _drag->start_grab (event);
+ _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);
+ set_canvas_cursor (transparent_cursor);
return true;
break;
bool
Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
- switch (mouse_mode) {
+ 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)) {
- start_region_copy_grab (item, event, clicked_regionview);
+ add_region_copy_drag (item, event, clicked_regionview);
} else {
- start_region_grab (item, event, clicked_regionview);
+ add_region_drag (item, event, clicked_regionview);
}
+ _drags->start_grab (event);
return true;
break;
case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new ControlPointDrag (this, item), event);
return true;
break;
switch (item_type) {
case RegionViewNameHighlight:
- assert (_drag == 0);
- _drag = new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer());
- _drag->start_grab (event);
+ case LeftFrameHandle:
+ case RightFrameHandle:
+ if (!internal_editing ()) {
+ _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), 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);
+ _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer()), event);
return true;
break;
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;
}
}
+ pre_press_cursor = current_canvas_cursor;
+
track_canvas->grab_focus();
- if (session && session->actively_recording()) {
+ if (_session && _session->actively_recording()) {
return true;
}
button_selection (item, event, item_type);
- if (_drag == 0 &&
+ if (!_drags->active () &&
(Keyboard::is_delete_event (&event->button) ||
Keyboard::is_context_menu_event (&event->button) ||
Keyboard::is_edit_event (&event->button))) {
bool
Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
- nframes64_t where = event_frame (event, 0, 0);
+ framepos_t where = event_frame (event, 0, 0);
AutomationTimeAxisView* atv = 0;
+ if (pre_press_cursor) {
+ set_canvas_cursor (pre_press_cursor);
+ pre_press_cursor = 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 ... */
+ /* 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);
+ update_region_layering_order_editor ();
/* 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 ();
+ show_region_properties ();
break;
case TempoMarkerItem:
edit_control_point (item);
break;
+ case NoteItem:
+ edit_note (item);
+ break;
+
default:
break;
}
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 RegionItem:
case RegionViewNameHighlight:
+ case LeftFrameHandle:
+ case RightFrameHandle:
case RegionViewName:
popup_track_context_menu (1, event->button.time, item_type, false, where);
break;
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:
/* 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:
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);
}
break;
+ case NoteItem:
+ remove_midi_note (item, event);
+ break;
+
default:
break;
}
break;
}
- switch (mouse_mode) {
+ switch (eff) {
case MouseObject:
switch (item_type) {
case AutomationTrackItem:
break;
case MouseGain:
- // Gain only makes sense for audio regions
-
- if (!dynamic_cast<AudioRegionView*>(clicked_regionview)) {
- break;
- }
-
switch (item_type) {
case RegionItem:
+ {
/* check that we didn't drag before releasing, since
its really annoying to create new control
points when doing this.
*/
- if (were_dragging) {
- dynamic_cast<AudioRegionView*>(clicked_regionview)->add_gain_point_event (item, event);
+ AudioRegionView* arv = dynamic_cast<AudioRegionView*> (clicked_regionview);
+ if (were_dragging && arv) {
+ arv->add_gain_point_event (item, event);
}
return true;
break;
+ }
case AutomationTrackItem:
dynamic_cast<AutomationTimeAxisView*>(clicked_axisview)->
break;
case MouseAudition:
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
if (scrubbing_direction == 0) {
/* no drag, just a click */
switch (item_type) {
}
} else {
/* make sure we stop */
- session->request_transport_speed (0.0);
+ _session->request_transport_speed (0.0);
}
break;
case 2:
- switch (mouse_mode) {
+ switch (eff) {
case MouseObject:
switch (item_type) {
}
bool
-Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType item_type)
+Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
ControlPoint* cp;
Marker * marker;
double fraction;
+ bool ret = true;
- if (last_item_entered != item) {
- last_item_entered = item;
- last_item_entered_n = 0;
- }
+ last_item_entered = item;
switch (item_type) {
case ControlPointItem:
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) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ if (is_drawable() && !_drags->active ()) {
+ set_canvas_cursor (fader_cursor);
}
- last_item_entered_n++;
set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y);
- if (last_item_entered_n < 10) {
- show_verbose_canvas_cursor ();
- }
+ show_verbose_canvas_cursor ();
}
break;
if (line)
line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredGainLine.get();
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (fader_cursor);
}
}
break;
line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get();
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (fader_cursor);
}
}
break;
case RegionViewNameHighlight:
- if (is_drawable() && mouse_mode == MouseObject) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
+ set_canvas_cursor (trimmer_cursor);
}
break;
+ case LeftFrameHandle:
+ if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
+ if (entered_regionview) {
+ Trimmable::CanTrim ct = entered_regionview->region()->can_trim();
+ if ((ct & Trimmable::EndTrimEarlier) || (ct & Trimmable::EndTrimLater)) {
+ set_canvas_cursor (left_side_trim_cursor);
+ }
+ }
+ }
+ break;
+
+ case RightFrameHandle:
+ if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
+ if (entered_regionview) {
+ Trimmable::CanTrim ct = entered_regionview->region()->can_trim();
+ if ((ct & Trimmable::FrontTrimEarlier) || (ct & Trimmable::FrontTrimLater)) {
+ set_canvas_cursor (right_side_trim_cursor);
+ }
+ }
+ }
+ break;
+
case StartSelectionTrimItem:
case EndSelectionTrimItem:
#endif
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (trimmer_cursor);
}
break;
if (is_drawable()) {
switch (_edit_point) {
case EditAtMouse:
- track_canvas->get_window()->set_cursor (*grabber_edit_point_cursor);
+ set_canvas_cursor (grabber_edit_point_cursor);
break;
default:
- track_canvas->get_window()->set_cursor (*grabber_cursor);
+ set_canvas_cursor (grabber_cursor);
break;
}
}
if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
if (mouse_mode == MouseObject && is_drawable()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (trimmer_cursor);
}
}
break;
cursor = selector_cursor;
break;
case MouseZoom:
- cursor = zoom_cursor;
+ cursor = zoom_in_cursor;
break;
default:
cursor = cross_hair_cursor;
break;
}
- track_canvas->get_window()->set_cursor (*cursor);
+ set_canvas_cursor (cursor);
AutomationTimeAxisView* atv;
if ((atv = static_cast<AutomationTimeAxisView*>(item->get_data ("trackview"))) != 0) {
case MeterBarItem:
case TempoBarItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (timebar_cursor);
}
break;
case MeterMarkerItem:
case TempoMarkerItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (timebar_cursor);
}
break;
+
case FadeInHandleItem:
+ if (mouse_mode == MouseObject && !internal_editing()) {
+ ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
+ if (rect) {
+ rect->property_fill_color_rgba() = 0xBBBBBBAA;
+ }
+ set_canvas_cursor (fade_in_cursor);
+ }
+ break;
+
case FadeOutHandleItem:
- if (mouse_mode == MouseObject) {
+ if (mouse_mode == MouseObject && !internal_editing()) {
ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
if (rect) {
- rect->property_fill_color_rgba() = 0;
- rect->property_outline_pixels() = 1;
+ rect->property_fill_color_rgba() = 0xBBBBBBAA;
}
+ set_canvas_cursor (fade_out_cursor);
}
break;
-
+ case FeatureLineItem:
+ {
+ ArdourCanvas::SimpleLine *line = dynamic_cast<ArdourCanvas::SimpleLine *> (item);
+ line->property_color_rgba() = 0xFF0000FF;
+ }
+ break;
+ case SelectionItem:
+ if (join_object_range_button.get_active()) {
+ set_canvas_cursor ();
+ }
+ break;
+
default:
break;
}
break;
}
- return false;
+ return ret;
}
bool
-Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType item_type)
+Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
AutomationLine* al;
ControlPoint* cp;
Location *loc;
RegionView* rv;
bool is_start;
+ bool ret = true;
switch (item_type) {
case ControlPointItem:
cp = reinterpret_cast<ControlPoint*>(item->get_data ("control_point"));
if (cp->line().the_list()->interpolation() != AutomationList::Discrete) {
- if (cp->line().npoints() > 1 && !cp->selected()) {
+ if (cp->line().npoints() > 1 && !cp->get_selected()) {
cp->set_visible (false);
}
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
hide_verbose_canvas_cursor ();
break;
case RegionViewNameHighlight:
+ case LeftFrameHandle:
+ case RightFrameHandle:
case StartSelectionTrimItem:
case EndSelectionTrimItem:
case PlayheadCursorItem:
#endif
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
line->property_fill_color_rgba() = al->get_line_color();
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
/* see enter_handler() for notes */
if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
if (is_drawable() && mouse_mode == MouseObject) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
}
break;
case TempoBarItem:
case MarkerBarItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
case TempoMarkerItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (timebar_cursor);
}
break;
rect->property_outline_pixels() = 0;
}
}
+ set_canvas_cursor (current_canvas_cursor);
break;
case AutomationTrackItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
clear_entered_track = true;
Glib::signal_idle().connect (sigc::mem_fun(*this, &Editor::left_automation_track));
}
break;
+ case FeatureLineItem:
+ {
+ ArdourCanvas::SimpleLine *line = dynamic_cast<ArdourCanvas::SimpleLine *> (item);
+ line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();;
+ }
+ break;
default:
break;
}
- return false;
+ return ret;
}
gint
}
void
-Editor::scrub ()
+Editor::scrub (framepos_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 */
/* 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 {
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 {
/* 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 (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;
}
}
}
- last_scrub_x = _drag->current_pointer_x();
+ last_scrub_x = current_x;
}
bool
Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from_autoscroll)
{
+ _last_motion_y = event->motion.y;
+
if (event->motion.is_hint) {
gint x, y;
step_timeout.disconnect ();
}
- if (session && session->actively_recording()) {
+ if (_session && _session->actively_recording()) {
/* Sorry. no dragging stuff around while we record */
return true;
}
- bool handled = false;
- if (_drag) {
- handled = _drag->motion_handler (event, from_autoscroll);
+ 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 (_drags->active ()) {
+ handled = _drags->motion_handler (event, from_autoscroll);
+ }
+
if (!handled) {
return false;
}
p->line().modify_point_y (*p, d.get_y_fraction ());
}
+void
+Editor::edit_note (ArdourCanvas::Item* item)
+{
+ ArdourCanvas::CanvasNoteEvent* e = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (item);
+ assert (e);
+
+ EditNoteDialog d (&e->region_view(), e);
+ d.set_position (Gtk::WIN_POS_MOUSE);
+ ensure_float (d);
+
+ d.run ();
+}
+
void
Editor::visible_order_range (int* low, int* high) const
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();
+ framepos_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));
+ align_region (rv.region(), SyncPoint, (framepos_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));
+ align_region (rv.region(), End, (framepos_t) (where * speed));
} else {
- align_region (rv.region(), Start, (nframes64_t) (where * speed));
+ align_region (rv.region(), Start, (framepos_t) (where * speed));
}
}
}
}
void
-Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos)
+Editor::show_verbose_time_cursor (framepos_t frame, double offset, double xpos, double ypos)
{
char buf[128];
Timecode::Time timecode;
BBT_Time bbt;
int hours, mins;
- nframes64_t frame_rate;
+ framepos_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::Timecode:
- session->timecode_time (frame, 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);
frame = frame % (frame_rate * 60);
secs = (float) frame / (float) frame_rate;
- snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%.4f", hours, mins, secs);
+ snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs);
break;
default:
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);
+ 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 (framepos_t start, framepos_t end, double offset, double xpos, double ypos)
{
char buf[128];
Timecode::Time timecode;
BBT_Time sbbt;
BBT_Time ebbt;
int hours, mins;
- nframes64_t distance, frame_rate;
+ framepos_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
break;
case AudioClock::Timecode:
- session->timecode_duration (end - start, 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);
distance = distance % (frame_rate * 60);
secs = (float) distance / (float) frame_rate;
- snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%.4f", hours, mins, secs);
+ snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs);
break;
default:
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 ();
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, framepos_t frame_delta, bool left_direction, bool swap_direction)
{
boost::shared_ptr<Region> region (rv.region());
return;
}
- nframes64_t new_bound;
+ framepos_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();
+ speed = tv->track()->speed();
}
if (left_direction) {
if (swap_direction) {
- new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
+ new_bound = (framepos_t) (region->position()/speed) + frame_delta;
} else {
- new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
+ new_bound = (framepos_t) (region->position()/speed) - frame_delta;
}
} else {
if (swap_direction) {
- new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
+ new_bound = (framepos_t) (region->position()/speed) - frame_delta;
} else {
- new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
+ new_bound = (framepos_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 ((framepos_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, framepos_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->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();
+ framepos_t pre_trim_first_frame = region->first_frame();
- region->trim_front ((nframes64_t) (new_bound * speed), this);
+ region->trim_front ((framepos_t) (new_bound * speed), this);
if (no_overlap) {
//Get the next region on the left of this region and shrink/expand it.
}
}
- 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, framepos_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();
+ speed = tv->track()->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);
- }
-
- nframes64_t pre_trim_last_frame = region->last_frame();
+ framepos_t pre_trim_last_frame = region->last_frame();
- region->trim_end ((nframes64_t) (new_bound * speed), this);
+ region->trim_end ((framepos_t) (new_bound * speed), this);
if (no_overlap) {
//Get the next region on the right of this region and shrink/expand it.
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.
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, framepos_t new_bound)
{
RegionView* rv = clicked_regionview;
- nframes64_t new_bound = _drag->current_pointer_frame();
-
- snap_to_with_modifier (new_bound, event);
-
/* Choose action dependant on which button was pressed */
switch (event->button.button) {
case 1:
- begin_reversible_command (_("Start point trim"));
+ begin_reversible_command (_("start point trim"));
if (selection->selected (rv)) {
for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin();
}
if (!(*i)->region()->locked()) {
- boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
- XMLNode &before = pl->get_state();
-
+ (*i)->region()->clear_changes ();
(*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_changes ();
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()));
}
}
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_changes();
(*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_changes ();
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()));
}
}
return;
}
- region->thaw (_("trimmed region"));
+ region->resume_property_changes ();
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
void
-Editor::reposition_zoom_rect (nframes64_t start, nframes64_t end)
+Editor::reposition_zoom_rect (framepos_t start, framepos_t end)
{
double x1 = frame_to_pixel (start);
double x2 = frame_to_pixel (end);
void
-Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos)
+Editor::mouse_brush_insert_region (RegionView* rv, framepos_t pos)
{
/* no brushing without a useful snap setting */
}
boost::shared_ptr<Playlist> playlist = rtv->playlist();
- double speed = rtv->get_diskstream()->speed();
+ double speed = rtv->track()->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->clear_changes ();
+ boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
+ playlist->add_region (new_region, (framepos_t) (pos * speed));
+ _session->add_command (new StatefulDiffCommand (playlist));
- // playlist is frozen, so we have to update manually
+ // playlist is frozen, so we have to update manually XXX this is disgusting
- playlist->Modified(); /* EMIT SIGNAL */
+ 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 ();
+ if (!region_view->region()->playlist()) {
+ return;
+ }
- assert (_drag == 0);
+ _region_motion_group->raise_to_top ();
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 {
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new RegionMoveDrag (this, item, region_view, s.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 */
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);
+
+ if (!region_view->region()->playlist()) {
+ return;
+ }
_region_motion_group->raise_to_top ();
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new RegionMoveDrag (this, item, region_view, s.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 (!region_view->region()->playlist()) {
+ return;
+ }
+
if (Config->get_edit_mode() == Splice) {
return;
}
- RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- _drag = new RegionMoveDrag (this, item, region_view, s.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"));
}
boost::shared_ptr<Playlist> playlist = clicked_axisview->playlist();
- XMLNode *before = &(playlist->get_state());
+ playlist->clear_changes ();
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 ();
*/
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::break_drag ()
+Editor::escape ()
{
- if (_drag) {
- _drag->break_drag ();
+ if (_drags->active ()) {
+ _drags->abort ();
+ } else {
+ selection->clear ();
}
}
if (yn) {
mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil")))));
mouse_select_button.get_image ()->show ();
+ ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes"));
+ set_canvas_cursor ();
- 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 ();
+ /* deselect everything to avoid confusion when e.g. we can't now cut a previously selected
+ region because cut means "cut note" rather than "cut region".
+ */
+ selection->clear ();
} else {
mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range")))));
mouse_select_button.get_image ()->show ();
- stop_step_editing ();
+ ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges"));
+ mouse_mode_toggled (mouse_mode); // sets cursor
+ }
+}
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i);
- if (mtv) {
- mtv->stop_step_editing ();
- }
+/** 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::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);
+
+ double const c = cy / rtv->view()->child_height();
+ double d;
+ double const f = modf (c, &d);
+
+ _join_object_range_state = f < 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
}
}
+}
- set_canvas_cursor ();
+Editing::MouseMode
+Editor::effective_mouse_mode () const
+{
+ 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;
+}
+void
+Editor::remove_midi_note (ArdourCanvas::Item* item, GdkEvent *)
+{
+ ArdourCanvas::CanvasNoteEvent* e = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (item);
+ assert (e);
+ e->region_view().delete_note (e->note ());
}
projects / ardour.git / blobdiff