diff options
author | David Robillard <d@drobilla.net> | 2006-08-01 17:19:38 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-08-01 17:19:38 +0000 |
commit | 79fc27de2ef9db51a8c7c69764b663a9921c5a40 (patch) | |
tree | 09d5e86fa212f2b8dde0811b2c9e8cc7cfbc7136 /libs/ardour/route.cc | |
parent | 9d5d82b4df5b3510177fd31557ac765f46778fe8 (diff) |
Mostly Cosmetic/Design changes to bring trunk and midi branch closer
git-svn-id: svn://localhost/ardour2/branches/midi@733 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
-rw-r--r-- | libs/ardour/route.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 95b5d0ddaf..713eed1b82 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -28,6 +28,7 @@ #include <ardour/timestamps.h> #include <ardour/audioengine.h> #include <ardour/route.h> +#include <ardour/buffer.h> #include <ardour/insert.h> #include <ardour/send.h> #include <ardour/session.h> @@ -51,7 +52,7 @@ using namespace PBD; uint32_t Route::order_key_cnt = 0; -Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg, Buffer::Type default_type) +Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg, DataType default_type) : IO (sess, name, input_min, input_max, output_min, output_max, default_type), _flags (flg), _solo_control (*this, ToggleControllable::SoloControl), @@ -1332,7 +1333,6 @@ Route::state(bool full_state) node->add_property("flags", buf); } - // FIXME: assumes there's only audio and MIDI types node->add_property("default-type", Buffer::type_to_string(_default_type)); node->add_property("active", _active?"yes":"no"); @@ -1511,7 +1511,7 @@ Route::set_state (const XMLNode& node) if ((prop = node.property ("default-type")) != 0) { _default_type = Buffer::type_from_string(prop->value()); - assert(_default_type != Buffer::NIL); + assert(_default_type != NIL); } if ((prop = node.property ("phase-invert")) != 0) { |