diff options
| author | David Robillard <d@drobilla.net> | 2007-03-18 06:07:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-03-18 06:07:08 +0000 |
| commit | 99904735e066804358f1d0bd138a84f1e9ecda91 (patch) | |
| tree | 71a924cf1660b5b00231275bd481bbd27094dd9b /libs/ardour/audio_track.cc | |
| parent | eb270e70a12c410cdd98585ad25bb6d8e384a4f5 (diff) | |
Merged with trunk R1612.
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
| -rw-r--r-- | libs/ardour/audio_track.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index b0ac7a4bd7..111bd9f4a9 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include <sigc++/retype.h> @@ -61,6 +60,7 @@ AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode } boost::shared_ptr<AudioDiskstream> ds (new AudioDiskstream (_session, name, dflags)); + _session.add_diskstream (ds); set_diskstream (boost::dynamic_pointer_cast<AudioDiskstream> (ds), this); @@ -276,14 +276,7 @@ AudioTrack::_set_state (const XMLNode& node, bool call_base) for (niter = nlist.begin(); niter != nlist.end(); ++niter){ child = *niter; - if (child->name() == X_("remote_control")) { - if ((prop = child->property (X_("id"))) != 0) { - int32_t x; - sscanf (prop->value().c_str(), "%d", &x); - set_remote_control_id (x); - } - - } else if (child->name() == X_("recenable")) { + if (child->name() == X_("recenable")) { _rec_enable_control.set_state (*child); _session.add_controllable (&_rec_enable_control); } @@ -329,11 +322,6 @@ AudioTrack::state(bool full_state) align_node->add_property (X_("style"), enum_2_string (as)); root.add_child_nocopy (*align_node); - XMLNode* remote_control_node = new XMLNode (X_("remote_control")); - snprintf (buf, sizeof (buf), "%d", _remote_control_id); - remote_control_node->add_property (X_("id"), buf); - root.add_child_nocopy (*remote_control_node); - root.add_property (X_("mode"), enum_2_string (_mode)); /* we don't return diskstream state because we don't |