* fixed segfault on MIDI Panic button

[ardour.git] / gtk2_ardour / audio_streamview.h

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index c8c9d5c4f610481704c9ebccbf8e2131797b245c..326a05f2408db3937892a6a7f9eca8f7ef176739 100644 (file)
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -26,9 +26,8 @@
 #include <boost/weak_ptr.hpp>
 
 #include <ardour/location.h>
-#include "enums.h"
+#include "editing.h"
 #include "simplerect.h"
-#include "color.h"
 #include "streamview.h"
 
 namespace Gdk {
@@ -58,10 +57,10 @@ class AudioStreamView : public StreamView
        AudioStreamView (AudioTimeAxisView&);
        ~AudioStreamView ();
 
-       void set_waveform_shape (WaveformShape);
-       WaveformShape get_waveform_shape () const { return _waveform_shape; }
-       void set_waveform_scale (WaveformScale);
-       WaveformScale get_waveform_scale () const { return _waveform_scale; }
+       void set_waveform_shape (Editing::WaveformShape);
+       Editing::WaveformShape get_waveform_shape () const { return _waveform_shape; }
+       void set_waveform_scale (Editing::WaveformScale);
+       Editing::WaveformScale get_waveform_scale () const { return _waveform_scale; }
 
        int set_samples_per_unit (gdouble spp);
 
@@ -107,8 +106,8 @@ class AudioStreamView : public StreamView
        CrossfadeViewList crossfade_views;
        bool              crossfades_visible;
 
-       WaveformShape     _waveform_shape;
-       WaveformScale     _waveform_scale;
+       Editing::WaveformShape     _waveform_shape;
+       Editing::WaveformScale     _waveform_scale;
        
        map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
 };