Allow markers to be glued to bar/beat time. Fixes #1815.

[ardour.git] / gtk2_ardour / selection.h

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 739d3b4c016e3ab290f2ace34d7be44922916753..ca678fd832c59d7f38d93ff6cdb4a5b7edd8ef4a 100644 (file)
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -22,10 +22,11 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <sigc++/signal.h>
 
-#include "pbd/scoped_connections.h"
+#include "pbd/signals.h"
 
 #include "time_selection.h"
 #include "region_selection.h"
@@ -84,9 +85,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        MidiRegionSelection  midi_regions;
        MidiNoteSelection    midi_notes;
 
-       Selection (PublicEditor const * e) : tracks (e), editor (e), next_time_id (0) {
-               clear();
-       }
+       Selection (PublicEditor const * e);
 
        // Selection& operator= (const Selection& other);
 
@@ -109,9 +108,9 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        bool selected (RegionView*);
        bool selected (Marker*);
 
-       void set (std::list<Selectable*>&);
-       void add (std::list<Selectable*>&);
-       void toggle (std::list<Selectable*>&);
+       void set (std::list<Selectable*> const &);
+       void add (std::list<Selectable*> const &);
+       void toggle (std::list<Selectable*> const &);
 
        void set (TimeAxisView*);
        void set (const TrackViewList&);
@@ -187,7 +186,6 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
 
   private:
-       Selection (const Selection& other) {}
        PublicEditor const * editor;
        uint32_t next_time_id;