ardour/livetrax
13
0
Fork 0
Code

Fix for the persistent rec-region problem.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@916 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-09-16 02:58:22 +00:00
parent dc9484d144
commit 5cbce5b762
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/audio_streamview.cc
View File

@ -217,9 +217,7 @@ AudioStreamView::playlist_modified ()
StreamView::playlist_modified();
/* if the playlist is modified, make sure xfades are on top and all the regionviews are stacked
correctly.
*/
/* make sure xfades are on top and all the regionviews are stacked correctly. */
for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
(*i)->get_canvas_group()->raise_to_top();
@ -423,8 +421,8 @@ AudioStreamView::setup_rec_box ()
(RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false)));
region->set_position (_trackview.session().transport_frame(), this);
rec_regions.push_back (region);
/* catch it if it goes away */
region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_rec_region), region));
// rec regions are destroyed in setup_rec_box
/* we add the region later */
}
@ -506,6 +504,9 @@ AudioStreamView::setup_rec_box ()
/* remove temp regions */
for (list<boost::shared_ptr<ARDOUR::Region> >::iterator i = rec_regions.begin(); i != rec_regions.end(); ++i) {
(*i)->drop_references();
}
rec_regions.clear();
// cerr << "\tclear " << rec_rects.size() << " rec rects\n";
@ -569,9 +570,10 @@ AudioStreamView::update_rec_regions ()
continue;
}
// FIXME
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(*iter);
assert(region);
if (!region) {
continue;
}
jack_nframes_t origlen = region->length();

3
gtk2_ardour/streamview.cc
View File

@ -177,6 +177,8 @@ StreamView::remove_region_view (boost::shared_ptr<Region> r)
}
}
#if 0
(unused)
void
StreamView::remove_rec_region (boost::shared_ptr<Region> r)
{
@ -194,6 +196,7 @@ StreamView::remove_rec_region (boost::shared_ptr<Region> r)
}
}
}
#endif
void
StreamView::undisplay_diskstream ()

2
gtk2_ardour/streamview.h
View File

@ -109,7 +109,7 @@ protected:
virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
virtual void remove_region_view (boost::shared_ptr<ARDOUR::Region> );
void remove_rec_region (boost::shared_ptr<ARDOUR::Region>);
//void remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused)
void display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
virtual void undisplay_diskstream ();