some C++-ification of GnomeCanvasBlah

[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 780469ccb922037657ae5d265c79531269740033..c3106d8e503cd5158649e014b00665a8adfd0e03 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -22,9 +22,8 @@
 #define __ardour_trackview_h__
 
 #include <gtkmm.h>
-#include <gtk-canvas.h>
+#include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/popup_selector.h>
 #include <list>
 
 #include <ardour/types.h>
@@ -152,22 +151,6 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        
        gint edit_click  (GdkEventButton *);
 
-       /* Redirect handling */
-
-       ArdourDialog redirect_window;
-       Gtk::CList  redirect_display;
-       Gtk::Button redirect_add_button;
-       Gtk::Button redirect_remove_button;
-       Gtk::Button redirect_up_button;
-       Gtk::Button redirect_down_button;
-       Gtk::Button redirect_edit_button;
-       Gtk::HBox   redirect_button_box;
-       Gtk::VBox   redirect_vpacker;
-       Gtk::HBox   redirect_display_hpacker;
-
-       int redirect_selected_row;
-
-
        // variables to get the context menu
        // automation buttons correctly initialized
        bool show_gain_automation;
@@ -299,7 +282,7 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        void add_redirect_automation_curve (ARDOUR::Redirect*, uint32_t);
        void add_existing_redirect_automation_curves (ARDOUR::Redirect*);
 
-       GtkCanvasItem *timestretch_rect;
+       GnomeCanvasItem *timestretch_rect;
 
        void timestretch (jack_nframes_t start, jack_nframes_t end);