X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.h;h=ca678fd832c59d7f38d93ff6cdb4a5b7edd8ef4a;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=1e2257fc15fc934df2bbde8af2aac410e471a33e;hpb=6f8cd634501efd70711b148b4ac0e0ce2aa5cc95;p=ardour.git

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 1e2257fc15..ca678fd832 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2003 Paul Davis 
+    Copyright (C) 2000-2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,9 +22,12 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <sigc++/signal.h>
 
+#include "pbd/signals.h"
+
 #include "time_selection.h"
 #include "region_selection.h"
 #include "track_selection.h"
@@ -33,11 +36,13 @@
 #include "processor_selection.h"
 #include "point_selection.h"
 #include "marker_selection.h"
+#include "midi_selection.h"
 
 class TimeAxisView;
 class RegionView;
 class Selectable;
 class PublicEditor;
+class MidiRegionView;
 
 namespace ARDOUR {
 	class Region;
@@ -55,7 +60,7 @@ namespace Evoral {
 
 /** The Selection class holds lists of selected items (tracks, regions, etc. etc.). */
 
-class Selection : public sigc::trackable 
+class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 {
   public:
 	enum SelectionType {
@@ -77,12 +82,12 @@ class Selection : public sigc::trackable
 	PlaylistSelection    playlists;
 	PointSelection       points;
 	MarkerSelection      markers;
+	MidiRegionSelection  midi_regions;
+	MidiNoteSelection    midi_notes;
 
-	Selection (PublicEditor const * e) : editor (e), next_time_id (0) {
-		clear();
-	}
+	Selection (PublicEditor const * e);
 
-	Selection& operator= (const Selection& other);
+	// Selection& operator= (const Selection& other);
 
 	sigc::signal<void> RegionsChanged;
 	sigc::signal<void> TracksChanged;
@@ -91,9 +96,11 @@ class Selection : public sigc::trackable
 	sigc::signal<void> PlaylistsChanged;
 	sigc::signal<void> PointsChanged;
 	sigc::signal<void> MarkersChanged;
+	sigc::signal<void> MidiNotesChanged;
+	sigc::signal<void> MidiRegionsChanged;
 
 	void clear ();
-	bool empty();
+	bool empty (bool internal_selection = false);
 
 	void dump_region_layers();
 
@@ -101,15 +108,17 @@ class Selection : public sigc::trackable
 	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 std::list<TimeAxisView*>&);
+	void set (const TrackViewList&);
+	void set (const MidiNoteSelection&);
 	void set (RegionView*, bool also_clear_tracks = true);
+	void set (MidiRegionView*);
 	void set (std::vector<RegionView*>&);
-	long set (TimeAxisView*, nframes_t, nframes_t);
+	long set (nframes_t, nframes_t);
 	void set (boost::shared_ptr<Evoral::ControlList>);
 	void set (boost::shared_ptr<ARDOUR::Playlist>);
 	void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
@@ -118,8 +127,11 @@ class Selection : public sigc::trackable
 	void set (const RegionSelection&);
 
 	void toggle (TimeAxisView*);
-	void toggle (const std::list<TimeAxisView*>&);
+	void toggle (const TrackViewList&);
+	void toggle (const MidiNoteSelection&);
 	void toggle (RegionView*);
+	void toggle (MidiRegionView*);
+	void toggle (MidiCutBuffer*);
 	void toggle (std::vector<RegionView*>&);
 	long toggle (nframes_t, nframes_t);
 	void toggle (ARDOUR::AutomationList*);
@@ -129,8 +141,11 @@ class Selection : public sigc::trackable
 	void toggle (Marker*);
 
 	void add (TimeAxisView*);
-	void add (const std::list<TimeAxisView*>&);
+	void add (const TrackViewList&);
+	void add (const MidiNoteSelection&);
 	void add (RegionView*);
+	void add (MidiRegionView*);
+	void add (MidiCutBuffer*);
 	void add (std::vector<RegionView*>&);
 	long add (nframes_t, nframes_t);
 	void add (boost::shared_ptr<Evoral::ControlList>);
@@ -139,20 +154,22 @@ class Selection : public sigc::trackable
 	void add (Marker*);
 	void add (const std::list<Marker*>&);
 	void add (const RegionSelection&);
-
 	void remove (TimeAxisView*);
-	void remove (const std::list<TimeAxisView*>&);
+	void remove (const TrackViewList&);
+	void remove (const MidiNoteSelection&);
 	void remove (RegionView*);
+	void remove (MidiRegionView*);
+	void remove (MidiCutBuffer*);
 	void remove (uint32_t selection_id);
 	void remove (nframes_t, nframes_t);
 	void remove (boost::shared_ptr<ARDOUR::AutomationList>);
 	void remove (boost::shared_ptr<ARDOUR::Playlist>);
 	void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
-	void remove (const list<Selectable*>&);
+	void remove (const std::list<Selectable*>&);
 	void remove (Marker*);
 
 	void replace (uint32_t time_index, nframes_t start, nframes_t end);
-	
+
 	void clear_regions();
 	void clear_tracks ();
 	void clear_time();
@@ -160,17 +177,18 @@ class Selection : public sigc::trackable
 	void clear_playlists ();
 	void clear_points ();
 	void clear_markers ();
+	void clear_midi_notes ();
+	void clear_midi_regions ();
 
 	void foreach_region (void (ARDOUR::Region::*method)(void));
 	void foreach_regionview (void (RegionView::*method)(void));
+	void foreach_midi_regionview (void (MidiRegionView::*method)(void));
 	template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
 
-	void select_edit_group_regions ();
-
   private:
 	PublicEditor const * editor;
 	uint32_t next_time_id;
-
+	
 	void add (std::vector<AutomationSelectable*>&);
 };