Merge branch 'master' into cairocanvas

[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 c096c6706a2c22d0d82b5b986f2f6ade6736d52f..5790080160bb24bc3fb6124f81db66e0def4bdf5 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -38,7 +38,6 @@
 #include "enums.h"
 #include "editing.h"
 #include "route_time_axis.h"
-#include "canvas.h"
 
 namespace ARDOUR {
        class Session;
@@ -73,10 +72,6 @@ class AudioTimeAxisView : public RouteTimeAxisView
        AudioStreamView* audio_view();
 
        void set_show_waveforms_recording (bool yn);
-       void show_all_xfades (bool apply_to_selection = false);
-       void hide_all_xfades (bool apply_to_selection = false);
-       void hide_dependent_views (TimeAxisViewItem&);
-       void reveal_dependent_views (TimeAxisViewItem&);
 
        /* Overridden from parent to store display state */
        guint32 show_at (double y, int& nth, Gtk::VBox *parent);
@@ -94,7 +89,6 @@ class AudioTimeAxisView : public RouteTimeAxisView
 
        void route_active_changed ();
 
-       void append_extra_display_menu_items ();
        Gtk::Menu* build_mode_menu();
        void build_automation_action_menu (bool);