X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftrack_selection.h;h=8c7aac45c4776b1c01bf5ba1167dacab8e082f55;hb=d6b5c23579dc02d2f98fc1f48bf038c1070057fb;hp=e61e62958f6a2dadec2f791b17e4a71a3b344114;hpb=65e17100872e515e8a6a50b8213fa7ed99a1455f;p=ardour.git

diff --git a/gtk2_ardour/track_selection.h b/gtk2_ardour/track_selection.h
index e61e62958f..8c7aac45c4 100644
--- a/gtk2_ardour/track_selection.h
+++ b/gtk2_ardour/track_selection.h
@@ -23,6 +23,7 @@
 #include "track_view_list.h"
 #include "route_ui.h"
 #include "audio_time_axis.h"
+#include "midi_time_axis.h"
 
 class PublicEditor;
 
@@ -33,8 +34,6 @@ public:
 	TrackSelection (PublicEditor const *, TrackViewList const &);
 
 	virtual ~TrackSelection ();
-	
-	TrackViewList add (TrackViewList const &);
 
 	template <typename Function>
 	void foreach_time_axis (Function f) {
@@ -45,28 +44,57 @@ public:
 
 	template <typename Function>
 	void foreach_route_ui (Function f) {
-		for (iterator i = begin(); i != end(); ++i) {
+		for (iterator i = begin(); i != end(); ) {
+			iterator tmp = i;
+			++tmp;
+
 			RouteUI* t = dynamic_cast<RouteUI*> (*i);
-			f (t);
+			if (t) {
+				f (t);
+			}
+			i = tmp;
 		}
 	}
 
 	template <typename Function>
 	void foreach_route_time_axis (Function f) {
-		for (iterator i = begin(); i != end(); ++i) {
+		for (iterator i = begin(); i != end(); ) {
+			iterator tmp = i;
+			++tmp;
 			RouteTimeAxisView* t = dynamic_cast<RouteTimeAxisView*> (*i);
-			f (t);
+			if (t) {
+				f (t);
+			}
+			i = tmp;
 		}
 	}
 
 	template <typename Function>
 	void foreach_audio_time_axis (Function f) {
-		for (iterator i = begin(); i != end(); ++i) {
+		for (iterator i = begin(); i != end(); ) {
+			iterator tmp = i;
+			++tmp;
 			AudioTimeAxisView* t = dynamic_cast<AudioTimeAxisView*> (*i);
-			f (t);
+			if (t) {
+				f (t);
+			}
+			i = tmp;
 		}
 	}
-	
+
+	template <typename Function>
+	void foreach_midi_time_axis (Function f) {
+		for (iterator i = begin(); i != end(); ) {
+			iterator tmp = i;
+			++tmp;
+			MidiTimeAxisView* t = dynamic_cast<MidiTimeAxisView*> (*i);
+			if (t) {
+				f (t);
+			}
+			i = tmp;
+		}
+	}
+
 private:
 	PublicEditor const * _editor;
 };