#include <set>
#include <string>
#include <algorithm>
+#include <bitset>
#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 "gtkmm2ext/bindings.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/tearoff.h"
+
+#include "canvas/canvas.h"
+
+#include "ardour/audioregion.h"
+#include "ardour/operations.h"
+#include "ardour/playlist.h"
+#include "ardour/profile.h"
+#include "ardour/region_factory.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
#include "ardour_ui.h"
#include "actions.h"
#include "rgb_macros.h"
#include "control_point_dialog.h"
#include "editor_drag.h"
-
-#include "ardour/types.h"
-#include "ardour/profile.h"
-#include "ardour/route.h"
-#include "ardour/audio_track.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/midi_diskstream.h"
-#include "ardour/playlist.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
-#include "ardour/midi_region.h"
-#include "ardour/dB.h"
-#include "ardour/utils.h"
-#include "ardour/region_factory.h"
-#include "ardour/source_factory.h"
-#include "ardour/session.h"
-
-#include <bitset>
+#include "automation_region_view.h"
+#include "edit_note_dialog.h"
+#include "mouse_cursors.h"
+#include "editor_cursors.h"
+#include "verbose_cursor.h"
+#include "note.h"
#include "i18n.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
{
+ /* gdk_window_get_pointer() has X11's XQueryPointer semantics in that it only
+ pays attentions to subwindows. this means that menu windows are ignored, and
+ if the pointer is in a menu, the return window from the call will be the
+ the regular subwindow *under* the menu.
+
+ this matters quite a lot if the pointer is moving around in a menu that overlaps
+ the track canvas because we will believe that we are within the track canvas
+ when we are not. therefore, we track enter/leave events for the track canvas
+ and allow that to override the result of gdk_window_get_pointer().
+ */
+
+ if (!within_track_canvas) {
+ return false;
+ }
+
int x, y;
- double wx, wy;
- Gdk::ModifierType mask;
- Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
- Glib::RefPtr<const Gdk::Window> pointer_window;
+ Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->_track_canvas->get_window();
if (!canvas_window) {
return false;
}
- pointer_window = canvas_window->get_pointer (x, y, mask);
+ Glib::RefPtr<const Gdk::Window> pointer_window = Gdk::Display::get_default()->get_window_at_pointer (x, y);
- if (pointer_window == track_canvas->get_bin_window()) {
- wx = x;
- wy = y;
- in_track_canvas = true;
+ if (!pointer_window) {
+ return false;
+ }
- } else {
+ if (pointer_window != canvas_window && pointer_window != _time_bars_canvas->get_window()) {
in_track_canvas = false;
- return false;
+ return false;
}
+ in_track_canvas = true;
+
GdkEvent event;
event.type = GDK_BUTTON_RELEASE;
- event.button.x = wx;
- event.button.y = wy;
+ event.button.x = x;
+ event.button.y = y;
+
+ where = window_event_frame (&event, 0, 0);
- where = event_frame (&event, 0, 0);
return true;
}
-nframes64_t
-Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const
+framepos_t
+Editor::window_event_frame (GdkEvent const * event, double* pcx, double* pcy) const
{
- double cx, cy;
+ double x;
+ double y;
- if (pcx == 0) {
- pcx = &cx;
+ if (!gdk_event_get_coords (event, &x, &y)) {
+ return 0;
}
- if (pcy == 0) {
- pcy = &cy;
+
+ /* event coordinates are in window units, so convert to canvas
+ * (i.e. account for scrolling)
+ */
+
+ ArdourCanvas::Duple d = _track_canvas->window_to_canvas (ArdourCanvas::Duple (x, y));
+
+ if (pcx) {
+ *pcx = d.x;
}
- *pcx = 0;
- *pcy = 0;
+ if (pcy) {
+ *pcy = d.y;
+ }
- switch (event->type) {
- case GDK_BUTTON_RELEASE:
- 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 GDK_ENTER_NOTIFY:
- case GDK_LEAVE_NOTIFY:
- track_canvas->w2c(event->crossing.x, event->crossing.y, *pcx, *pcy);
- break;
- case GDK_KEY_PRESS:
- case GDK_KEY_RELEASE:
- // track_canvas->w2c(event->key.x, event->key.y, *pcx, *pcy);
- break;
- default:
- warning << string_compose (_("Editor::event_frame() used on unhandled event type %1"), event->type) << endmsg;
- break;
+ return pixel_to_sample (d.x);
+}
+
+framepos_t
+Editor::canvas_event_frame (GdkEvent const * event, double* pcx, double* pcy) const
+{
+ double x;
+ double y;
+
+ /* event coordinates are already in canvas units */
+
+ if (!gdk_event_get_coords (event, &x, &y)) {
+ cerr << "!NO c COORDS for event type " << event->type << endl;
+ return 0;
+ }
+
+ if (pcx) {
+ *pcx = x;
}
- /* note that pixel_to_frame() never returns less than zero, so even if the pixel
+ if (pcy) {
+ *pcy = y;
+ }
+
+ /* note that pixel_to_sample() never returns less than zero, so even if the pixel
position is negative (as can be the case with motion events in particular),
the frame location is always positive.
*/
- return pixel_to_frame (*pcx);
+ return pixel_to_sample (x);
}
Gdk::Cursor*
Editor::which_grabber_cursor ()
{
- Gdk::Cursor* c = grabber_cursor;
+ Gdk::Cursor* c = _cursors->grabber;
if (_internal_editing) {
switch (mouse_mode) {
- case MouseRange:
- c = midi_pencil_cursor;
+ case MouseDraw:
+ c = _cursors->midi_pencil;
break;
case MouseObject:
- c = grabber_cursor;
+ c = _cursors->grabber_note;
break;
case MouseTimeFX:
- c = midi_resize_cursor;
+ c = _cursors->midi_resize;
+ break;
+
+ case MouseRange:
+ c = _cursors->grabber_note;
break;
default:
switch (_edit_point) {
case EditAtMouse:
- c = grabber_edit_point_cursor;
+ c = _cursors->grabber_edit_point;
break;
default:
+ boost::shared_ptr<Movable> m = _movable.lock();
+ if (m && m->locked()) {
+ c = _cursors->speaker;
+ }
break;
}
}
}
void
-Editor::set_canvas_cursor ()
+Editor::set_current_trimmable (boost::shared_ptr<Trimmable> t)
{
- if (_internal_editing) {
+ boost::shared_ptr<Trimmable> st = _trimmable.lock();
- switch (mouse_mode) {
- case MouseRange:
- current_canvas_cursor = midi_pencil_cursor;
- break;
+ if (!st || st == t) {
+ _trimmable = t;
+ set_canvas_cursor ();
+ }
+}
- case MouseObject:
- current_canvas_cursor = which_grabber_cursor();
- break;
+void
+Editor::set_current_movable (boost::shared_ptr<Movable> m)
+{
+ boost::shared_ptr<Movable> sm = _movable.lock();
- case MouseTimeFX:
- current_canvas_cursor = midi_resize_cursor;
- break;
+ if (!sm || sm != m) {
+ _movable = m;
+ set_canvas_cursor ();
+ }
+}
- default:
- return;
+void
+Editor::set_canvas_cursor ()
+{
+ switch (mouse_mode) {
+ case MouseRange:
+ current_canvas_cursor = _cursors->selector;
+ if (_internal_editing) {
+ current_canvas_cursor = which_grabber_cursor();
}
+ break;
- } else {
+ case MouseObject:
+ current_canvas_cursor = which_grabber_cursor();
+ break;
- switch (mouse_mode) {
- case MouseRange:
- current_canvas_cursor = selector_cursor;
- break;
+ case MouseDraw:
+ current_canvas_cursor = _cursors->midi_pencil;
+ break;
- case MouseObject:
- current_canvas_cursor = which_grabber_cursor();
- break;
+ case MouseGain:
+ current_canvas_cursor = _cursors->cross_hair;
+ break;
- case MouseGain:
- current_canvas_cursor = cross_hair_cursor;
- break;
+ case MouseZoom:
+ if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
+ current_canvas_cursor = _cursors->zoom_out;
+ } else {
+ current_canvas_cursor = _cursors->zoom_in;
+ }
+ break;
- case MouseZoom:
- current_canvas_cursor = zoom_cursor;
- break;
+ case MouseTimeFX:
+ current_canvas_cursor = _cursors->time_fx; // just use playhead
+ break;
- case MouseTimeFX:
- current_canvas_cursor = time_fx_cursor; // just use playhead
- break;
+ case MouseAudition:
+ current_canvas_cursor = _cursors->speaker;
+ break;
+ }
- case MouseAudition:
- current_canvas_cursor = speaker_cursor;
+ if (!_internal_editing) {
+ 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 = _cursors->selector;
break;
}
}
- 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 (!_internal_editing && get_smart_mode() ) {
+
+ double x, y;
+ get_pointer_position (x, y);
- if (is_drawable()) {
- track_canvas->get_window()->set_cursor(*current_canvas_cursor);
+ if (x >= 0 && y >= 0) {
+
+ vector<ArdourCanvas::Item const *> items;
+
+ _track_canvas->root()->add_items_at_point (ArdourCanvas::Duple (x,y), items);
+
+ // first item will be the upper most
+
+ if (!items.empty()) {
+ const ArdourCanvas::Item* i = items.front();
+
+ if (i && i->parent() && i->parent()->get_data (X_("timeselection"))) {
+ pair<TimeAxisView*, int> tvp = trackview_by_y_position (_last_motion_y);
+ if (dynamic_cast<AutomationTimeAxisView*> (tvp.first)) {
+ current_canvas_cursor = _cursors->up_down;
+ }
+ }
+ }
+ }
}
+
+ set_canvas_cursor (current_canvas_cursor, true);
+}
+
+void
+Editor::mouse_mode_object_range_toggled()
+{
+ MouseMode m = mouse_mode;
+
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
+ assert (act);
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+ assert (tact);
+ if (tact->get_active())
+ m = MouseObject; //Smart mode turned to ON, force editing to Object mode
+
+ set_mouse_mode(m, true); //call this so the button styles can get updated
}
void
Editor::set_mouse_mode (MouseMode m, bool force)
{
- if (_drag) {
+ if (_drags->active ()) {
return;
}
act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
break;
+ case MouseDraw:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
+ break;
+
case MouseGain:
act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain"));
break;
/* 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);
+
+ //NOTE: this will result in a call to mouse_mode_toggled which does the heavy lifting
}
void
Editor::mouse_mode_toggled (MouseMode m)
{
- mouse_mode = m;
+ Glib::RefPtr<Action> act;
+ Glib::RefPtr<ToggleAction> tact;
- instant_save ();
+ switch (m) {
+ case MouseRange:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
+ break;
- if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
+ case MouseObject:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
+ break;
- /* in all modes except range and joined object/range, hide the range selection,
- show the object (region) selection.
- */
+ case MouseDraw:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
+ break;
- 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 ();
- }
+ case MouseGain:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain"));
+ break;
- } else {
+ case MouseZoom:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-zoom"));
+ break;
- /*
- in range or object/range mode, show the range selection.
- */
+ case MouseTimeFX:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx"));
+ break;
- for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- (*i)->show_selection (selection->time);
- }
+ case MouseAudition:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition"));
+ break;
}
+ assert (act);
+
+ tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+ assert (tact);
+
+ if (!tact->get_active()) {
+ /* this was just the notification that the old mode has been
+ * left. we'll get called again with the new mode active in a
+ * jiffy.
+ */
+ return;
+ }
+
+ switch (m) {
+ case MouseDraw:
+ act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit"));
+ tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ tact->set_active (true);
+ break;
+ default:
+ break;
+ }
+
+ if (_session && mouse_mode == MouseAudition) {
+ /* stop transport and reset default speed to avoid oddness with
+ auditioning */
+ _session->request_transport_speed (0.0, true);
+ }
+
+ mouse_mode = m;
+
+ instant_save ();
+
+ //TODO: set button styles for smart buttons
+/*
+ if ( smart_mode_action->get_active() ) {
+ if( mouse_mode == MouseObject ) { //smart active and object active
+ smart_mode_button.set_active(1);
+ smart_mode_button.set_name("smart mode button");
+ mouse_move_button.set_name("smart mode button");
+ } else { //smart active but object inactive
+ smart_mode_button.set_active(0);
+ smart_mode_button.set_name("smart mode button");
+ mouse_move_button.set_name("mouse mode button");
+ }
+ } else {
+ smart_mode_button.set_active(0);
+ smart_mode_button.set_name("mouse mode button");
+ mouse_move_button.set_name("mouse mode button");
+ }
+*/
+
set_canvas_cursor ();
+ set_gain_envelope_visibility ();
+
+ MouseModeChanged (); /* EMIT SIGNAL */
}
void
break;
case MouseRange:
- if (next) set_mouse_mode (MouseZoom);
+ if (next) set_mouse_mode (MouseDraw);
else set_mouse_mode (MouseObject);
break;
+ case MouseDraw:
+ if (next) set_mouse_mode (MouseZoom);
+ else set_mouse_mode (MouseRange);
+ break;
+
case MouseZoom:
if (next) {
if (Profile->get_sae()) {
if (Profile->get_sae()) {
set_mouse_mode (MouseObject);
} else {
- set_mouse_mode (MouseRange);
+ set_mouse_mode (MouseDraw);
}
}
break;
}
}
+bool
+Editor::toggle_internal_editing_from_double_click (GdkEvent* event)
+{
+ if (_drags->active()) {
+ _drags->end_grab (event);
+ }
+
+ ActionManager::do_action ("MouseMode", "toggle-internal-edit");
+
+ /* prevent reversion of edit cursor on button release */
+
+ pre_press_cursor = 0;
+
+ return true;
+}
+
void
Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemType item_type)
{
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)) {
+ (mouse_mode != MouseDraw)) ||
+ ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) ||
+ (internal_editing() && mouse_mode != MouseTimeFX)) {
return;
}
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 || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
- set_selected_regionview_from_click (press, op, true);
- } else if (event->type == GDK_BUTTON_PRESS) {
- selection->clear_tracks ();
- set_selected_track_as_side_effect (true);
- }
- if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) {
- select_range_around_region (selection->regions.front());
+ if (!get_smart_mode() || (_join_object_range_state != JOIN_OBJECT_RANGE_RANGE)) {
+ if (press) {
+ if (mouse_mode != MouseRange) {
+ set_selected_regionview_from_click (press, op);
+ } else {
+ /* don't change the selection unless the
+ clicked track is not currently selected. if
+ so, "collapse" the selection to just this
+ track
+ */
+ if (!selection->selected (clicked_axisview)) {
+ set_selected_track_as_side_effect (Selection::Set);
+ }
+ }
+ } else {
+ if (mouse_mode != MouseRange) {
+ set_selected_regionview_from_click (press, op);
+ }
+ }
}
-
break;
case RegionViewNameHighlight:
case RegionViewName:
- if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
- set_selected_regionview_from_click (press, op, true);
+ case LeftFrameHandle:
+ case RightFrameHandle:
+ if ( mouse_mode != MouseRange ) {
+ set_selected_regionview_from_click (press, op);
} else if (event->type == GDK_BUTTON_PRESS) {
- set_selected_track_as_side_effect ();
+ set_selected_track_as_side_effect (op);
}
break;
-
case FadeInHandleItem:
case FadeInItem:
case FadeOutHandleItem:
case FadeOutItem:
- if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
- set_selected_regionview_from_click (press, op, true);
+ case StartCrossFadeItem:
+ case EndCrossFadeItem:
+ if ( mouse_mode != MouseRange ) {
+ set_selected_regionview_from_click (press, op);
} 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 || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
- set_selected_control_point_from_click (op, false);
+ set_selected_track_as_side_effect (op);
+ if ( mouse_mode != MouseRange ) {
+ set_selected_control_point_from_click (press, op);
}
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);
}
break;
case AutomationTrackItem:
- set_selected_track_as_side_effect (true);
+ set_selected_track_as_side_effect (op);
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, *playhead_cursor, 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)
- );
- _drag->start_grab (event);
- return true;
+ {
+ TempoMarker* m = reinterpret_cast<TempoMarker*> (item->get_data ("marker"));
+ assert (m);
+ if (m->tempo().movable ()) {
+ _drags->set (
+ new TempoMarkerDrag (
+ this,
+ item,
+ Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ ),
+ event
+ );
+ return true;
+ } else {
+ return false;
+ }
+ }
case MeterMarkerItem:
- assert (_drag == 0);
- _drag = new MeterMarkerDrag (
- this,
- item,
- Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
- );
- _drag->start_grab (event);
+ {
+ MeterMarker* m = reinterpret_cast<MeterMarker*> (item->get_data ("marker"));
+ assert (m);
+ if (m->meter().movable ()) {
+ _drags->set (
+ new MeterMarkerDrag (
+ this,
+ item,
+ Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+ ),
+ event
+ );
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ case VideoBarItem:
+ _drags->set (new VideoTimeLineDrag (this, item), 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);
+ _drags->set (new CursorDrag (this, *playhead_cursor, 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, 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, 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, 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;
over a region.
*/
if (item_type == StartSelectionTrimItem) {
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim);
- _drag->start_grab (event);
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
} else if (item_type == EndSelectionTrimItem) {
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim);
- _drag->start_grab (event);
+ _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;
+ }
+
+ /* there is no Range mode when in internal edit mode */
+ if (eff == MouseRange && internal_editing()) {
+ 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))) {
- // contains and not equals because I can't use alt as a modifier alone.
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
start_selection_grab (item, event);
- } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ return true;
+ } 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 {
- double const y = event->button.y + vertical_adjustment.get_value() - canvas_timebars_vsize;
+ double const y = event->button.y;
pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
if (tvp.first) {
AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
- assert (_drag == 0);
- if (join_object_range_button.get_active() && atv) {
+ if ( get_smart_mode() && atv) {
/* smart "join" mode: drag automation */
- _drag = new AutomationRangeDrag (this, atv->base_item(), selection->time);
+ _drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down);
} else {
/* this was debated, but decided the more common action was to
make a new selection */
- _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection);
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
}
- _drag->start_grab (event);
}
}
break;
+ case StreamItem:
+ if (internal_editing()) {
+ if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
+ _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
+ return true;
+ }
+ } else {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
+ } else {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ }
+ return true;
+ }
+ break;
+
+ case RegionViewNameHighlight:
+ if (!clicked_regionview->region()->locked()) {
+ _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
+ return true;
+ }
+ break;
+
default:
- assert (_drag == 0);
- _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection);
- _drag->start_grab (event);
+ if (!internal_editing()) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
+ } else {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ }
+ }
}
return true;
break;
+ case MouseDraw:
+ switch (item_type) {
+ case NoteItem:
+ if (internal_editing()) {
+ /* trim notes if we're in internal edit mode and near the ends of the note */
+ NoteBase* cn = reinterpret_cast<NoteBase*>(item->get_data ("notebase"));
+ assert (cn);
+ if (cn && cn->big_enough_to_trim() && 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;
+ case StreamItem:
+ if (internal_editing()) {
+ if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
+ _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
+ }
+ return true;
+ }
+ break;
+
+ default:
+ break;
+ }
+ break;
+
case MouseObject:
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);
+ NoteBase* cn = reinterpret_cast<NoteBase*> (item->get_data ("notebase"));
+ assert (cn);
+ 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;
-
+
default:
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 EditorRubberbandSelectDrag (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);
+ _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), selection->regions), event, _cursors->fade_in);
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);
+ _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), selection->regions), event, _cursors->fade_out);
+ return true;
+ }
+
+ case StartCrossFadeItem:
+ case EndCrossFadeItem:
+ /* we might allow user to grab inside the fade to trim a region with preserve_fade_anchor. for not this is not fully implemented */
+// if (!clicked_regionview->region()->locked()) {
+// _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer(), true), event);
+// return true;
+// }
+ break;
+
+ 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 ()) {
+ 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);
+ add_region_copy_drag (item, event, clicked_regionview);
} else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
- start_region_brush_grab (item, event, clicked_regionview);
+ add_region_brush_drag (item, event, clicked_regionview);
} else {
- start_region_grab (item, event, clicked_regionview);
+ add_region_drag (item, event, clicked_regionview);
}
+
+
+// if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_RANGE && !selection->regions.empty())) {
+// _drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove));
+// }
+
+ _drags->start_grab (event);
+ return true;
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 (!clicked_regionview->region()->locked()) {
+ _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.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);
+ _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.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 {
- assert (_drag == 0);
- _drag = new RubberbandSelectDrag (this, item);
- _drag->start_grab (event);
+ _drags->set (new EditorRubberbandSelectDrag (this, item), event);
}
break;
-
+
case AutomationTrackItem:
- assert (_drag == 0);
- /* rubberband drag to select automation points */
- _drag = new RubberbandSelectDrag (this, item);
- _drag->start_grab (event);
+ {
+ TimeAxisView* parent = clicked_axisview->get_parent ();
+ AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (clicked_axisview);
+ assert (atv);
+ if (parent && dynamic_cast<MidiTimeAxisView*> (parent) && atv->show_regions ()) {
+
+ RouteTimeAxisView* p = dynamic_cast<RouteTimeAxisView*> (parent);
+ assert (p);
+ boost::shared_ptr<Playlist> pl = p->track()->playlist ();
+ if (pl->n_regions() == 0) {
+ /* Parent has no regions; create one so that we have somewhere to put automation */
+ _drags->set (new RegionCreateDrag (this, item, parent), event);
+ } else {
+ /* See if there's a region before the click that we can extend, and extend it if so */
+ framepos_t const t = canvas_event_frame (event);
+ boost::shared_ptr<Region> prev = pl->find_next_region (t, End, -1);
+ if (!prev) {
+ _drags->set (new RegionCreateDrag (this, item, parent), event);
+ } else {
+ prev->set_length (t - prev->position ());
+ }
+ }
+ } else {
+ /* rubberband drag to select automation points */
+ _drags->set (new EditorRubberbandSelectDrag (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; if we're
- * over an automation track, start a drag of its data */
- double const y = event->button.y + vertical_adjustment.get_value() - canvas_timebars_vsize;
+ if ( get_smart_mode() ) {
+ /* we're in "smart" joined mode, and we've clicked on a Selection */
+ double const y = event->button.y;
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) {
- assert (_drag == 0);
- _drag = new AutomationRangeDrag (this, atv->base_item(), selection->time);
- _drag->start_grab (event);
+ _drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down);
}
+
+ /* 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 (canvas_event_frame (event));
+ if (r) {
+ RegionView* rv = rtv->view()->find_view (r);
+ clicked_selection = select_range (rv->region()->position(),
+ rv->region()->last_frame()+1);
+ _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);
+ return true;
+ }
+ }
+ }
+ }
+*/
}
}
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 ;
-#endif
-
case MarkerBarItem:
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);
+ _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;
- default:
+ case SelectionItem:
+ {
+ AudioRegionView* arv = dynamic_cast<AudioRegionView *> (clicked_regionview);
+ if (arv) {
+ _drags->set (new AutomationRangeDrag (this, arv, selection->time), event, _cursors->up_down);
+ _drags->start_grab (event);
+ }
+ return true;
break;
}
- return true;
- break;
-
- switch (item_type) {
- case ControlPointItem:
- assert (_drag == 0);
- _drag = new ControlPointDrag (this, item);
- _drag->start_grab (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:
- // XXX need automation mode to identify which
- // line to use
- // start_line_grab_from_regionview (item, event);
- break;
-
+
default:
break;
}
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 (clicked_regionview) {
+ /* do time-FX */
+ _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 (_cursors->transparent);
return true;
break;
case MouseObject:
switch (item_type) {
case RegionItem:
+ if (internal_editing ()) {
+ /* no region drags in internal edit mode */
+ return false;
+ }
+
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);
+ _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
+ return true;
+ break;
+
+ 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;
break;
+ case MouseDraw:
+ return false;
+
case MouseRange:
/* relax till release */
return true;
case MouseZoom:
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- temporal_zoom_session();
+ temporal_zoom_to_frame (false, canvas_event_frame (event));
} else {
- temporal_zoom_to_frame (true, event_frame(event));
+ temporal_zoom_to_frame (true, canvas_event_frame(event));
}
return true;
break;
return false;
}
-
+
bool
Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
+ if (event->type == GDK_2BUTTON_PRESS) {
+ _drags->mark_double_click ();
+ return false;
+ }
+
if (event->type != GDK_BUTTON_PRESS) {
return false;
}
- Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
+ Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->_track_canvas_viewport->get_window();
if (canvas_window) {
Glib::RefPtr<const Gdk::Window> pointer_window;
pointer_window = canvas_window->get_pointer (x, y, mask);
- if (pointer_window == track_canvas->get_bin_window()) {
- track_canvas->window_to_world (x, y, wx, wy);
- allow_vertical_scroll = true;
- } else {
- allow_vertical_scroll = false;
+ if (pointer_window == _track_canvas->get_window()) {
+ _track_canvas->window_to_canvas (x, y, wx, wy);
}
}
- track_canvas->grab_focus();
+ pre_press_cursor = current_canvas_cursor;
+
+ _track_canvas->grab_focus();
if (_session && _session->actively_recording()) {
return true;
}
+ if (internal_editing()) {
+ bool leave_internal_edit_mode = false;
+
+ switch (item_type) {
+ case NoteItem:
+ break;
+
+ case RegionItem:
+ if (!dynamic_cast<MidiRegionView*> (clicked_regionview) && !dynamic_cast<AutomationRegionView*> (clicked_regionview)) {
+ leave_internal_edit_mode = true;
+ }
+ break;
+
+ case PlayheadCursorItem:
+ case MarkerItem:
+ case TempoMarkerItem:
+ case MeterMarkerItem:
+ case MarkerBarItem:
+ case TempoBarItem:
+ case MeterBarItem:
+ case RangeMarkerBarItem:
+ case CdMarkerBarItem:
+ case TransportMarkerBarItem:
+ case StreamItem:
+ /* button press on these events never does anything to
+ change the editing mode.
+ */
+ break;
+
+ default:
+ break;
+ }
+
+ if (leave_internal_edit_mode) {
+ ActionManager::do_action ("MouseMode", "toggle-internal-edit");
+ }
+ }
+
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))) {
return true;
}
+ //not rolling, range mode click + join_play_range : locate the PH here
+ if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && Config->get_always_play_range() ) {
+ framepos_t where = canvas_event_frame (event);
+ snap_to(where);
+ _session->request_locate (where, false);
+ }
+
switch (event->button.button) {
case 1:
return button_press_handler_1 (item, event, item_type);
break;
default:
+ return button_press_dispatch (&event->button);
break;
}
return false;
}
+bool
+Editor::button_press_dispatch (GdkEventButton* ev)
+{
+ /* this function is intended only for buttons 4 and above.
+ */
+
+ Gtkmm2ext::MouseButton b (ev->state, ev->button);
+ return button_bindings->activate (b, Gtkmm2ext::Bindings::Press);
+}
+
+bool
+Editor::button_release_dispatch (GdkEventButton* ev)
+{
+ /* this function is intended only for buttons 4 and above.
+ */
+
+ Gtkmm2ext::MouseButton b (ev->state, ev->button);
+ return button_bindings->activate (b, Gtkmm2ext::Bindings::Release);
+}
+
bool
Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
- nframes64_t where = event_frame (event, 0, 0);
+ framepos_t where = canvas_event_frame (event);
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()) {
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:
}
/* context menu events get handled here */
-
if (Keyboard::is_context_menu_event (&event->button)) {
- if (_drag == 0) {
+ context_click_event = *event;
+
+ if (!_drags->active ()) {
/* no matter which button pops up the context menu, tell the menu
widget to use button 1 to drive menu selection.
popup_fade_context_menu (1, event->button.time, item, item_type);
break;
+ case StartCrossFadeItem:
+ popup_xfade_in_context_menu (1, event->button.time, item, item_type);
+ break;
+
+ case EndCrossFadeItem:
+ popup_xfade_out_context_menu (1, event->button.time, item, item_type);
+ break;
+
case StreamItem:
- popup_track_context_menu (1, event->button.time, item_type, false, where);
+ popup_track_context_menu (1, event->button.time, item_type, false);
break;
case RegionItem:
case RegionViewNameHighlight:
+ case LeftFrameHandle:
+ case RightFrameHandle:
case RegionViewName:
- popup_track_context_menu (1, event->button.time, item_type, false, where);
+ popup_track_context_menu (1, event->button.time, item_type, false);
break;
case SelectionItem:
- popup_track_context_menu (1, event->button.time, item_type, true, where);
+ popup_track_context_menu (1, event->button.time, item_type, true);
break;
-
+
case AutomationTrackItem:
- popup_track_context_menu (1, event->button.time, item_type, false, where);
+ popup_track_context_menu (1, event->button.time, item_type, false);
break;
case MarkerBarItem:
case CdMarkerBarItem:
case TempoBarItem:
case MeterBarItem:
+ case VideoBarItem:
popup_ruler_menu (where, item_type);
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:
- popup_track_context_menu (1, event->button.time, item_type, false, where);
+ popup_track_context_menu (1, event->button.time, item_type, false);
break;
-#ifdef WITH_CMT
- case ImageFrameItem:
- popup_imageframe_edit_menu(1, event->button.time, item, true) ;
- break ;
- case ImageFrameTimeAxisItem:
- popup_imageframe_edit_menu(1, event->button.time, item, false) ;
- break ;
- case MarkerViewItem:
- popup_marker_time_axis_edit_menu(1, event->button.time, item, true) ;
- break ;
- case MarkerTimeAxisItem:
- popup_marker_time_axis_edit_menu(1, event->button.time, item, false) ;
- break ;
-#endif
+ case ControlPointItem:
+ popup_control_point_context_menu (item, event);
+ break;
default:
break;
Editing::MouseMode const eff = effective_mouse_mode ();
- if (_drag == 0 && Keyboard::is_delete_event (&event->button)) {
+ if (!_drags->active () && Keyboard::is_delete_event (&event->button)) {
switch (item_type) {
case TempoMarkerItem:
break;
case ControlPointItem:
- if (eff == MouseGain) {
- remove_gain_control_point (item, event);
- } else {
- remove_control_point (item, event);
- }
+ remove_control_point (item);
+ break;
+
+ case NoteItem:
+ remove_midi_note (item, event);
break;
default:
case MeterBarItem:
if (!_dragging_playhead) {
- mouse_add_new_meter_event (pixel_to_frame (event->button.x));
+ mouse_add_new_meter_event (pixel_to_sample (event->button.x));
}
return true;
break;
case AutomationTrackItem:
atv = dynamic_cast<AutomationTimeAxisView*>(clicked_axisview);
if (atv) {
- atv->add_automation_event (item, event, where, event->button.y);
+ atv->add_automation_event (event, where, event->button.y);
}
return true;
break;
-
default:
break;
}
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)->
- add_automation_event (item, event, where, event->button.y);
+ add_automation_event (event, where, event->button.y);
return true;
break;
default:
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) {
}
+ /* do any (de)selection operations that should occur on button release */
+ button_selection (item, event, item_type);
return true;
break;
}
break;
+ case MouseDraw:
+ return true;
+
case MouseRange:
-
// x_style_paste (where, 1.0);
return true;
break;
default:
break;
}
+
return false;
}
ControlPoint* cp;
Marker * marker;
double fraction;
-
- if (last_item_entered != item) {
- last_item_entered = item;
- last_item_entered_n = 0;
- }
+ bool ret = true;
switch (item_type) {
case ControlPointItem:
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 (_cursors->fader);
}
- 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 ();
- }
+ _verbose_cursor->set (cp->line().get_verbose_cursor_string (fraction), at_x, at_y);
+ _verbose_cursor->show ();
}
break;
case GainLineItem:
if (mouse_mode == MouseGain) {
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
- if (line)
- line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredGainLine.get();
+ if (line) {
+ line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EnteredGainLine());
+ }
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (_cursors->fader);
}
}
break;
case AutomationLineItem:
if (mouse_mode == MouseGain || mouse_mode == MouseObject) {
- {
- ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
- if (line)
- line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get();
+ ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
+ if (line) {
+ line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EnteredAutomationLine());
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (_cursors->fader);
}
}
break;
case RegionViewNameHighlight:
- if (is_drawable() && mouse_mode == MouseObject) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ if (is_drawable() && effective_mouse_mode() == MouseObject && entered_regionview) {
+ set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
+ _over_region_trim_target = true;
}
break;
+ case LeftFrameHandle:
+ case RightFrameHandle:
+ if (is_drawable() && effective_mouse_mode() == MouseObject && !internal_editing() && entered_regionview) {
+ set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
+ }
+ break;
+
case StartSelectionTrimItem:
+ if (is_drawable()) {
+ set_canvas_cursor (_cursors->left_side_trim);
+ }
+ break;
case EndSelectionTrimItem:
-
-#ifdef WITH_CMT
- case ImageFrameHandleStartItem:
- case ImageFrameHandleEndItem:
- case MarkerViewHandleStartItem:
- case MarkerViewHandleEndItem:
-#endif
-
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (_cursors->right_side_trim);
}
break;
if (is_drawable()) {
switch (_edit_point) {
case EditAtMouse:
- track_canvas->get_window()->set_cursor (*grabber_edit_point_cursor);
+ set_canvas_cursor (_cursors->grabber_edit_point);
break;
default:
- track_canvas->get_window()->set_cursor (*grabber_cursor);
+ set_canvas_cursor (_cursors->grabber);
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_for_region_view (event->crossing.x, entered_regionview);
+ _over_region_trim_target = true;
}
}
break;
Gdk::Cursor *cursor;
switch (mouse_mode) {
case MouseRange:
- cursor = selector_cursor;
+ cursor = _cursors->selector;
break;
case MouseZoom:
- cursor = zoom_cursor;
+ cursor = _cursors->zoom_in;
break;
default:
- cursor = cross_hair_cursor;
+ cursor = _cursors->cross_hair;
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 (_cursors->timebar);
}
break;
break;
}
entered_marker = marker;
- marker->set_color_rgba (ARDOUR_UI::config()->canvasvar_EnteredMarker.get());
+ marker->set_color_rgba (ARDOUR_UI::config()->get_canvasvar_EnteredMarker());
// fall through
case MeterMarkerItem:
case TempoMarkerItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (_cursors->timebar);
}
break;
+
case FadeInHandleItem:
+ if (mouse_mode == MouseObject && !internal_editing()) {
+ ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
+ if (rect) {
+ rect->set_fill_color (0xBBBBBBAA);
+ }
+ set_canvas_cursor (_cursors->fade_in);
+ }
+ break;
+
case FadeOutHandleItem:
- if (mouse_mode == MouseObject) {
- ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
+ if (mouse_mode == MouseObject && !internal_editing()) {
+ ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
if (rect) {
- rect->property_fill_color_rgba() = 0;
- rect->property_outline_pixels() = 1;
+ rect->set_fill_color (0xBBBBBBAA);
}
+ set_canvas_cursor (_cursors->fade_out);
+ }
+ break;
+ case FeatureLineItem:
+ {
+ ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
+ line->set_outline_color (0xFF0000FF);
+ }
+ break;
+
+ case SelectionItem:
+ if ( get_smart_mode() ) {
+ set_canvas_cursor ();
}
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*, 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 ();
+ _verbose_cursor->hide ();
break;
case RegionViewNameHighlight:
+ case LeftFrameHandle:
+ case RightFrameHandle:
case StartSelectionTrimItem:
case EndSelectionTrimItem:
case PlayheadCursorItem:
-#ifdef WITH_CMT
- case ImageFrameHandleStartItem:
- case ImageFrameHandleEndItem:
- case MarkerViewHandleStartItem:
- case MarkerViewHandleEndItem:
-#endif
+ _over_region_trim_target = false;
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
al = reinterpret_cast<AutomationLine*> (item->get_data ("line"));
{
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
- if (line)
- line->property_fill_color_rgba() = al->get_line_color();
+ if (line) {
+ line->set_outline_color (al->get_line_color());
+ }
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
case RegionViewName:
/* see enter_handler() for notes */
+ _over_region_trim_target = false;
+
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 (current_canvas_cursor);
}
break;
case FadeOutHandleItem:
rv = static_cast<RegionView*>(item->get_data ("regionview"));
{
- ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
+ ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
if (rect) {
- rect->property_fill_color_rgba() = rv->get_fill_color();
- rect->property_outline_pixels() = 0;
+ rect->set_fill_color (rv->get_fill_color());
}
}
+ 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::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
+ line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
+ }
+ break;
default:
break;
}
- if (item_type == RegionItem) {
- update_join_object_range_location (event->crossing.x, event->crossing.y);
- }
-
- 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->adjusted_current_frame (0), false);
+ _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_nonzero (_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_nonzero (_session->transport_speed() + delta);
}
}
}
}
- 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;
event might do, its a good tradeoff.
*/
- track_canvas->get_pointer (x, y);
+ _track_canvas->get_pointer (x, y);
}
if (current_stepping_trackview) {
JoinObjectRangeState const old = _join_object_range_state;
update_join_object_range_location (event->motion.x, event->motion.y);
- if (_join_object_range_state != old) {
+
+ if (!_internal_editing && _join_object_range_state != old) {
set_canvas_cursor ();
}
+ if (!_internal_editing && _over_region_trim_target) {
+ set_canvas_cursor_for_region_view (event->motion.x, entered_regionview);
+ }
+
bool handled = false;
- if (_drag) {
- handled = _drag->motion_handler (event, from_autoscroll);
+ if (_drags->active ()) {
+ handled = _drags->motion_handler (event, from_autoscroll);
}
if (!handled) {
return true;
}
-void
-Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/)
+bool
+Editor::can_remove_control_point (ArdourCanvas::Item* item)
{
ControlPoint* control_point;
/*NOTREACHED*/
}
- // 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)) {
- return;
+ AutomationLine& line = control_point->line ();
+ if (dynamic_cast<AudioRegionGainLine*> (&line)) {
+ /* we shouldn't remove the first or last gain point in region gain lines */
+ if (line.is_last_point(*control_point) || line.is_first_point(*control_point)) {
+ return false;
+ }
}
- control_point->line().remove_point (*control_point);
+ return true;
}
void
-Editor::remove_control_point (ArdourCanvas::Item* item, GdkEvent* /*event*/)
+Editor::remove_control_point (ArdourCanvas::Item* item)
{
+ if (!can_remove_control_point (item)) {
+ return;
+ }
+
ControlPoint* control_point;
if ((control_point = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"))) == 0) {
}
ControlPointDialog d (p);
- d.set_position (Gtk::WIN_POS_MOUSE);
ensure_float (d);
if (d.run () != RESPONSE_ACCEPT) {
p->line().modify_point_y (*p, d.get_y_fraction ());
}
+void
+Editor::edit_notes (TimeAxisViewItem& tavi)
+{
+ MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(&tavi);
+
+ if (!mrv) {
+ return;
+ }
+
+ MidiRegionView::Selection const & s = mrv->selection();
+
+ if (s.empty ()) {
+ return;
+ }
+
+ EditNoteDialog* d = new EditNoteDialog (&(*s.begin())->region_view(), s);
+ d->show_all ();
+ ensure_float (*d);
+
+ d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &Editor::note_edit_done), d));
+}
+
+void
+Editor::note_edit_done (int r, EditNoteDialog* d)
+{
+ d->done (r);
+ delete d;
+}
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)
-{
- char buf[128];
- Timecode::Time timecode;
- BBT_Time bbt;
- int hours, mins;
- nframes64_t frame_rate;
- float secs;
-
- if (_session == 0) {
- return;
- }
-
- AudioClock::Mode m;
-
- if (Profile->get_sae() || Profile->get_small_screen()) {
- m = ARDOUR_UI::instance()->primary_clock.mode();
- } else {
- m = ARDOUR_UI::instance()->secondary_clock.mode();
- }
-
- switch (m) {
- case AudioClock::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);
- 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();
- 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);
- break;
-
- default:
- snprintf (buf, sizeof(buf), "%" PRIi64, frame);
- break;
- }
-
- 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);
- }
- show_verbose_canvas_cursor ();
-}
-
-void
-Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_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;
- float secs;
- Meter meter_at_start(_session->tempo_map().meter_at(start));
-
- if (_session == 0) {
- return;
- }
-
- AudioClock::Mode m;
-
- if (Profile->get_sae() || Profile->get_small_screen()) {
- m = ARDOUR_UI::instance()->primary_clock.mode ();
- } else {
- m = ARDOUR_UI::instance()->secondary_clock.mode ();
- }
-
- switch (m) {
- case AudioClock::BBT:
- _session->bbt_time (start, sbbt);
- _session->bbt_time (end, ebbt);
-
- /* subtract */
- /* XXX this computation won't work well if the
- user makes a selection that spans any meter changes.
- */
-
- ebbt.bars -= sbbt.bars;
- if (ebbt.beats >= sbbt.beats) {
- ebbt.beats -= sbbt.beats;
- } else {
- ebbt.bars--;
- ebbt.beats = int(meter_at_start.beats_per_bar()) + ebbt.beats - sbbt.beats;
- }
- if (ebbt.ticks >= sbbt.ticks) {
- ebbt.ticks -= sbbt.ticks;
- } else {
- 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::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();
- 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);
- break;
-
- default:
- snprintf (buf, sizeof(buf), "%" PRIi64, end - start);
- break;
- }
-
- 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, _drag->current_pointer_y() + offset);
- }
-
- show_verbose_canvas_cursor ();
-}
-
void
Editor::collect_new_region_view (RegionView* rv)
{
clicked_selection = 0;
}
-
-void
-Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction, bool obey_snap)
-{
- 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) {
- if (swap_direction) {
- new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
- } else {
- new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
- }
- } else {
- if (swap_direction) {
- new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
- } else {
- 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);
-}
-
-void
-Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap)
-{
- 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;
- }
-
- 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)){
- regions_touching = true;
- }
-
- //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))
- {
- region_left->trim_end(region->first_frame() - 1, this);
- }
- }
-
- rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged));
-}
-
void
-Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap)
+Editor::cancel_time_selection ()
{
- 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->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();
-
- region->trim_end ((nframes64_t) (new_bound * speed), this);
-
- if (no_overlap) {
- //Get the next region on the right of this region and shrink/expand it.
- boost::shared_ptr<Playlist> playlist (region->playlist());
- boost::shared_ptr<Region> region_right = playlist->find_next_region (pre_trim_last_frame, Start, 1);
-
- bool regions_touching = false;
-
- 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->trim_front(region->last_frame() + 1, this);
- }
-
- rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged));
- }
- else {
- rv.region_changed (LengthChanged);
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->hide_selection ();
}
-}
-
+ selection->time.clear ();
+ clicked_selection = 0;
+}
void
-Editor::point_trim (GdkEvent* event)
+Editor::point_trim (GdkEvent* event, framepos_t new_bound)
{
RegionView* rv = clicked_regionview;
- nframes64_t new_bound = _drag->adjusted_current_frame (event);
-
- 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();
i != selection->regions.by_layer().end(); ++i)
{
- if ( (*i) == NULL){
- cerr << "region view contains null region" << endl;
- }
-
if (!(*i)->region()->locked()) {
- boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
- XMLNode &before = pl->get_state();
-
- (*i)->region()->trim_front (new_bound, this);
-
- XMLNode &after = pl->get_state();
- _session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ (*i)->region()->clear_changes ();
+ (*i)->region()->trim_front (new_bound);
+ _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()->trim_front (new_bound, this);
- XMLNode &after = pl->get_state();
- _session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ rv->region()->clear_changes ();
+ rv->region()->trim_front (new_bound);
+ _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()->trim_end (new_bound, this);
- XMLNode &after = pl->get_state();
- _session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ (*i)->region()->clear_changes();
+ (*i)->region()->trim_end (new_bound);
+ _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()->trim_end (new_bound, this);
- XMLNode &after = pl->get_state();
- _session->add_command (new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ rv->region()->clear_changes ();
+ rv->region()->trim_end (new_bound);
+ _session->add_command (new StatefulDiffCommand (rv->region()));
}
}
}
}
-void
-Editor::thaw_region_after_trim (RegionView& rv)
-{
- boost::shared_ptr<Region> region (rv.region());
-
- if (region->locked()) {
- return;
- }
-
- region->thaw (_("trimmed region"));
-
- AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
-
- if (arv) {
- arv->unhide_envelope ();
- }
-}
-
void
Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/)
{
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);
- double y2 = full_canvas_height - 1.0;
-
- zoom_rect->property_x1() = x1;
- zoom_rect->property_y1() = 1.0;
- zoom_rect->property_x2() = x2;
- zoom_rect->property_y2() = y2;
+ double x1 = sample_to_pixel (start);
+ double x2 = sample_to_pixel (end);
+ double y2 = _full_canvas_height - 1.0;
+
+ zoom_rect->set (ArdourCanvas::Rect (x1, 1.0, x2, y2));
}
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(), true));
+ 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*, 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);
+ _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.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*, 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);
+ _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.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*, 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);
+ _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), true, false));
- begin_reversible_command (_("Drag region brush"));
+ begin_reversible_command (Operations::drag_region_brush);
}
/** Start a grab where a time range is selected, track(s) are selected, and the
creating the new region and another for moving it.
*/
- begin_reversible_command (_("selection grab"));
+ begin_reversible_command (Operations::selection_grab);
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 ();
}
}
void
Editor::set_internal_edit (bool yn)
{
- _internal_editing = yn;
+ if (_internal_editing == yn) {
+ return;
+ }
+ _internal_editing = yn;
+
if (yn) {
- mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil")))));
- mouse_select_button.get_image ()->show ();
+ pre_internal_mouse_mode = mouse_mode;
+ pre_internal_snap_type = _snap_type;
+ pre_internal_snap_mode = _snap_mode;
- 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 ();
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->enter_internal_edit_mode ();
+ }
- } else {
+ set_snap_to (internal_snap_type);
+ set_snap_mode (internal_snap_mode);
- mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range")))));
- mouse_select_button.get_image ()->show ();
- stop_step_editing ();
+ } else {
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i);
- if (mtv) {
- mtv->stop_step_editing ();
- }
- }
- }
+ internal_snap_mode = _snap_mode;
+ internal_snap_type = _snap_type;
- set_canvas_cursor ();
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->leave_internal_edit_mode ();
+ }
+ if (mouse_mode == MouseDraw && pre_internal_mouse_mode != MouseDraw) {
+ /* we were drawing .. flip back to something sensible */
+ set_mouse_mode (pre_internal_mouse_mode);
+ }
+ set_snap_to (pre_internal_snap_type);
+ set_snap_mode (pre_internal_snap_mode);
+ }
+
+ 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::update_join_object_range_location (double x, double y)
+Editor::update_join_object_range_location (double /*x*/, double y)
{
- if (join_object_range_button.get_active() == false || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+ /* XXX: actually, this decides based on whether the mouse is in the top
+ or bottom half of a the waveform part RouteTimeAxisView;
+
+ Note that 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 ( !get_smart_mode() ) {
_join_object_range_state = JOIN_OBJECT_RANGE_NONE;
return;
}
- if (entered_regionview) {
+ 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;
+ }
- double cx = x;
- double cy = y;
- entered_regionview->get_canvas_group()->w2i (cx, cy);
-
- double x1;
- double y1;
- double x2;
- double y2;
- entered_regionview->get_canvas_group()->get_bounds (x1, y1, x2, y2);
-
- bool const top_half = cy < (y2 - y1) / 2;
-
- _join_object_range_state = top_half ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
-
- } else {
+ /* 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);
+
+ if (tvp.first) {
+
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
+ if (rtv) {
+
+ double cx = 0;
+ double cy = y;
+ rtv->canvas_display()->canvas_to_item (cx, cy);
- 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;
+ double const c = cy / (rtv->view()->child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
+
+ _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
}
}
}
return mouse_mode;
}
+
+void
+Editor::remove_midi_note (ArdourCanvas::Item* item, GdkEvent *)
+{
+ NoteBase* e = reinterpret_cast<NoteBase*> (item->get_data ("notebase"));
+ assert (e);
+
+ e->region_view().delete_note (e->note ());
+}
+
+void
+Editor::set_canvas_cursor_for_region_view (double x, RegionView* rv)
+{
+ /* XXX: this check should not be necessary */
+ if (rv == 0) {
+ return;
+ }
+
+ assert (rv);
+
+ ArdourCanvas::Group* g = rv->get_canvas_group ();
+ ArdourCanvas::Group* p = g->parent ();
+
+ /* Compute x in region view parent coordinates */
+ double dy = 0;
+ p->canvas_to_item (x, dy);
+
+ boost::optional<ArdourCanvas::Rect> item_bbox = g->bounding_box ();
+ assert (item_bbox);
+ ArdourCanvas::Rect parent_bbox = g->item_to_parent (item_bbox.get ());
+
+ /* Halfway across the region */
+ double const h = (parent_bbox.x0 + parent_bbox.x1) / 2;
+
+ Trimmable::CanTrim ct = rv->region()->can_trim ();
+ if (x <= h) {
+ if (ct & Trimmable::FrontTrimEarlier) {
+ set_canvas_cursor (_cursors->left_side_trim);
+ } else {
+ set_canvas_cursor (_cursors->left_side_trim_right_only);
+ }
+ } else {
+ if (ct & Trimmable::EndTrimLater) {
+ set_canvas_cursor (_cursors->right_side_trim);
+ } else {
+ set_canvas_cursor (_cursors->right_side_trim_left_only);
+ }
+ }
+}
+
+/** Obtain the pointer position in canvas coordinates */
+void
+Editor::get_pointer_position (double& x, double& y) const
+{
+ int px, py;
+ _track_canvas->get_pointer (px, py);
+ _track_canvas->window_to_canvas (px, py, x, y);
+}
projects / ardour.git / blobdiff