waf build works on OS X ; new bindings file and processing system in place for mnemon...

[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 ce5697d7c1ee10f113cfb12cbdc713b16028e666..48ea7cc816efab5f14d0eeaeb66bbfee750b1db0 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -31,7 +31,7 @@
 #include <gtkmm2ext/selector.h>
 #include <list>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
@@ -71,7 +71,6 @@ class AudioTimeAxisView : public RouteTimeAxisView
        
        AudioStreamView* audio_view();
 
-       void set_show_waveforms (bool yn);
        void set_show_waveforms_recording (bool yn);
        void show_all_xfades ();
        void hide_all_xfades ();
@@ -82,14 +81,11 @@ class AudioTimeAxisView : public RouteTimeAxisView
        guint32 show_at (double y, int& nth, Gtk::VBox *parent);
        void hide ();
        
-       void create_automation_child (const 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);
+       XMLNode* get_child_xml_node (const std::string & childname);
 
   private:
        friend class AudioStreamView;
@@ -100,9 +96,6 @@ class AudioTimeAxisView : public RouteTimeAxisView
        void append_extra_display_menu_items ();
        Gtk::Menu* build_mode_menu();
        
-       void toggle_show_waveforms ();
-       void toggle_waveforms ();
-
        void show_all_automation ();
        void show_existing_automation ();
        void hide_all_automation ();
@@ -110,14 +103,8 @@ class AudioTimeAxisView : public RouteTimeAxisView
        void gain_hidden ();
        void pan_hidden ();
 
-       void update_pans (bool show=true);
+       void ensure_pan_views (bool show = true);
        void update_control_names ();
-
-       Gtk::CheckMenuItem* waveform_item;
-       Gtk::RadioMenuItem* traditional_item;
-       Gtk::RadioMenuItem* rectified_item;
-       Gtk::RadioMenuItem* linearscale_item;
-       Gtk::RadioMenuItem* logscale_item;
 };
 
 #endif /* __ardour_audio_time_axis_h__ */