Fix mismatched types (warnings).

[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 a65bca1a70e820ec68d85b2f58aca02cec54cc83..133a84e590a92569317893a87c37a71871ab79ef 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -36,6 +36,7 @@
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
+#include "editing.h"
 #include "route_time_axis.h"
 #include "canvas.h"
 
@@ -81,8 +82,15 @@ class AudioTimeAxisView : public RouteTimeAxisView
        guint32 show_at (double y, int& nth, Gtk::VBox *parent);
        void hide ();
        
-       void create_automation_child (ARDOUR::Parameter param, bool show);
+       void create_automation_child (const Evoral::Parameter& param, bool show);
        
+       void first_idle ();
+
+       XMLNode* get_child_xml_node (const string & childname);
+
+       void set_waveform_shape (Editing::WaveformShape);
+       void set_waveform_scale (Editing::WaveformScale);
+
   private:
        friend class AudioStreamView;
        friend class AudioRegionView;
@@ -93,9 +101,7 @@ class AudioTimeAxisView : public RouteTimeAxisView
        Gtk::Menu* build_mode_menu();
        
        void toggle_show_waveforms ();
-       void set_waveform_shape (WaveformShape);
        void toggle_waveforms ();
-       void set_waveform_scale (WaveformScale);
 
        void show_all_automation ();
        void show_existing_automation ();
@@ -112,8 +118,6 @@ class AudioTimeAxisView : public RouteTimeAxisView
        Gtk::RadioMenuItem* rectified_item;
        Gtk::RadioMenuItem* linearscale_item;
        Gtk::RadioMenuItem* logscale_item;
-       Gtk::CheckMenuItem* gain_automation_item;
-       Gtk::CheckMenuItem* pan_automation_item;
 };
 
 #endif /* __ardour_audio_time_axis_h__ */