Prevent region drags with the middle button in internal edit mode (#3869).

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 59928dc303254b15019f94cf5fa85be9b974465f..d0b2cab5c7749a67ff763e3574886bf56c54aff8 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -304,7 +304,7 @@ Selection::toggle (vector<RegionView*>& r)
 }
 
 long
-Selection::toggle (nframes_t start, nframes_t end)
+Selection::toggle (framepos_t start, framepos_t end)
 {
        AudioRangeComparator cmp;
 
@@ -436,11 +436,13 @@ void
 Selection::add (RegionView* r)
 {
        if (find (regions.begin(), regions.end(), r) == regions.end()) {
-               regions.add (r);
-               if (Config->get_link_region_and_track_selection()) {
-                       add (&r->get_time_axis_view());
-               }
-               RegionsChanged ();
+               bool changed = regions.add (r);
+                if (Config->get_link_region_and_track_selection() && changed) {
+                        add (&r->get_time_axis_view());
+                }
+                if (changed) {
+                        RegionsChanged ();
+                }
        }
 }
 
@@ -460,7 +462,7 @@ Selection::add (MidiRegionView* mrv)
 }
 
 long
-Selection::add (nframes_t start, nframes_t end)
+Selection::add (framepos_t start, framepos_t end)
 {
        AudioRangeComparator cmp;
 
@@ -476,7 +478,7 @@ Selection::add (nframes_t start, nframes_t end)
 }
 
 void
-Selection::replace (uint32_t sid, nframes_t start, nframes_t end)
+Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
 {
        for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
                if ((*i).id == sid) {
@@ -652,7 +654,7 @@ Selection::remove (uint32_t selection_id)
 }
 
 void
-Selection::remove (nframes_t /*start*/, nframes_t /*end*/)
+Selection::remove (framepos_t /*start*/, framepos_t /*end*/)
 {
 }
 
@@ -742,7 +744,7 @@ Selection::set (vector<RegionView*>& v)
  *  the list of tracks it applies to.
  */
 long
-Selection::set (nframes_t start, nframes_t end)
+Selection::set (framepos_t start, framepos_t end)
 {
        if ((start == 0 && end == 0) || end < start) {
                return 0;
@@ -1002,9 +1004,9 @@ Selection::add (const list<Marker*>& m)
 }
 
 void
-MarkerSelection::range (nframes64_t& s, nframes64_t& e)
+MarkerSelection::range (framepos_t& s, framepos_t& e)
 {
-       s = max_frames;
+       s = max_framepos;
        e = 0;
 
        for (MarkerSelection::iterator i = begin(); i != end(); ++i) {
@@ -1107,7 +1109,7 @@ Selection::get_state () const
                } else if (atv) {
                        XMLNode* t = node->add_child (X_("AutomationView"));
                        t->add_property (X_("id"), atoi (atv->parent_route()->id().to_s().c_str()));
-                       t->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->control()->parameter ()));
+                       t->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->parameter ()));
                }
        }
 
@@ -1143,20 +1145,37 @@ Selection::set_state (XMLNode const & node, int)
 
                        PBD::ID id (prop_id->value ());
                        RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
-                       assert (rtv);
-                       
-                       boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ()));
+
+                       if (rtv) {
+                               boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ()));
                         
-                        /* the automation could be for an entity that was never saved
-                           in the session file. Don't freak out if we can't find
-                           it.
-                        */
-
-                        if (atv) {
-                                add (atv.get());
-                        }
+                               /* the automation could be for an entity that was never saved
+                                  in the session file. Don't freak out if we can't find
+                                  it.
+                               */
+                               
+                               if (atv) {
+                                       add (atv.get());
+                               }
+                       }
                }
        }
 
        return 0;
 }
+
+void
+Selection::remove_regions (TimeAxisView* t)
+{
+       RegionSelection::iterator i = regions.begin();
+       while (i != regions.end ()) {
+               RegionSelection::iterator tmp = i;
+               ++tmp;
+
+               if (&(*i)->get_time_axis_view() == t) {
+                       remove (*i);
+               }
+
+               i = tmp;
+       }
+}