diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-20 16:09:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-20 16:09:42 +0000 |
| commit | 3e8be2ca624575d7578c405e6df1bfffd4b34fae (patch) | |
| tree | 887c7bec241f091ff6f7454be66d691a3eea5191 /gtk2_ardour | |
| parent | 2592a320d42dd4a157ee16101c042d875d3142be (diff) | |
fixes for crossfade views, crossfades and undo/redo. added default crossfade settings to ardour.rc.in
git-svn-id: svn://localhost/ardour2/trunk@994 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/crossfade_view.cc | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 3cca792523..0e6997b59c 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -288,7 +288,7 @@ AudioStreamView::add_crossfade (Crossfade *crossfade) crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); crossfade_views.push_back (cv); - if (!crossfades_visible) { + if (!Config->get_crossfades_visible() || !crossfades_visible) { cv->hide (); } } diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index baf0f2a346..42a1a47227 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -127,6 +127,10 @@ CrossfadeView::crossfade_changed (Change what_changed) set_duration (crossfade.overlap_length(), this); need_redraw_curves = true; } + + if (what_changed & Crossfade::FollowOverlapChanged) { + need_redraw_curves = true; + } if (what_changed & Crossfade::ActiveChanged) { /* calls redraw_curves */ @@ -142,9 +146,15 @@ CrossfadeView::redraw_curves () Points* points; int32_t npoints; float* vec; - double h; + if (!crossfade.following_overlap()) { + /* curves should not be visible */ + fade_in->hide (); + fade_out->hide (); + return; + } + /* At "height - 3.0" the bottom of the crossfade touches the name highlight or the bottom of the track (if the track is either Small or Smaller. |