ardour/livetrax
13
0
Fork 0
Code

Fix crossfade visibility on startup so that it respects the configured setting.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7757 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-09-09 01:38:02 +00:00
parent d0220523f8
commit db680ab6d3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/audio_streamview.cc
View File

@ -61,7 +61,7 @@ using namespace Editing;
AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
: StreamView (tv) : StreamView (tv)
{ {
crossfades_visible = true; crossfades_visible = tv.session()->config.get_xfades_visible ();
color_handler (); color_handler ();
_amplitude_above_axis = 1.0; _amplitude_above_axis = 1.0;
@ -329,7 +329,7 @@ AudioStreamView::add_crossfade (boost::weak_ptr<Crossfade> wc)
cv->set_valid (true); cv->set_valid (true);
crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context()); crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context());
crossfade_views[cv->crossfade] = cv; crossfade_views[cv->crossfade] = cv;
if (!_trackview.session()->config.get_xfades_visible() || !crossfades_visible) { if (!crossfades_visible) {
cv->hide (); cv->hide ();
} }
@ -795,8 +795,6 @@ AudioStreamView::update_contents_height ()
void void
AudioStreamView::update_content_height (CrossfadeView* cv) AudioStreamView::update_content_height (CrossfadeView* cv)
{ {
cv->show ();
if (_layer_display == Overlaid) { if (_layer_display == Overlaid) {
cv->set_y (0); cv->set_y (0);

5
gtk2_ardour/crossfade_view.cc
View File

@ -185,7 +185,7 @@ CrossfadeView::redraw_curves ()
p.set_x (i + 1); p.set_x (i + 1);
p.set_y (_height - ((_height - 2) * vec[i])); p.set_y (_height - ((_height - 2) * vec[i]));
} }
fade_in->property_points() = *points; fade_in->property_points() = *points;
crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints); crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints);
@ -246,8 +246,9 @@ CrossfadeView::upper_regionview () const
void void
CrossfadeView::show () CrossfadeView::show ()
{ {
group->show();
_visible = true; _visible = true;
group->show();
redraw_curves ();
} }
void void