diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
| commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
| tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /libs/ardour/region_factory.cc | |
| parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) | |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region_factory.cc')
| -rw-r--r-- | libs/ardour/region_factory.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index bd4b0873a7..84d8167240 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -37,8 +37,8 @@ sigc::signal<void,boost::shared_ptr<Region> > RegionFactory::CheckNewRegion; boost::shared_ptr<Region> RegionFactory::create (boost::shared_ptr<Region> region, nframes_t start, - nframes_t length, std::string name, - layer_t layer, Region::Flag flags, bool announce) + nframes_t length, std::string name, + layer_t layer, Region::Flag flags, bool announce) { boost::shared_ptr<const AudioRegion> other_a; boost::shared_ptr<const MidiRegion> other_m; @@ -68,16 +68,16 @@ RegionFactory::create (boost::shared_ptr<Region> region, nframes_t start, } boost::shared_ptr<Region> -RegionFactory::create (boost::shared_ptr<Region> region) +RegionFactory::create (boost::shared_ptr<const Region> region) { - boost::shared_ptr<AudioRegion> ar; - boost::shared_ptr<MidiRegion> mr; + boost::shared_ptr<const AudioRegion> ar; + boost::shared_ptr<const MidiRegion> mr; - if ((ar = boost::dynamic_pointer_cast<AudioRegion>(region)) != 0) { + if ((ar = boost::dynamic_pointer_cast<const AudioRegion>(region)) != 0) { boost::shared_ptr<Region> ret (new AudioRegion (ar)); /* pure copy constructor - no CheckNewRegion emitted */ return ret; - } else if ((mr = boost::dynamic_pointer_cast<MidiRegion>(region)) != 0) { + } else if ((mr = boost::dynamic_pointer_cast<const MidiRegion>(region)) != 0) { boost::shared_ptr<Region> ret (new MidiRegion (mr)); /* pure copy constructor - no CheckNewRegion emitted */ return ret; @@ -91,8 +91,8 @@ RegionFactory::create (boost::shared_ptr<Region> region) boost::shared_ptr<Region> RegionFactory::create (boost::shared_ptr<AudioRegion> region, nframes_t start, - nframes_t length, std::string name, - layer_t layer, Region::Flag flags, bool announce) + nframes_t length, std::string name, + layer_t layer, Region::Flag flags, bool announce) { return create (boost::static_pointer_cast<Region> (region), start, length, name, layer, flags, announce); } |