#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 "ardour_ui.h"
#include "actions.h"
#include "canvas-note.h"
#include "editor_drag.h"
#include "automation_region_view.h"
#include "edit_note_dialog.h"
+#include "mouse_cursors.h"
+#include "editor_cursors.h"
#include "ardour/types.h"
#include "ardour/profile.h"
#include "ardour/region_factory.h"
#include "ardour/source_factory.h"
#include "ardour/session.h"
+#include "ardour/operations.h"
#include <bitset>
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;
+ c = _cursors->midi_pencil;
break;
case MouseObject:
- c = grabber_note_cursor;
+ c = _cursors->grabber_note;
break;
case MouseTimeFX:
- c = midi_resize_cursor;
+ c = _cursors->midi_resize;
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;
}
}
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 ()
{
switch (mouse_mode) {
case MouseRange:
- current_canvas_cursor = midi_pencil_cursor;
+ current_canvas_cursor = _cursors->midi_pencil;
break;
case MouseObject:
break;
case MouseTimeFX:
- current_canvas_cursor = midi_resize_cursor;
+ current_canvas_cursor = _cursors->midi_resize;
break;
default:
switch (mouse_mode) {
case MouseRange:
- current_canvas_cursor = selector_cursor;
+ current_canvas_cursor = _cursors->selector;
break;
case MouseObject:
break;
case MouseGain:
- current_canvas_cursor = cross_hair_cursor;
+ current_canvas_cursor = _cursors->cross_hair;
break;
case MouseZoom:
- current_canvas_cursor = zoom_in_cursor;
+ 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 MouseTimeFX:
- current_canvas_cursor = time_fx_cursor; // just use playhead
+ current_canvas_cursor = _cursors->time_fx; // just use playhead
break;
case MouseAudition:
- current_canvas_cursor = speaker_cursor;
+ current_canvas_cursor = _cursors->speaker;
break;
}
}
current_canvas_cursor = which_grabber_cursor ();
break;
case JOIN_OBJECT_RANGE_RANGE:
- current_canvas_cursor = selector_cursor;
+ current_canvas_cursor = _cursors->selector;
break;
}
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;
+ current_canvas_cursor = _cursors->up_down;
}
}
}
- if (is_drawable()) {
- track_canvas->get_window()->set_cursor(*current_canvas_cursor);
- }
+ set_canvas_cursor (current_canvas_cursor, true);
}
void
/* 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);
+
+ MouseModeChanged (); /* EMIT SIGNAL */
}
void
instant_save ();
- if (!internal_editing()) {
- if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
+ 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.
- */
+ /* 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 ();
- }
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->hide_selection ();
+ }
- } else {
+ } else {
- /*
- in range or object/range mode, show the range selection.
- */
+ /*
+ in range or object/range mode, show the range selection.
+ */
- for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- (*i)->show_selection (selection->time);
- }
- }
- }
+ for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+ (*i)->show_selection (selection->time);
+ }
+ }
+ }
set_canvas_cursor ();
+
+ MouseModeChanged (); /* EMIT SIGNAL */
}
void
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) {
case RegionViewNameHighlight:
case RegionViewName:
- case LeftFrameHandle:
- case RightFrameHandle:
+ 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) {
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);
+ _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event, _cursors->up_down);
} else {
/* this was debated, but decided the more common action was to
make a new selection */
}
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);
- if (cn->mouse_near_ends()) {
- _drags->set (new NoteResizeDrag (this, item), event);
- } else {
- _drags->set (new NoteDrag (this, item), event);
- }
- }
+ 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);
+ if (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;
- case StreamItem:
- if (internal_editing()) {
+ case StreamItem:
+ if (internal_editing()) {
if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
_drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
return true;
}
- } else {
+ } else {
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
return true;
}
- break;
+ break;
- case RegionViewNameHighlight:
- case LeftFrameHandle:
- case RightFrameHandle:
- {
- 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 RegionViewNameHighlight:
+ 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;
+
+ 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;
default:
- if (!internal_editing()) {
- _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
- }
+ if (!internal_editing()) {
+ _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
+ }
}
return true;
break;
switch (item_type) {
case NoteItem:
if (internal_editing()) {
- ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
- if (cn->mouse_near_ends()) {
- _drags->set (new NoteResizeDrag (this, item), event);
- } else {
- _drags->set (new NoteDrag (this, item), event);
- }
+ ArdourCanvas::CanvasNoteEvent* cn = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (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;
case FadeInHandleItem:
{
RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
- _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
+ _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event, _cursors->fade_in);
return true;
}
case FadeOutHandleItem:
{
RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
- _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
+ _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event, _cursors->fade_out);
return true;
}
/* click on a normal region view */
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
add_region_copy_drag (item, event, clicked_regionview);
- }
- else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
+ } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
add_region_brush_drag (item, event, clicked_regionview);
} else {
add_region_drag (item, event, clicked_regionview);
case RegionViewNameHighlight:
case LeftFrameHandle:
case RightFrameHandle:
- if (!internal_editing ()) {
+ 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;
/* 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);
+ _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event, _cursors->up_down);
}
/* if we're over a track and a region, and in the `object' part of a region,
case MouseTimeFX:
if (internal_editing() && item_type == NoteItem) {
/* drag notes if we're in internal edit mode */
- _drags->set (new NoteResizeDrag (this, item), event);
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
return true;
} 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 */
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;
switch (item_type) {
case RegionViewNameHighlight:
+ _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
+ return true;
+ break;
+
case LeftFrameHandle:
case RightFrameHandle:
if (!internal_editing ()) {
case MouseZoom:
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
- temporal_zoom_session();
+ temporal_zoom_to_frame (false, event_frame (event));
} else {
temporal_zoom_to_frame (true, event_frame(event));
}
}
}
+ pre_press_cursor = current_canvas_cursor;
+
track_canvas->grab_focus();
if (_session && _session->actively_recording()) {
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)
{
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()) {
were_dragging = true;
}
- update_region_layering_order_editor (where);
+ update_region_layering_order_editor ();
/* edit events get handled here */
if (!_drags->active () && Keyboard::is_edit_event (&event->button)) {
switch (item_type) {
case RegionItem:
- edit_region ();
+ show_region_properties ();
break;
case TempoMarkerItem:
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 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:
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
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) {
default:
break;
-
+
}
+ /* do any (de)selection operations that should occur on button release */
+ button_selection (item, event, item_type);
return true;
break;
default:
break;
}
+
+ cerr << "button release hits bottom\n";
+
return false;
}
fraction = 1.0 - (cp->get_y() / cp->line().height());
if (is_drawable() && !_drags->active ()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (_cursors->fader);
}
set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y);
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 (_cursors->fader);
}
}
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 (_cursors->fader);
}
}
break;
case RegionViewNameHighlight:
- if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ if (is_drawable() && mouse_mode == MouseObject && entered_regionview) {
+ set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
+ _over_region_trim_target = true;
}
break;
case LeftFrameHandle:
- if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
- track_canvas->get_window()->set_cursor (*left_side_trim_cursor);
- }
- break;
-
case RightFrameHandle:
- if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
- track_canvas->get_window()->set_cursor (*right_side_trim_cursor);
+ if (is_drawable() && mouse_mode == MouseObject && !internal_editing() && entered_regionview) {
+ set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
}
break;
#endif
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (_cursors->trimmer);
}
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_in_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;
case MeterMarkerItem:
case TempoMarkerItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (_cursors->timebar);
}
break;
if (rect) {
rect->property_fill_color_rgba() = 0xBBBBBBAA;
}
- track_canvas->get_window()->set_cursor (*fade_in_cursor);
+ set_canvas_cursor (_cursors->fade_in);
}
- break;
+ break;
case FadeOutHandleItem:
if (mouse_mode == MouseObject && !internal_editing()) {
if (rect) {
rect->property_fill_color_rgba() = 0xBBBBBBAA;
}
- track_canvas->get_window()->set_cursor (*fade_out_cursor);
+ set_canvas_cursor (_cursors->fade_out);
}
break;
case FeatureLineItem:
{
- ArdourCanvas::SimpleLine *line = dynamic_cast<ArdourCanvas::SimpleLine *> (item);
- line->property_color_rgba() = 0xFF0000FF;
+ ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
+ line->property_fill_color_rgba() = 0xFF0000FF;
}
break;
case SelectionItem:
Location *loc;
RegionView* rv;
bool is_start;
- bool ret = true;
+ bool ret = true;
switch (item_type) {
case ControlPointItem:
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
hide_verbose_canvas_cursor ();
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;
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;
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 (_cursors->timebar);
}
break;
rect->property_outline_pixels() = 0;
}
}
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ 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();;
+ ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
+ line->property_fill_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();;
}
break;
scrub_reverse_distance = 0;
delta = 0.01 * (last_scrub_x - current_x);
- _session->request_transport_speed (_session->transport_speed() - delta);
+ _session->request_transport_speed_nonzero (_session->transport_speed() - delta);
}
} else {
scrub_reverse_distance = 0;
delta = 0.01 * (current_x - last_scrub_x);
- _session->request_transport_speed (_session->transport_speed() + delta);
+ _session->request_transport_speed_nonzero (_session->transport_speed() + delta);
}
}
set_canvas_cursor ();
}
+ if (_over_region_trim_target) {
+ set_canvas_cursor_for_region_view (event->motion.x, entered_regionview);
+ }
+
bool handled = false;
if (_drags->active ()) {
handled = _drags->motion_handler (event, from_autoscroll);
{
char buf[128];
Timecode::Time timecode;
- BBT_Time bbt;
+ Timecode::BBT_Time bbt;
int hours, mins;
framepos_t frame_rate;
float secs;
{
char buf[128];
Timecode::Time timecode;
- BBT_Time sbbt;
- BBT_Time ebbt;
+ Timecode::BBT_Time sbbt;
+ Timecode::BBT_Time ebbt;
int hours, mins;
framepos_t distance, frame_rate;
float secs;
ebbt.ticks -= sbbt.ticks;
} else {
ebbt.beats--;
- ebbt.ticks = int(Meter::ticks_per_beat) + ebbt.ticks - sbbt.ticks;
+ ebbt.ticks = int(Timecode::BBT_Time::ticks_per_beat) + ebbt.ticks - sbbt.ticks;
}
snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, ebbt.bars, ebbt.beats, ebbt.ticks);
}
-void
-Editor::single_contents_trim (RegionView& rv, framepos_t frame_delta, bool left_direction, bool swap_direction)
-{
- boost::shared_ptr<Region> region (rv.region());
-
- if (region->locked()) {
- return;
- }
-
- 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->track()->speed();
- }
-
- if (left_direction) {
- if (swap_direction) {
- new_bound = (framepos_t) (region->position()/speed) + frame_delta;
- } else {
- new_bound = (framepos_t) (region->position()/speed) - frame_delta;
- }
- } else {
- if (swap_direction) {
- new_bound = (framepos_t) (region->position()/speed) - frame_delta;
- } else {
- new_bound = (framepos_t) (region->position()/speed) + frame_delta;
- }
- }
-
- region->trim_start ((framepos_t) (new_bound * speed), this);
- rv.region_changed (PropertyChange (ARDOUR::Properties::start));
-}
-
-void
-Editor::single_start_trim (RegionView& rv, framepos_t new_bound, bool no_overlap)
-{
- boost::shared_ptr<Region> region (rv.region());
-
- if (region->locked()) {
- return;
- }
-
- double speed = 1.0;
- TimeAxisView* tvp = clicked_axisview;
- RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
-
- if (tv && tv->is_track()) {
- speed = tv->track()->speed();
- }
-
- framepos_t pre_trim_first_frame = region->first_frame();
-
- 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.
- 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 (ARDOUR::bounds_change);
-}
-
-void
-Editor::single_end_trim (RegionView& rv, framepos_t new_bound, bool no_overlap)
-{
- boost::shared_ptr<Region> region (rv.region());
-
- if (region->locked()) {
- return;
- }
-
- double speed = 1.0;
- TimeAxisView* tvp = clicked_axisview;
- RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
-
- if (tv && tv->is_track()) {
- speed = tv->track()->speed();
- }
-
- framepos_t pre_trim_last_frame = region->last_frame();
-
- 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.
- 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 (ARDOUR::bounds_change);
-
- } else {
- rv.region_changed (PropertyChange (ARDOUR::Properties::length));
- }
-}
-
-
void
Editor::point_trim (GdkEvent* event, framepos_t new_bound)
{
}
}
-void
-Editor::thaw_region_after_trim (RegionView& rv)
-{
- boost::shared_ptr<Region> region (rv.region());
-
- if (region->locked()) {
- return;
- }
-
- region->resume_property_changes ();
-
- AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
-
- if (arv) {
- arv->unhide_envelope ();
- }
-}
-
void
Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/)
{
boost::shared_ptr<Playlist> playlist = rtv->playlist();
double speed = rtv->track()->speed();
- playlist->clear_changes ();
- boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
- playlist->add_region (new_region, (framepos_t) (pos * speed));
+ 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 XXX this is disgusting
{
assert (region_view);
- if (!region_view->region()->playlist()) {
- return;
- }
+ if (!region_view->region()->playlist()) {
+ return;
+ }
_region_motion_group->raise_to_top ();
{
assert (region_view);
- if (!region_view->region()->playlist()) {
- return;
- }
+ if (!region_view->region()->playlist()) {
+ return;
+ }
_region_motion_group->raise_to_top ();
{
assert (region_view);
- if (!region_view->region()->playlist()) {
- return;
- }
+ if (!region_view->region()->playlist()) {
+ return;
+ }
if (Config->get_edit_mode() == Splice) {
return;
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"));
+ 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();
- playlist->clear_changes ();
+ playlist->clear_changes ();
clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start);
_session->add_command(new StatefulDiffCommand (playlist));
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 ();
+ ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes"));
+ mouse_mode_toggled (mouse_mode);
- /* 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 ();
+ pre_internal_mouse_mode = mouse_mode;
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->enter_internal_edit_mode ();
+ }
} else {
mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range")))));
mouse_select_button.get_image ()->show ();
- ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges"));
- mouse_mode_toggled (mouse_mode); // sets cursor
+ 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) {
+ (*i)->leave_internal_edit_mode ();
+ }
+
+ if (mouse_mode == MouseRange && pre_internal_mouse_mode != MouseRange) {
+ /* we were drawing .. flip back to something sensible */
+ set_mouse_mode (pre_internal_mouse_mode);
+ }
}
}
double cy = y;
rtv->canvas_display()->w2i (cx, cy);
- bool const top_half = cy < rtv->current_height () / 2;
-
- _join_object_range_state = top_half ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
+ 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;
}
}
}
e->region_view().delete_note (e->note ());
}
+
+void
+Editor::set_canvas_cursor_for_region_view (double x, RegionView* rv)
+{
+ ArdourCanvas::Group* g = rv->get_canvas_group ();
+ ArdourCanvas::Group* p = g->get_parent_group ();
+
+ /* Compute x in region view parent coordinates */
+ double dy = 0;
+ p->w2i (x, dy);
+
+ double x1, x2, y1, y2;
+ g->get_bounds (x1, y1, x2, y2);
+
+ /* Halfway across the region */
+ double const h = (x1 + x2) / 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);
+ }
+ }
+}
projects / ardour.git / blobdiff