/*
- Copyright (C) 2000-2006 Paul Davis
+ Copyright (C) 2000-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/boost_debug.h"
-#include <ardour/session.h>
+#include "ardour/session.h"
-#include <ardour/region_factory.h>
-#include <ardour/region.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
-#include <ardour/midi_source.h>
-#include <ardour/midi_region.h>
+#include "ardour/region_factory.h"
+#include "ardour/region.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_region.h"
#include "i18n.h"
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, const std::string& name,
+RegionFactory::create (boost::shared_ptr<Region> region, nframes_t start,
+ nframes_t length, const std::string& name,
layer_t layer, Region::Flag flags, bool announce)
{
boost::shared_ptr<const AudioRegion> other_a;
if ((other_a = boost::dynamic_pointer_cast<AudioRegion>(region)) != 0) {
AudioRegion* ar = new AudioRegion (other_a, start, length, name, layer, flags);
+ boost_debug_shared_ptr_mark_interesting (ar, typeid (ar).name());
boost::shared_ptr<AudioRegion> arp (ar);
boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (arp));
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}
MidiRegion* ar = new MidiRegion (other_m, start, length, name, layer, flags);
boost::shared_ptr<MidiRegion> arp (ar);
boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (arp));
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}
boost::shared_ptr<const MidiRegion> mr;
if ((ar = boost::dynamic_pointer_cast<const AudioRegion>(region)) != 0) {
- boost::shared_ptr<Region> ret (new AudioRegion (ar));
+ AudioRegion* arn = new AudioRegion (ar);
+ boost_debug_shared_ptr_mark_interesting (arn, typeid (arn).name());
+ boost::shared_ptr<Region> ret (arn);
+ ret->unlock_property_changes ();
/* pure copy constructor - no CheckNewRegion emitted */
return ret;
} else if ((mr = boost::dynamic_pointer_cast<const MidiRegion>(region)) != 0) {
boost::shared_ptr<Region> ret (new MidiRegion (mr));
+ ret->unlock_property_changes ();
/* pure copy constructor - no CheckNewRegion emitted */
return ret;
} else {
}
boost::shared_ptr<Region>
-RegionFactory::create (boost::shared_ptr<AudioRegion> region, nframes_t start,
- nframes_t length, const std::string& name,
+RegionFactory::create (boost::shared_ptr<AudioRegion> region, nframes_t start,
+ nframes_t length, const 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);
*/
if ((other = boost::dynamic_pointer_cast<AudioRegion>(region)) != 0) {
- AudioRegion* ar = new AudioRegion (other, srcs, srcs.front()->length(), name, layer, flags);
+ AudioRegion* ar = new AudioRegion (other, srcs, srcs.front()->length(srcs.front()->timeline_position()), name, layer, flags);
+ boost_debug_shared_ptr_mark_interesting (ar, typeid (ar).name());
boost::shared_ptr<AudioRegion> arp (ar);
boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (arp));
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}
boost::shared_ptr<Region> r = session.XMLRegionFactory (node, yn);
if (r) {
+ r->unlock_property_changes ();
CheckNewRegion (r);
}
return r;
}
-
-boost::shared_ptr<Region>
+
+boost::shared_ptr<Region>
RegionFactory::create (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Region::Flag flags, bool announce)
{
if (srcs.empty()) {
}
if (srcs[0]->type() == DataType::AUDIO) {
-
+
AudioRegion* ar = new AudioRegion (srcs, start, length, name, layer, flags);
+ boost_debug_shared_ptr_mark_interesting (ar, typeid (ar).name());
boost::shared_ptr<AudioRegion> arp (ar);
boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (arp));
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}
return ret;
} else if (srcs[0]->type() == DataType::MIDI) {
-
+
MidiRegion* ar = new MidiRegion (srcs, start, length, name, layer, flags);
boost::shared_ptr<MidiRegion> mrp (ar);
boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (mrp));
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}
}
return boost::shared_ptr<Region> ();
-}
+}
-boost::shared_ptr<Region>
+boost::shared_ptr<Region>
RegionFactory::create (SourceList& srcs, const XMLNode& node)
{
if (srcs.empty()) {
}
if (srcs[0]->type() == DataType::AUDIO) {
- boost::shared_ptr<Region> ret (new AudioRegion (srcs, node));
+ AudioRegion* ar = new AudioRegion (srcs, node);
+ boost_debug_shared_ptr_mark_interesting (ar, typeid (ar).name());
+ boost::shared_ptr<Region> ret (ar);
+ ret->unlock_property_changes ();
CheckNewRegion (ret);
return ret;
} else if (srcs[0]->type() == DataType::MIDI) {
boost::shared_ptr<Region> ret (new MidiRegion (srcs, node));
+ ret->unlock_property_changes ();
CheckNewRegion (ret);
return ret;
}
return boost::shared_ptr<Region> ();
}
-boost::shared_ptr<Region>
+boost::shared_ptr<Region>
RegionFactory::create (boost::shared_ptr<Source> src, nframes_t start, nframes_t length, const string& name, layer_t layer, Region::Flag flags, bool announce)
{
boost::shared_ptr<AudioSource> as;
boost::shared_ptr<MidiSource> ms;
if ((as = boost::dynamic_pointer_cast<AudioSource>(src)) != 0) {
- boost::shared_ptr<Region> ret (new AudioRegion (as, start, length, name, layer, flags));
+ AudioRegion* ar = new AudioRegion (as, start, length, name, layer, flags);
+ boost_debug_shared_ptr_mark_interesting (ar, typeid (ar).name());
+ boost::shared_ptr<Region> ret (ar);
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}
return ret;
} else if ((ms = boost::dynamic_pointer_cast<MidiSource>(src)) != 0) {
boost::shared_ptr<Region> ret (new MidiRegion (ms, start, length, name, layer, flags));
+ ret->unlock_property_changes ();
if (announce) {
CheckNewRegion (ret);
}