Uploaded start of CoreAudioSource. More sfdb work.

[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 4515e0f4a24ccf8c6aa2adc988fd841e4e86a1b1..6f4405b5a75eb74670c28ec2f6654892f05f5051 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -21,10 +21,15 @@
 #ifndef __ardour_trackview_h__
 #define __ardour_trackview_h__
 
-#include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <gtkmm/table.h>
+#include <gtkmm/button.h>
+#include <gtkmm/box.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
+#include <gtkmm/radiomenuitem.h>
+#include <gtkmm/checkmenuitem.h>
+
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/popup_selector.h>
 #include <list>
 
 #include <ardour/types.h>
@@ -34,6 +39,7 @@
 #include "route_ui.h"
 #include "enums.h"
 #include "time_axis_view.h"
+#include "canvas.h"
 
 namespace ALSA {
        class MultiChannelDevice;
@@ -70,7 +76,7 @@ class AutomationTimeAxisView;
 class AudioTimeAxisView : public RouteUI, public TimeAxisView
 {
   public:
-       AudioTimeAxisView (PublicEditor&, ARDOUR::Session&, ARDOUR::Route&, Gtk::Widget *canvas);
+       AudioTimeAxisView (PublicEditor&, ARDOUR::Session&, ARDOUR::Route&, ArdourCanvas::Canvas& canvas);
        virtual ~AudioTimeAxisView ();
 
        void show_selection (TimeSelection&);
@@ -123,7 +129,7 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        friend class StreamView;
        friend class AudioRegionView;
 
-       Gtk::Widget* parent_canvas;
+       ArdourCanvas::Canvas& parent_canvas;
 
        bool         no_redraw;
   
@@ -152,22 +158,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;
@@ -190,7 +180,6 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        void route_name_changed (void *);
        void name_entry_activated ();
        void name_entry_changed ();
-       gint name_entry_focus_out_handler (GdkEventFocus*);
        gint name_entry_key_release_handler (GdkEventKey*);
        gint name_entry_button_release_handler (GdkEventButton*);
        gint name_entry_button_press_handler (GdkEventButton*);
@@ -299,7 +288,7 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
        void add_redirect_automation_curve (ARDOUR::Redirect*, uint32_t);
        void add_existing_redirect_automation_curves (ARDOUR::Redirect*);
 
-       GnomeCanvasItem *timestretch_rect;
+       ArdourCanvas::SimpleRect *timestretch_rect;
 
        void timestretch (jack_nframes_t start, jack_nframes_t end);