X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=fbdb730b4a9d82416f746e29156f90c0ea6bd35d;hb=a26e6fed50c1e255dac1eeb4518bab97c647ba99;hp=7dcfe37fe506501461deb48bd89337144c4b2520;hpb=72bdfc38a8aabd5c1277825f84969d30adadb1af;p=ardour.git diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 7dcfe37fe5..fbdb730b4a 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -51,7 +51,7 @@ #include "ui_config.h" #include "verbose_cursor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -75,11 +75,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) switch (direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (false); - zoom_focus = temp_focus; + if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (false); + } else { + temporal_zoom_step (false); + } return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { scroll_left_step (); @@ -104,11 +104,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (true); - zoom_focus = temp_focus; + if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (true); + } else { + temporal_zoom_step (true); + } return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { scroll_right_step (); @@ -171,7 +171,7 @@ Editor::track_canvas_button_press_event (GdkEventButton *event) begin_reversible_selection_op (X_("Clear Selection Click (track canvas)")); selection->clear (); commit_reversible_selection_op(); - } + } return false; } @@ -179,10 +179,10 @@ bool Editor::track_canvas_button_release_event (GdkEventButton *event) { if (!Keyboard::is_context_menu_event (event)) { - if (_drags->active ()) { - _drags->end_grab ((GdkEvent*) event); - } - } + if (_drags->active ()) { + _drags->end_grab ((GdkEvent*) event); + } + } return false; } @@ -198,6 +198,10 @@ Editor::track_canvas_motion_notify_event (GdkEventMotion */*event*/) bool Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type) { + if (!session () || session()->loading () || session()->deletion_in_progress ()) { + return false; + } + gint ret = FALSE; switch (event->type) { @@ -532,7 +536,6 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, case GDK_BUTTON_RELEASE: ret = button_release_handler (item, event, trim ? FadeInTrimHandleItem : FadeInHandleItem); - maybe_locate_with_edit_preroll ( rv->region()->position() ); break; case GDK_MOTION_NOTIFY: @@ -616,7 +619,6 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, case GDK_BUTTON_RELEASE: ret = button_release_handler (item, event, trim ? FadeOutTrimHandleItem : FadeOutHandleItem); - maybe_locate_with_edit_preroll ( rv->region()->last_frame() - rv->get_fade_out_shape_width() ); break; case GDK_MOTION_NOTIFY: @@ -639,9 +641,9 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, } struct DescendingRegionLayerSorter { - bool operator()(boost::shared_ptr a, boost::shared_ptr b) { - return a->layer() > b->layer(); - } + bool operator()(boost::shared_ptr a, boost::shared_ptr b) { + return a->layer() > b->layer(); + } }; bool @@ -677,10 +679,14 @@ Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, Automation AudioRegionGainLine* gl; if ((gl = dynamic_cast (al)) != 0) { type = GainLineItem; - clicked_regionview = &gl->region_view (); + if (event->type == GDK_BUTTON_PRESS) { + clicked_regionview = &gl->region_view (); + } } else { type = AutomationLineItem; - clicked_regionview = 0; + if (event->type == GDK_BUTTON_PRESS) { + clicked_regionview = 0; + } } clicked_control_point = 0; @@ -791,11 +797,11 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it } bool -Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv) +Editor::canvas_sample_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv) { bool ret = false; - /* frame handles are not active when in internal edit mode, because actual notes + /* sample handles are not active when in internal edit mode, because actual notes might be in the area occupied by the handle - we want them to be editable as normal. */ @@ -803,7 +809,7 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re return false; } - /* NOTE: frame handles pretend to be the colored trim bar from an event handling + /* NOTE: sample handles pretend to be the colored trim bar from an event handling perspective. XXX change this ?? */ @@ -1004,11 +1010,17 @@ Editor::canvas_videotl_bar_event (GdkEvent *event, ArdourCanvas::Item* item) } bool -Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* /*marker*/) +Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* marker) { return typed_event (item, event, TempoMarkerItem); } +bool +Editor::canvas_tempo_curve_event (GdkEvent *event, ArdourCanvas::Item* item, TempoCurve* /*marker*/) +{ + return typed_event (item, event, TempoCurveItem); +} + bool Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* /*marker*/) { @@ -1030,13 +1042,9 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals(event->scroll.state, Keyboard::ScrollHorizontalModifier)) { - scroll_left_half_page (); - } else if (Profile->get_mixbus()) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (false); - zoom_focus = temp_focus; + scroll_left_step (); + } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (false); } else { temporal_zoom_step (false); } @@ -1046,13 +1054,9 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals(event->scroll.state, Keyboard::ScrollHorizontalModifier)) { - scroll_right_half_page (); - } else if (Profile->get_mixbus()) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (true); - zoom_focus = temp_focus; + scroll_right_step (); + } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (true); } else { temporal_zoom_step (true); } @@ -1198,8 +1202,8 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, if (tv.first == 0 && ( - boost::dynamic_pointer_cast (region) != 0 || - boost::dynamic_pointer_cast (region) != 0 + boost::dynamic_pointer_cast (region) != 0 || + boost::dynamic_pointer_cast (region) != 0 ) ) { @@ -1227,7 +1231,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, * TODO: check if file is audio/midi, allow drops on same track-type only, * currently: if audio is dropped on a midi-track, it is only added to the region-list */ - if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files()) { + if (UIConfiguration::instance().get_only_copy_imported_files()) { context->drag_status(Gdk::ACTION_COPY, time); } else { if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) { @@ -1247,9 +1251,9 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, void Editor::drop_regions (const Glib::RefPtr& /*context*/, - int x, int y, - const SelectionData& /*data*/, - guint /*info*/, guint /*time*/) + int x, int y, + const SelectionData& /*data*/, + guint /*info*/, guint /*time*/) { GdkEvent event; double px; @@ -1260,7 +1264,7 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, event.button.y = y; /* assume we're dragging with button 1 */ event.motion.state = Gdk::BUTTON1_MASK; - framepos_t const pos = window_event_sample (&event, &px, &py); + samplepos_t const pos = window_event_sample (&event, &px, &py); boost::shared_ptr region = _regions->get_dragged_region (); if (!region) { return; } @@ -1278,13 +1282,17 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, output_chan = session()->master_out()->n_inputs().n_audio(); } list > audio_tracks; - audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, ARDOUR::Normal, 0, 1, region->name()); - rtav = axis_view_from_route (audio_tracks.front()); + audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); + rtav = dynamic_cast (time_axis_view_from_stripable (audio_tracks.front())); } else if (boost::dynamic_pointer_cast (region)) { ChanCount one_midi_port (DataType::MIDI, 1); list > midi_tracks; - midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), ARDOUR::Normal, 0, 1, region->name()); - rtav = axis_view_from_route (midi_tracks.front()); + midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, + Config->get_strict_io () || Profile->get_mixbus (), + boost::shared_ptr(), + (ARDOUR::Plugin::PresetRecord*) 0, + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); + rtav = dynamic_cast (time_axis_view_from_stripable (midi_tracks.front())); } else { return; } @@ -1300,7 +1308,7 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, if ((boost::dynamic_pointer_cast (region_copy) != 0 && dynamic_cast (rtav) != 0) || (boost::dynamic_pointer_cast (region_copy) != 0 && dynamic_cast (rtav) != 0)) { _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event); - _drags->end_grab (0); + _drags->end_grab (&event); } } }