X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.h;h=80450e9f61aa38e44342f1f1260b538c5dee33d4;hb=cf32bf81b81b79250ade5cdae9f79dda6c0eee41;hp=b0183e5e19ebfbdb473aec81b2c750730aaf71cd;hpb=2177f008411821e7bce9ca3c306ec64c70b1c58e;p=ardour.git

diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index b0183e5e19..80450e9f61 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,11 +31,12 @@
 #include <gtkmm2ext/selector.h>
 #include <list>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
+#include "editing.h"
 #include "route_time_axis.h"
 #include "canvas.h"
 
@@ -65,37 +66,33 @@ class AutomationTimeAxisView;
 class AudioTimeAxisView : public RouteTimeAxisView
 {
   public:
- 	AudioTimeAxisView (PublicEditor&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Route>, ArdourCanvas::Canvas& canvas);
+ 	AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, ArdourCanvas::Canvas& canvas);
  	virtual ~AudioTimeAxisView ();
-	
+
 	AudioStreamView* audio_view();
 
-	void set_show_waveforms (bool yn);
 	void set_show_waveforms_recording (bool yn);
 	void show_all_xfades ();
 	void hide_all_xfades ();
 	void hide_dependent_views (TimeAxisViewItem&);
 	void reveal_dependent_views (TimeAxisViewItem&);
-	void set_layer_display (LayerDisplay d);
-		
+
 	/* Overridden from parent to store display state */
 	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 ();
+
   private:
 	friend class AudioStreamView;
 	friend class AudioRegionView;
-	
+
 	void route_active_changed ();
 
 	void append_extra_display_menu_items ();
-	
-	void toggle_show_waveforms ();
-	void set_waveform_shape (WaveformShape);
-	void toggle_waveforms ();
-	void set_waveform_scale (WaveformScale);
+	Gtk::Menu* build_mode_menu();
 
 	void show_all_automation ();
 	void show_existing_automation ();
@@ -104,16 +101,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;
-	Gtk::CheckMenuItem* gain_automation_item;
-	Gtk::CheckMenuItem* pan_automation_item;
 };
 
 #endif /* __ardour_audio_time_axis_h__ */