minor tweaks to Cut Time dialog. Use an enum to tell preferred_edit_location what...

[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 7b0adaa4ad672f1888914f58f47e799877318c31..8af5389e7066e62e46fac758409f8304277ed1fd 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -24,6 +24,8 @@
 
 #include "pbd/stacktrace.h"
 
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
 #include "ardour/midi_region.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
@@ -180,7 +182,7 @@ Editor::track_canvas_button_press_event (GdkEventButton *event)
 {
        _track_canvas->grab_focus();
        if (!Keyboard::is_context_menu_event (event)) {
-               begin_reversible_selection_op (_("Clear Selection Click (track canvas)"));
+               begin_reversible_selection_op (X_("Clear Selection Click (track canvas)"));
                selection->clear ();
                commit_reversible_selection_op();
         }
@@ -1128,7 +1130,7 @@ Editor::canvas_drop_zone_event (GdkEvent* event)
        switch (event->type) {
        case GDK_BUTTON_RELEASE:
                if (event->button.button == 1) {
-                       begin_reversible_selection_op (_("Nowhere Click"));
+                       begin_reversible_selection_op (X_("Nowhere Click"));
                        selection->clear_objects ();
                        selection->clear_tracks ();
                        commit_reversible_selection_op ();
@@ -1207,6 +1209,18 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
                region = _regions->get_dragged_region ();
                
                if (region) {
+
+                       if (tv.first == 0
+                           && (
+                               boost::dynamic_pointer_cast<AudioRegion> (region) != 0 ||
+                               boost::dynamic_pointer_cast<MidiRegion> (region) != 0
+                              )
+                          )
+                       {
+                               /* drop to drop-zone */
+                               context->drag_status (context->get_suggested_action(), time);
+                               return true;
+                       }
                        
                        if ((boost::dynamic_pointer_cast<AudioRegion> (region) != 0 &&
                             dynamic_cast<AudioTimeAxisView*> (tv.first) != 0) ||
@@ -1251,9 +1265,6 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
                      const SelectionData& /*data*/,
                      guint /*info*/, guint /*time*/)
 {
-       boost::shared_ptr<Region> region;
-       boost::shared_ptr<Region> region_copy;
-       RouteTimeAxisView* rtav;
        GdkEvent event;
        double px;
        double py;
@@ -1263,39 +1274,47 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*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);
 
+       boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+       if (!region) { return; }
+
+       RouteTimeAxisView* rtav = 0;
        std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py, false);
 
        if (tv.first != 0) {
-
                rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
-               
-               if (rtav != 0 && rtav->is_track ()) {
-
-                       boost::shared_ptr<Region> region = _regions->get_dragged_region ();
-                       
-                       if (region) {
-
-                               region_copy = RegionFactory::create (region, true);
-       
-
-                               if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
-                                   dynamic_cast<AudioTimeAxisView*> (tv.first) != 0) ||
-                                   (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 &&
-                                    dynamic_cast<MidiTimeAxisView*> (tv.first) != 0)) {
-
-                                       /* audio to audio 
-                                          OR 
-                                          midi to midi
-                                       */
-
-
-                                       _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
-                                       _drags->end_grab (0);
+       } else {
+               try {
+                       if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
+                               uint32_t output_chan = region->n_channels();
+                               if ((Config->get_output_auto_connect() & AutoConnectMaster) && session()->master_out()) {
+                                       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());
+                       } 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());
+                       } else {
+                               return;
                        }
+               } catch (...) {
+                       error << _("Could not create new track after region placed in the drop zone") << endmsg;
+                       return;
+               }
+       }
+
+       if (rtav != 0 && rtav->is_track ()) {
+               boost::shared_ptr<Region> region_copy = RegionFactory::create (region, true);
+
+               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);
                }
        }
 }