centralize legal-session-name-checkng and include : and ; in characters that we disal...

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 82cdad5f33060e28db443af22f09255d571bc649..7d465f3ddfdf7058d14cf8d17b6b6da8847f15a9 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -50,7 +50,8 @@ struct AudioRangeComparator {
 Selection::Selection (const PublicEditor* e)
        : tracks (e)
        , editor (e)
-       , next_time_id (0) 
+       , next_time_id (0)
+       , _no_tracks_changed (false)
 {
        clear ();
 
@@ -61,7 +62,7 @@ Selection::Selection (const PublicEditor* e)
 
        void (Selection::*marker_remove)(Marker*) = &Selection::remove;
        Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, ui_bind (marker_remove, this, _1), gui_context());
-}      
+}
 
 #if 0
 Selection&
@@ -121,6 +122,9 @@ Selection::clear_regions ()
        if (!regions.empty()) {
                regions.clear_all ();
                RegionsChanged();
+               if (Config->get_link_region_and_track_selection()) {
+                       clear_tracks ();
+               }
        }
 }
 
@@ -129,7 +133,9 @@ Selection::clear_tracks ()
 {
        if (!tracks.empty()) {
                tracks.clear ();
-               TracksChanged();
+               if (!_no_tracks_changed) {
+                       TracksChanged();
+               }
        }
 }
 
@@ -231,7 +237,9 @@ Selection::toggle (TimeAxisView* track)
                tracks.erase (i);
        }
 
-       TracksChanged();
+       if (!_no_tracks_changed) {
+               TracksChanged();
+       }
 }
 
 void
@@ -353,7 +361,9 @@ Selection::add (const TrackViewList& track_list)
        TrackViewList added = tracks.add (track_list);
 
        if (!added.empty()) {
-               TracksChanged ();
+               if (!_no_tracks_changed) {
+                       TracksChanged ();
+               }
        }
 }
 
@@ -519,7 +529,9 @@ Selection::remove (TimeAxisView* track)
        list<TimeAxisView*>::iterator i;
        if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) {
                tracks.erase (i);
-               TracksChanged();
+               if (!_no_tracks_changed) {
+                       TracksChanged();
+               }
        }
 }
 
@@ -538,7 +550,9 @@ Selection::remove (const TrackViewList& track_list)
        }
 
        if (changed) {
-               TracksChanged();
+               if (!_no_tracks_changed) {
+                       TracksChanged();
+               }
        }
 }
 
@@ -722,7 +736,10 @@ void
 Selection::set (RegionView* r, bool also_clear_tracks)
 {
        clear_regions ();
-       if (also_clear_tracks) {
+       if (also_clear_tracks && !Config->get_link_region_and_track_selection()) {
+               /* clear_regions() will have done this if the link preference
+                * is enabled
+                */
                clear_tracks ();
        }
        add (r);
@@ -793,7 +810,7 @@ Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
        }
 
        time.consolidate ();
-       
+
        TimeChanged ();
 }
 
@@ -903,7 +920,7 @@ Selection::set (list<Selectable*> const & selectables)
        if (Config->get_link_region_and_track_selection ()) {
                clear_tracks ();
        }
-       
+
        add (selectables);
 }
 
@@ -1067,7 +1084,7 @@ void
 Selection::set_point_selection_from_line (AutomationLine const & line)
 {
        points.clear ();
-       
+
        AutomationRange current (DBL_MAX, 0, 1, 0, &line.trackview);
 
        for (uint32_t i = 0; i < line.npoints(); ++i) {
@@ -1087,7 +1104,7 @@ Selection::set_point_selection_from_line (AutomationLine const & line)
                        double const size = cp->size ();
                        double const x_size = line.time_converter().from (line.trackview.editor().pixel_to_frame (size));
                        double const y_size = size / line.trackview.current_height ();
-                       
+
                        double const x1 = max (0.0, x - x_size / 2);
                        double const x2 = x + x_size / 2;
                        double const y1 = max (0.0, y - y_size / 2);
@@ -1125,7 +1142,7 @@ Selection::get_state () const
        /* XXX: not complete; just sufficient to get track selection state
           so that re-opening plugin windows for editor mixer strips works
        */
-       
+
        XMLNode* node = new XMLNode (X_("Selection"));
 
        for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.end(); ++i) {
@@ -1141,6 +1158,16 @@ Selection::get_state () const
                }
        }
 
+       for (MarkerSelection::const_iterator i = markers.begin(); i != markers.end(); ++i) {
+               XMLNode* t = node->add_child (X_("Marker"));
+
+               bool is_start;
+               Location* loc = editor->find_location_from_marker (*i, is_start);
+
+               t->add_property (X_("id"), atoi (loc->id().to_s().c_str()));
+               t->add_property (X_("start"), is_start ? X_("yes") : X_("no"));
+       }
+
        return *node;
 }
 
@@ -1150,11 +1177,11 @@ Selection::set_state (XMLNode const & node, int)
        if (node.name() != X_("Selection")) {
                return -1;
        }
-       
+
        XMLNodeList children = node.children ();
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == X_("RouteView")) {
-                       
+
                        XMLProperty* prop_id = (*i)->property (X_("id"));
                        assert (prop_id);
                        PBD::ID id (prop_id->value ());
@@ -1162,9 +1189,9 @@ Selection::set_state (XMLNode const & node, int)
                        if (rtv) {
                                add (rtv);
                        }
-                       
+
                } else if ((*i)->name() == X_("AutomationView")) {
-                       
+
                        XMLProperty* prop_id = (*i)->property (X_("id"));
                        XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
 
@@ -1176,17 +1203,32 @@ Selection::set_state (XMLNode const & node, int)
 
                        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());
                                }
                        }
+
+               } else if ((*i)->name() == X_("Marker")) {
+
+                       XMLProperty* prop_id = (*i)->property (X_("id"));
+                       XMLProperty* prop_start = (*i)->property (X_("start"));
+                       assert (prop_id);
+                       assert (prop_start);
+
+                       PBD::ID id (prop_id->value ());
+                       Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
+                       if (m) {
+                               add (m);
+                       }
+                       
                }
+               
        }
 
        return 0;
@@ -1207,3 +1249,9 @@ Selection::remove_regions (TimeAxisView* t)
                i = tmp;
        }
 }
+
+void
+Selection::block_tracks_changed (bool yn)
+{
+       _no_tracks_changed = yn;
+}