Insert/Redirect refactoring, towards better MIDI support in mixer strip, and

http://ardour.org/node/1043 style things.


git-svn-id: svn://localhost/ardour2/trunk@2027 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 8 deletions

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 18aeb32931..8de2faeb15 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -67,14 +67,13 @@ sigc::signal<void>                Diskstream::DiskOverrun;
 sigc::signal<void>                Diskstream::DiskUnderrun;
 
 Diskstream::Diskstream (Session &sess, const string &name, Flag flag)
-	: _name (name)
-	, _session (sess)
+	: SessionObject(sess, name)
 {
 	init (flag);
 }
 	
 Diskstream::Diskstream (Session& sess, const XMLNode& node)
-	: _session (sess)
+	: SessionObject(sess, "unnamed diskstream")
 {
 	init (Recordable);
 }
@@ -377,23 +376,24 @@ Diskstream::playlist_deleted (boost::weak_ptr<Playlist> wpl)
 	}
 }
 
-int
-Diskstream::set_name (string str)
+bool
+Diskstream::set_name (const string& str)
 {
 	if (str != _name) {
 		assert(playlist());
 		playlist()->set_name (str);
-		_name = str;
+		
+		SessionObject::set_name(str);
 		
 		if (!in_set_state && recordable()) {
 			/* rename existing capture files so that they have the correct name */
 			return rename_write_sources ();
 		} else {
-			return -1;
+			return false;
 		}
 	}
 
-	return 0;
+	return true;
 }
 
 void