diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
| commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
| tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /gtk2_ardour/audio_streamview.h | |
| parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) | |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.h')
| -rw-r--r-- | gtk2_ardour/audio_streamview.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h index 326a05f240..74868ea1a2 100644 --- a/gtk2_ardour/audio_streamview.h +++ b/gtk2_ardour/audio_streamview.h @@ -82,7 +82,7 @@ class AudioStreamView : public StreamView void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src); void update_rec_regions (); - RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves); + 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> ); @@ -106,10 +106,15 @@ class AudioStreamView : public StreamView CrossfadeViewList crossfade_views; bool crossfades_visible; + + std::list<sigc::connection> rec_data_ready_connections; + nframes_t last_rec_data_frame; + map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map; + + bool outline_region; + Editing::WaveformShape _waveform_shape; Editing::WaveformScale _waveform_scale; - - map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map; }; #endif /* __ardour_audio_streamview_h__ */ |