Merge with trunk R2978.

[ardour.git] / libs / ardour / source.cc

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index a7620dbc5ac53d42d05b380c79cfdab6d8c2d013..a11e82f1e81b245e912ca9f3e2a1439ee2fbd71c 100644 (file)
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -42,20 +42,20 @@ using std::max;
 
 using namespace ARDOUR;
 
-Source::Source (Session& s, string name, DataType type)
-       : _session (s)
+Source::Source (Session& s, const string& name, DataType type)
+       : SessionObject(s, name)
        , _type(type)
 {
-       assert(_name.find("/") == string::npos);
+       // not true.. is this supposed to be an assertion?
+       //assert(_name.find("/") == string::npos);
 
-       _name = name;
        _timestamp = 0;
        _length = 0;
        _in_use = 0;
 }
 
 Source::Source (Session& s, const XMLNode& node) 
-       : _session (s)
+       : SessionObject(s, "unnamed source")
        , _type(DataType::AUDIO)
 {
        _timestamp = 0;