Merging from trunk

[ardour.git] / gtk2_ardour / audio_time_axis.h

diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 19d9f6676ccd12062db5e94edfa4e20125a88272..b319d0ea9945c08733712f68a0cf3f222c908ded 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -48,7 +48,7 @@ namespace ALSA {
 
 namespace ARDOUR {
        class Session;
-       class DiskStream;
+       class AudioDiskstream;
        class RouteGroup;
        class Redirect;
        class Insert;
@@ -126,6 +126,12 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        void set_state (const XMLNode&);
        XMLNode* get_child_xml_node (const string & childname);
 
+       /* the editor calls these when mapping an operation across multiple tracks */
+
+       void use_new_playlist (bool prompt);
+       void use_copy_playlist (bool prompt);
+       void clear_playlist ();
+
   private:
        friend class StreamView;
        friend class AudioRegionView;
@@ -186,9 +192,8 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        virtual void label_view ();
 
        Gtk::Menu edit_group_menu;
-       Gtk::RadioMenuItem::Group edit_group_menu_radio_group;
 
-       void add_edit_group_menu_item (ARDOUR::RouteGroup *);
+       void add_edit_group_menu_item (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
        void set_edit_group_from_menu (ARDOUR::RouteGroup *);
 
        void reset_samples_per_unit ();
@@ -227,10 +232,6 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        void playlist_modified ();
 
        void add_playlist_to_playlist_menu (ARDOUR::Playlist*);
-       void playlist_selected (ARDOUR::AudioPlaylist*);
-       void use_new_playlist ();
-       void use_copy_playlist ();
-       void clear_playlist ();
        void rename_current_playlist ();
 
        /* automation stuff */
@@ -314,6 +315,7 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        void map_frozen ();
 
        void color_handler (ColorID, uint32_t);
+       bool select_me (GdkEventButton*);
 };
 
 #endif /* __ardour_trackview_h__ */