summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-02-20 03:32:42 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-02-20 03:32:42 +0000
commit7720d0d109ca47c2a0a23883d5831de1ff32005d (patch)
treeccd8f338595ba2bc4485e24cd7929dd947396a27
parent5fe37dbc53a7f54d81ff618eaa2fe050a34aeb3b (diff)
ensure that imported regions have names based on the files they are based on
git-svn-id: svn://localhost/ardour2/branches/3.0@6705 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/region.cc2
-rw-r--r--libs/ardour/region_factory.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index d7b1eec2f7..ca89c3cec0 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -228,7 +228,7 @@ Region::Region (const SourceList& srcs)
if @param offset_relative is false, then the start within the source is given @param offset.
*/
Region::Region (boost::shared_ptr<const Region> other, frameoffset_t offset, bool offset_relative)
- : SessionObject(other->session(), "toBeRenamed")
+ : SessionObject(other->session(), other->name())
, _type (other->data_type())
, _no_property_changes (true)
, REGION_COPY_STATE (other)
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 42a5629e4a..348dc72041 100644
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -28,6 +28,7 @@
#include "ardour/audiosource.h"
#include "ardour/midi_source.h"
#include "ardour/midi_region.h"
+#include "ardour/utils.h"
#include "i18n.h"
@@ -238,6 +239,7 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
}
if (ret) {
+
ret->set_properties (plist);
ret->unlock_property_changes ();