Cope with drags of selections that include regions on hidden tracks (#3493).

[ardour.git] / gtk2_ardour / audio_streamview.h

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index 14c8465179a349b64bdb26730bf3f00313061f8a..0c50986f9383fe832a3467255246eb395ce15f59 100644 (file)
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -36,7 +36,6 @@ namespace Gdk {
 
 namespace ARDOUR {
        class Route;
-       class Diskstream;
        class Crossfade;
        class PeakData;
        class AudioRegion;
@@ -58,12 +57,12 @@ class AudioStreamView : public StreamView
        ~AudioStreamView ();
 
        int set_samples_per_unit (gdouble spp);
+       void horizontal_position_changed ();
 
        int     set_amplitude_above_axis (gdouble app);
        gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
 
        void set_show_waveforms (bool yn);
-       void set_show_waveforms_recording (bool yn) { use_rec_regions = yn; }
 
        void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
 
@@ -79,22 +78,19 @@ class AudioStreamView : public StreamView
 
   private:
        void setup_rec_box ();
-       void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src);
-       void update_rec_regions ();
+       void rec_peak_range_ready (framepos_t start, ARDOUR::framecnt_t cnt, boost::weak_ptr<ARDOUR::Source> src);
+       void update_rec_regions (ARDOUR::framepos_t, ARDOUR::framecnt_t);
 
        RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false);
        void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
        void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
 
-       void undisplay_diskstream ();
-       void redisplay_diskstream ();
-       void playlist_modified_weak (boost::weak_ptr<ARDOUR::Diskstream>);
-       void playlist_modified (boost::shared_ptr<ARDOUR::Diskstream>);
-       void playlist_changed_weak (boost::weak_ptr<ARDOUR::Diskstream>);
-       void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
+       void undisplay_track ();
+       void redisplay_track ();
+       void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
+       void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
 
-       void add_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
-       void add_crossfade_weak (boost::weak_ptr<ARDOUR::Crossfade>);
+       void add_crossfade (boost::weak_ptr<ARDOUR::Crossfade>);
        void remove_crossfade (boost::shared_ptr<ARDOUR::Region>);
 
        void color_handler ();
@@ -112,8 +108,6 @@ class AudioStreamView : public StreamView
        CrossfadeViewList crossfade_views;
        bool              crossfades_visible;
 
-       std::list<sigc::connection>                  rec_data_ready_connections;
-       nframes_t                                    last_rec_data_frame;
        std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
 
        bool outline_region;