Sanitize "well-known" ctrl API

[ardour.git] / gtk2_ardour / editor_canvas_events.cc

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 58e3dda285f40eaf54c1fec6baeff82b8896ab24..ad1cb8def85cc9fb41a3848ce01c778f4ae01ac1 100644 (file)
--- 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;
@@ -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:
@@ -677,10 +679,14 @@ Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, Automation
        AudioRegionGainLine* gl;
        if ((gl = dynamic_cast<AudioRegionGainLine*> (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;
@@ -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,7 +1042,7 @@ 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 ();
+                               scroll_left_step ();
                        } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
                                temporal_zoom_step_mouse_focus (false);
                        } else {
@@ -1042,7 +1054,7 @@ 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 ();
+                               scroll_right_step ();
                        } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
                                temporal_zoom_step_mouse_focus (true);
                        } else {
@@ -1068,6 +1080,18 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
                return handled;
        }
 
+       switch (event->type) {
+       case GDK_BUTTON_PRESS:
+               if (UIConfiguration::instance ().get_use_time_rulers_to_zoom_with_vertical_drag () &&
+                   Keyboard::no_modifier_keys_pressed (&event->button) && event->button.button == 1) {
+                       _drags->set(new RulerZoomDrag(this, item), event);
+                       return true;
+               }
+               break;
+       default:
+               break;
+       }
+
        return typed_event (item, event, type);
 }
 
@@ -1219,7 +1243,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> 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) {
@@ -1270,13 +1294,17 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
                                        output_chan =  session()->master_out()->n_inputs().n_audio();
                                }
                                list<boost::shared_ptr<AudioTrack> > 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<RouteTimeAxisView*> (time_axis_view_from_stripable (audio_tracks.front()));
                        } else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
                                ChanCount one_midi_port (DataType::MIDI, 1);
                                list<boost::shared_ptr<MidiTrack> > midi_tracks;
-                               midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(), 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::PluginInfo>(),
+                                                                        (ARDOUR::Plugin::PresetRecord*) 0,
+                                                                        (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order);
+                               rtav = dynamic_cast<RouteTimeAxisView*> (time_axis_view_from_stripable (midi_tracks.front()));
                        } else {
                                return;
                        }
@@ -1292,7 +1320,7 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
                if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 && dynamic_cast<AudioTimeAxisView*> (rtav) != 0) ||
                    (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 && dynamic_cast<MidiTimeAxisView*> (rtav) != 0)) {
                        _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
-                       _drags->end_grab (0);
+                       _drags->end_grab (&event);
                }
        }
 }