From 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 17 Mar 2008 20:54:03 +0000 Subject: merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_region_view.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/audio_region_view.h') 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 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); -- cgit v1.2.3