fix merge with master

[ardour.git] / gtk2_ardour / audio_streamview.h

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index cb3175798e293980e506caeacf28af7be35fd68c..8e9b095537d47e6f4e0d8725c9ec7b321f8be24c 100644 (file)
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -27,7 +27,6 @@
 
 #include "ardour/location.h"
 #include "editing.h"
-#include "simplerect.h"
 #include "streamview.h"
 
 namespace Gdk {
@@ -35,10 +34,10 @@ namespace Gdk {
 }
 
 namespace ARDOUR {
-       class Route;
-       class PeakData;
        class AudioRegion;
+       class Route;
        class Source;
+       struct PeakData;
 }
 
 class PublicEditor;
@@ -56,12 +55,10 @@ class AudioStreamView : public StreamView
        int     set_amplitude_above_axis (gdouble app);
        gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
 
-       void set_show_waveforms (bool yn);
-
        void show_all_fades ();
        void hide_all_fades ();
 
-       void hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
+       std::pair<std::list<AudioRegionView*>, std::list<AudioRegionView*> > hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
 
        RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
@@ -77,10 +74,6 @@ class AudioStreamView : public StreamView
 
        void color_handler ();
 
-       void parameter_changed (std::string const &);
-       void set_waveform_shape (ARDOUR::WaveformShape);
-       void set_waveform_scale (ARDOUR::WaveformScale);
-
        double _amplitude_above_axis;
 
        std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;