* 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 b61101f78820ac5d1f3d0be1926ae0b76efb4e4d..326a05f2408db3937892a6a7f9eca8f7ef176739 100644 (file)
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -23,10 +23,11 @@
 #include <map>
 #include <cmath>
 
+#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 {
@@ -56,9 +57,11 @@ class AudioStreamView : public StreamView
        AudioStreamView (AudioTimeAxisView&);
        ~AudioStreamView ();
 
-       void set_waveform_shape (WaveformShape);
+       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_height (gdouble h);
        int set_samples_per_unit (gdouble spp);
 
        int     set_amplitude_above_axis (gdouble app);
@@ -76,35 +79,37 @@ class AudioStreamView : public StreamView
 
   private:
        void setup_rec_box ();
-       void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::shared_ptr<ARDOUR::Source> src); 
+       void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src); 
        void update_rec_regions ();
        
-       void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves);
-       void remove_region_view (boost::shared_ptr<ARDOUR::Region> );
+       RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves);
+       void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
        void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
-       void remove_audio_rec_region (boost::shared_ptr<ARDOUR::AudioRegion>);
 
        void undisplay_diskstream ();
        void redisplay_diskstream ();
-       void playlist_modified ();
+       void playlist_modified_weak (boost::weak_ptr<ARDOUR::Diskstream>);
+       void playlist_modified (boost::shared_ptr<ARDOUR::Diskstream>);
        void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
 
-       void add_crossfade (ARDOUR::Crossfade*);
-       void remove_crossfade (ARDOUR::Crossfade*);
+       void add_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
+       void add_crossfade_weak (boost::weak_ptr<ARDOUR::Crossfade>);
+       void remove_crossfade (boost::shared_ptr<ARDOUR::Region>);
 
-       void color_handler (ColorID id, uint32_t val);
-       
+       void color_handler ();
 
+       void update_contents_y_position_and_height ();
+       
        double _amplitude_above_axis;
        
        typedef list<CrossfadeView*> CrossfadeViewList;
        CrossfadeViewList crossfade_views;
        bool              crossfades_visible;
 
-       list<sigc::connection>     peak_ready_connections;
-       nframes_t             last_rec_peak_frame;
-       map<boost::shared_ptr<ARDOUR::Source>, bool> rec_peak_ready_map;
+       Editing::WaveformShape     _waveform_shape;
+       Editing::WaveformScale     _waveform_scale;
        
+       map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
 };
 
 #endif /* __ardour_audio_streamview_h__ */