summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_time_axis.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-03-17 20:54:03 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-03-17 20:54:03 +0000
commit997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch)
tree1236e40183b677abf4a2882e4cfe8e0a345eb24d /gtk2_ardour/audio_time_axis.h
parent19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff)
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_time_axis.h')
-rw-r--r--gtk2_ardour/audio_time_axis.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index cb19be0b75..565d7cda9f 100644
--- 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"
@@ -83,6 +84,11 @@ class AudioTimeAxisView : public RouteTimeAxisView
void create_automation_child (ARDOUR::Parameter param, bool show);
+ void first_idle ();
+
+ void set_waveform_shape (Editing::WaveformShape);
+ void set_waveform_scale (Editing::WaveformScale);
+
private:
friend class AudioStreamView;
friend class AudioRegionView;
@@ -93,9 +99,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 ();