use platform-specific modifier name for tooltip

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 53413e2dcf6055427e6a17e0fecb048a2b40e0bd..baf424669f48b47482810feb6779b1577d148295 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -26,8 +26,10 @@
 #include "ardour/playlist.h"
 #include "ardour/rc_configuration.h"
 
+#include "audio_region_view.h"
 #include "gui_thread.h"
 #include "midi_cut_buffer.h"
+#include "region_gain_line.h"
 #include "region_view.h"
 #include "selection.h"
 #include "selection_templates.h"
@@ -61,8 +63,8 @@ Selection::Selection (const PublicEditor* e)
        void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove;
        TimeAxisView::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (track_remove, this, _1), gui_context());
 
-       void (Selection::*marker_remove)(Marker*) = &Selection::remove;
-       Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context());
+       void (Selection::*marker_remove)(ArdourMarker*) = &Selection::remove;
+       ArdourMarker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context());
 
        void (Selection::*point_remove)(ControlPoint*) = &Selection::remove;
        ControlPoint::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (point_remove, this, _1), gui_context());
@@ -911,7 +913,7 @@ Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
 }
 
 bool
-Selection::selected (Marker* m)
+Selection::selected (ArdourMarker* m)
 {
        return find (markers.begin(), markers.end(), m) != markers.end();
 }
@@ -1113,7 +1115,7 @@ Selection::set (ControlPoint* cp)
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
 
-       if (cp->get_selected()) {
+       if (cp->get_selected () && points.size () == 1) {
                return;
        }
 
@@ -1126,7 +1128,7 @@ Selection::set (ControlPoint* cp)
 }
 
 void
-Selection::set (Marker* m)
+Selection::set (ArdourMarker* m)
 {
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
@@ -1136,7 +1138,7 @@ Selection::set (Marker* m)
 }
 
 void
-Selection::toggle (Marker* m)
+Selection::toggle (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -1148,7 +1150,7 @@ Selection::toggle (Marker* m)
 }
 
 void
-Selection::remove (Marker* m)
+Selection::remove (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -1159,7 +1161,7 @@ Selection::remove (Marker* m)
 }
 
 void
-Selection::add (Marker* m)
+Selection::add (ArdourMarker* m)
 {
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
@@ -1171,7 +1173,7 @@ Selection::add (Marker* m)
 }
 
 void
-Selection::add (const list<Marker*>& m)
+Selection::add (const list<ArdourMarker*>& m)
 {
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
@@ -1233,7 +1235,7 @@ Selection::get_state () const
        }
 
        /* midi region views have thir own internal selection. */
-       XMLNode* n;
+       XMLNode* n = NULL;
        list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > > rid_notes;
        editor->get_per_region_note_selection (rid_notes);
        if (!rid_notes.empty()) {
@@ -1241,6 +1243,7 @@ Selection::get_state () const
        }
        list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >::iterator rn_it;
        for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) {
+               assert(n); // hint for clang static analysis
                n->add_property (X_("region_id"), atoi((*rn_it).first.to_s().c_str()));
 
                for (std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) {
@@ -1277,8 +1280,18 @@ Selection::get_state () const
 
                        snprintf(buf, sizeof(buf), "%d", (*i)->view_index());
                        r->add_property (X_("view-index"), string(buf));
+                       continue;
+               }
 
+               AudioRegionGainLine* argl = dynamic_cast<AudioRegionGainLine*> (&(*i)->line());
+               if (argl) {
+                       XMLNode* r = node->add_child (X_("ControlPoint"));
+                       r->add_property (X_("type"), "region");
+                       r->add_property (X_("region-id"), atoi (argl->region_view ().region ()->id ().to_s ().c_str()));
+                       snprintf(buf, sizeof(buf), "%d", (*i)->view_index());
+                       r->add_property (X_("view-index"), string(buf));
                }
+
        }
 
        for (TimeSelection::const_iterator i = time.begin(); i != time.end(); ++i) {
@@ -1310,6 +1323,7 @@ Selection::set_state (XMLNode const & node, int)
        }
 
        clear_regions ();
+       clear_midi_notes ();
        clear_points ();
        clear_time ();
        clear_tracks ();
@@ -1410,7 +1424,6 @@ Selection::set_state (XMLNode const & node, int)
                                XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
                                XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
 
-                               assert (prop_type);
                                assert (prop_route_id);
                                assert (prop_alist_id);
                                assert (prop_parameter);
@@ -1438,6 +1451,35 @@ Selection::set_state (XMLNode const & node, int)
                                if (!cps.empty()) {
                                        add (cps);
                                }
+                       } else if (prop_type->value () == "region") {
+                               XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
+                               XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
+
+                               if (!prop_region_id || !prop_view_index) {
+                                       continue;
+                               }
+
+                               PBD::ID region_id (prop_region_id->value ());
+                               RegionSelection rs;
+                               editor->get_regionviews_by_id (region_id, rs);
+
+                               if (!rs.empty ()) {
+                                       vector <ControlPoint *> cps;
+                                       for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) {
+                                               AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*rsi);
+                                               if (arv) {
+                                                       boost::shared_ptr<AudioRegionGainLine> gl = arv->get_gain_line ();
+                                                       ControlPoint* cp = gl->nth(atol(prop_view_index->value().c_str()));
+                                                       if (cp) {
+                                                               cps.push_back (cp);
+                                                               cp->show();
+                                                       }
+                                               }
+                                       }
+                                       if (!cps.empty()) {
+                                               add (cps);
+                                       }
+                               }
                        }
 
                } else if  ((*i)->name() == X_("AudioRange")) {
@@ -1484,7 +1526,7 @@ Selection::set_state (XMLNode const & node, int)
                        assert (prop_start);
 
                        PBD::ID id (prop_id->value ());
-                       Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
+                       ArdourMarker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
                        if (m) {
                                add (m);
                        }