diff options
author | David Robillard <d@drobilla.net> | 2009-11-18 00:38:45 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-11-18 00:38:45 +0000 |
commit | 6ec390d53a3dbea90e7308c9e40e03266f5d5127 (patch) | |
tree | 964973527778b5b2b28f8a5ebf63057fb7651d36 /src/client | |
parent | 1a725c0811fd15900464e1eff429c6ead90805d4 (diff) | |
download | ingen-6ec390d53a3dbea90e7308c9e40e03266f5d5127.tar.gz ingen-6ec390d53a3dbea90e7308c9e40e03266f5d5127.tar.bz2 ingen-6ec390d53a3dbea90e7308c9e40e03266f5d5127.zip |
Rename DataType to PortType (since that's what it really means).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2273 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/ClientStore.cpp | 4 | ||||
-rw-r--r-- | src/client/PortModel.hpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 57004d7d..b0b6bdbf 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -285,7 +285,7 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties) } bool is_patch, is_node, is_port, is_output; - DataType data_type(DataType::UNKNOWN); + PortType data_type(PortType::UNKNOWN); ResourceImpl::type(properties, is_patch, is_node, is_port, is_output, data_type); if (is_patch) { @@ -313,7 +313,7 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties) cerr << "ERROR: Plugin with no type" << endl; } } else if (is_port) { - if (data_type != DataType::UNKNOWN) { + if (data_type != PortType::UNKNOWN) { PortModel::Direction pdir = is_output ? PortModel::OUTPUT : PortModel::INPUT; SharedPtr<PortModel> p(new PortModel(path, 0, data_type, pdir)); p->set_properties(properties); diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index 178a34cb..34f909d0 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -42,7 +42,7 @@ public: enum Direction { INPUT, OUTPUT }; inline uint32_t index() const { return _index; } - inline Shared::DataType type() const { return _type; } + inline Shared::PortType type() const { return _type; } inline const Raul::Atom& value() const { return _current_val; } inline bool connected() const { return (_connections > 0); } inline bool is_input() const { return (_direction == INPUT); } @@ -78,7 +78,7 @@ public: private: friend class ClientStore; - PortModel(const Raul::Path& path, uint32_t index, Shared::DataType type, Direction dir) + PortModel(const Raul::Path& path, uint32_t index, Shared::PortType type, Direction dir) : ObjectModel(path) , _index(index) , _type(type) @@ -86,7 +86,7 @@ private: , _current_val(0.0f) , _connections(0) { - if (_type == Shared::DataType::UNKNOWN) + if (_type == Shared::PortType::UNKNOWN) std::cerr << "[PortModel] Warning: Unknown port type" << std::endl; } @@ -99,7 +99,7 @@ private: void set(SharedPtr<ObjectModel> model); uint32_t _index; - Shared::DataType _type; + Shared::PortType _type; Direction _direction; Raul::Atom _current_val; size_t _connections; |