summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_region_view.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_region_view.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_region_view.h')
-rw-r--r--gtk2_ardour/audio_region_view.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 01ec7c95ce..10b0254337 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -63,6 +63,8 @@ class AudioRegionView : public RegionView
boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
void set_y_position_and_height (double, double);
+ void create_waves ();
+
void set_samples_per_unit (double);
void set_amplitude_above_axis (gdouble spp);
@@ -72,8 +74,8 @@ class AudioRegionView : public RegionView
void set_envelope_visible (bool);
void set_waveform_visible (bool yn);
- void set_waveform_shape (WaveformShape);
- void set_waveform_scale (WaveformScale);
+ void set_waveform_shape (Editing::WaveformShape);
+ void set_waveform_scale (Editing::WaveformScale);
bool waveform_rectified() const { return _flags & WaveformRectified; }
bool waveform_logscaled() const { return _flags & WaveformLogScaled; }
@@ -150,7 +152,6 @@ class AudioRegionView : public RegionView
void region_scale_amplitude_changed ();
void region_renamed ();
- void create_waves ();
void create_one_wave (uint32_t, bool);
void manage_zero_line ();
void peaks_ready_handler (uint32_t);