diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-09 15:50:44 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-09 15:50:44 +0000 |
commit | 0d0f71ee92fb7ce53fbcb8c7b0cd93b1cdf3529f (patch) | |
tree | ae37075200040cbbd430b98ee3cbce59eaef51ca /gtk2_ardour/audio_streamview.h | |
parent | 8011cbf5f8e4181ac39e4140e681fcad531f4a7c (diff) |
fix abort-capture path, including many subtle issues with shared_ptr<>; remove old automation feedback code; make new automation feedback code slightly configurable ; fix zoom focus options for playhead + edit cursor ; prevent zoom < 2 samples per pixel to avoid crashes ; peak building now uses shared_ptr<Source> not Source*
git-svn-id: svn://localhost/ardour2/trunk@959 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.h')
-rw-r--r-- | gtk2_ardour/audio_streamview.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h index b61101f788..c6db40f336 100644 --- a/gtk2_ardour/audio_streamview.h +++ b/gtk2_ardour/audio_streamview.h @@ -23,6 +23,8 @@ #include <map> #include <cmath> +#include <boost/weak_ptr.hpp> + #include <ardour/location.h> #include "enums.h" #include "simplerect.h" @@ -76,13 +78,12 @@ 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> ); + 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 (); |