diff options
author | Carl Hetherington <carl@carlh.net> | 2012-04-16 16:32:22 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2012-04-16 16:32:22 +0000 |
commit | a2897ecef6da6a458aa1de8c2d9973a1e809dca2 (patch) | |
tree | 189e34b829823fc73d11fba249f283e00336d44d /gtk2_ardour/audio_streamview.h | |
parent | 02c498a8fa1c2e47988a256321bdcf5e9e869de1 (diff) |
Fairly major change to the way in which crossfades are handled;
they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.
If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.h')
-rw-r--r-- | gtk2_ardour/audio_streamview.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h index 0c50986f93..4812903a35 100644 --- a/gtk2_ardour/audio_streamview.h +++ b/gtk2_ardour/audio_streamview.h @@ -36,7 +36,6 @@ namespace Gdk { namespace ARDOUR { class Route; - class Crossfade; class PeakData; class AudioRegion; class Source; @@ -47,33 +46,21 @@ class Selectable; class AudioTimeAxisView; class AudioRegionView; class RegionSelection; -class CrossfadeView; class Selection; class AudioStreamView : public StreamView { public: AudioStreamView (AudioTimeAxisView&); - ~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 foreach_crossfadeview (void (CrossfadeView::*pmf)(void)); - void show_all_fades (); void hide_all_fades (); - void show_all_xfades (); - void hide_all_xfades (); - void hide_xfades_involving (AudioRegionView&); - void reveal_xfades_involving (AudioRegionView&); - RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool); private: @@ -82,32 +69,18 @@ class AudioStreamView : public StreamView 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_track (); void redisplay_track (); - void playlist_layered (boost::weak_ptr<ARDOUR::Track>); - void playlist_switched (boost::weak_ptr<ARDOUR::Track>); - - void add_crossfade (boost::weak_ptr<ARDOUR::Crossfade>); - void remove_crossfade (boost::shared_ptr<ARDOUR::Region>); void color_handler (); - void update_contents_height (); - void update_content_height (CrossfadeView *); - void parameter_changed (std::string const &); void set_waveform_shape (ARDOUR::WaveformShape); void set_waveform_scale (ARDOUR::WaveformScale); double _amplitude_above_axis; - typedef std::map<boost::shared_ptr<ARDOUR::Crossfade>, CrossfadeView*> CrossfadeViewList; - CrossfadeViewList crossfade_views; - bool crossfades_visible; - std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map; bool outline_region; |