use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / track_selection.h

diff --git a/gtk2_ardour/track_selection.h b/gtk2_ardour/track_selection.h
index 0c4f364c4ecf59c34663b91ac7161a234edcf068..8c7aac45c4776b1c01bf5ba1167dacab8e082f55 100644 (file)
--- 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,20 +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(); ) {
+                       iterator tmp = i;
+                       ++tmp;
+                       RouteTimeAxisView* t = dynamic_cast<RouteTimeAxisView*> (*i);
+                       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;
 };