diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-04-04 16:41:20 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-04-04 16:41:20 +0000 |
| commit | 040e016137ff15ebfa446f7e1de321d17be45dcd (patch) | |
| tree | 4c7fda0e1dc3407b50a33166b7bb44b9453852d5 /libs/ardour/diskstream.cc | |
| parent | 1052bc39bf09922a26b2d308f9f06ce29989f71e (diff) | |
move some DEBUG::Graph traces to DEBUG::ProcessThreads ; remove Diskstream::rename_write_sources() which is no longer relevant (sources are not created on disk until needed); fixup calling Diskstream::non_realtime_input_change() when calling Diskstream::set_track() with a track that doesn't yet have any I/O (i.e. typical case)
git-svn-id: svn://localhost/ardour2/branches/3.0@9281 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index bba28eeacd..69c83e30a1 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -38,6 +38,7 @@ #include "pbd/basename.h" #include "pbd/memento_command.h" #include "pbd/xml++.h" +#include "pbd/stacktrace.h" #include "ardour/ardour.h" #include "ardour/audioengine.h" @@ -180,8 +181,10 @@ Diskstream::set_track (Track* t) ic_connection.disconnect(); _io->changed.connect_same_thread (ic_connection, boost::bind (&Diskstream::handle_input_change, this, _1, _2)); - input_change_pending.type = IOChange::Type (IOChange::ConfigurationChanged|IOChange::ConnectionsChanged); - non_realtime_input_change (); + if (_io->n_ports() != ChanCount::ZERO) { + input_change_pending.type = IOChange::Type (IOChange::ConfigurationChanged|IOChange::ConnectionsChanged); + non_realtime_input_change (); + } _track->Destroyed.connect_same_thread (*this, boost::bind (&Diskstream::route_going_away, this)); } @@ -454,18 +457,9 @@ Diskstream::set_name (const string& str) if (_name != str) { assert(playlist()); playlist()->set_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 false; - } } - - return true; + return true; } XMLNode& |