From 6ec390d53a3dbea90e7308c9e40e03266f5d5127 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 18 Nov 2009 00:38:45 +0000 Subject: 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 --- src/common/interface/DataType.hpp | 102 -------------------------------------- src/common/interface/Port.hpp | 4 +- src/common/interface/PortType.hpp | 97 ++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 104 deletions(-) delete mode 100644 src/common/interface/DataType.hpp create mode 100644 src/common/interface/PortType.hpp (limited to 'src/common/interface') diff --git a/src/common/interface/DataType.hpp b/src/common/interface/DataType.hpp deleted file mode 100644 index dc2726df..00000000 --- a/src/common/interface/DataType.hpp +++ /dev/null @@ -1,102 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef DATATYPE_H -#define DATATYPE_H - -#include - -namespace Ingen { -namespace Shared { - - -/** A data type that can be stored in a Port. - * - * This type refers to the type of the entire buffer, mirroring LV2, - * e.g. :AudioPort and :ControlPort both are really 32-bit floating point, - * but they are different port types. - * - * FIXME: Event/MIDI/OSC kludges. - */ -class DataType { -public: - - enum Symbol { - UNKNOWN = 0, - AUDIO = 1, - CONTROL = 2, - EVENTS = 3, - //MIDI = 4, - //OSC = 5, - //STRING = 6, - VALUE = 7 - }; - - DataType(const Raul::URI& uri) - : _symbol(UNKNOWN) - { - if (uri.str() == type_uri(AUDIO)) { - _symbol = AUDIO; - } else if (uri.str() == type_uri(CONTROL)) { - _symbol = CONTROL; - } else if (uri.str() == type_uri(EVENTS)) { - _symbol = EVENTS; - } else if (uri.str() == type_uri(VALUE)) { - _symbol = VALUE; - } - } - - DataType(Symbol symbol) - : _symbol(symbol) - {} - - inline const char* uri() const { return type_uri(_symbol); } - inline Symbol symbol() const { return _symbol; } - - inline bool operator==(const Symbol& symbol) const { return (_symbol == symbol); } - inline bool operator!=(const Symbol& symbol) const { return (_symbol != symbol); } - inline bool operator==(const DataType& type) const { return (_symbol == type._symbol); } - inline bool operator!=(const DataType& type) const { return (_symbol != type._symbol); } - - inline bool is_audio() { return _symbol == AUDIO; } - inline bool is_control() { return _symbol == CONTROL; } - inline bool is_events() { return _symbol == EVENTS; } - inline bool is_value() { return _symbol == VALUE; } - -private: - - static inline const char* type_uri(unsigned symbol_num) { - switch (symbol_num) { - case 1: return "lv2:AudioPort"; - case 2: return "lv2:ControlPort"; - case 3: return "lv2ev:EventPort"; - case 4: return "lv2ev:EventPort"; // MIDI (no longer used) - case 5: return "lv2ev:EventPort"; // OSC (no longer used) - case 6: return "sp:StringPort"; // String Port (no longer used) - case 7: return "obj:ValuePort"; - default: return ""; - } - } - - Symbol _symbol; -}; - - -} // namespace Shared -} // namespace Ingen - -#endif // DATATYPE_H diff --git a/src/common/interface/Port.hpp b/src/common/interface/Port.hpp index 884b10e3..c7029095 100644 --- a/src/common/interface/Port.hpp +++ b/src/common/interface/Port.hpp @@ -20,7 +20,7 @@ #include #include "GraphObject.hpp" -#include "DataType.hpp" +#include "PortType.hpp" namespace Raul { class Atom; } @@ -39,7 +39,7 @@ class Port : public virtual GraphObject public: virtual uint32_t index() const = 0; virtual bool is_input() const = 0; - virtual Shared::DataType type() const = 0; + virtual Shared::PortType type() const = 0; virtual const Raul::Atom& value() const = 0; }; diff --git a/src/common/interface/PortType.hpp b/src/common/interface/PortType.hpp new file mode 100644 index 00000000..77211b71 --- /dev/null +++ b/src/common/interface/PortType.hpp @@ -0,0 +1,97 @@ +/* This file is part of Ingen. + * Copyright (C) 2007-2009 Dave Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PORTTYPE_H +#define PORTTYPE_H + +#include + +namespace Ingen { +namespace Shared { + + +/** The type of a port. + * + * This type refers to the type of the port itself (not necessarily the type + * of its contents). Ports with different types can contain the same type of + * data, but may e.g. have different access semantics. + */ +class PortType { +public: + + enum Symbol { + UNKNOWN = 0, + AUDIO = 1, + CONTROL = 2, + EVENTS = 3, + VALUE = 7, + }; + + PortType(const Raul::URI& uri) + : _symbol(UNKNOWN) + { + if (uri.str() == type_uri(AUDIO)) { + _symbol = AUDIO; + } else if (uri.str() == type_uri(CONTROL)) { + _symbol = CONTROL; + } else if (uri.str() == type_uri(EVENTS)) { + _symbol = EVENTS; + } else if (uri.str() == type_uri(VALUE)) { + _symbol = VALUE; + } + } + + PortType(Symbol symbol) + : _symbol(symbol) + {} + + inline const char* uri() const { return type_uri(_symbol); } + inline Symbol symbol() const { return _symbol; } + + inline bool operator==(const Symbol& symbol) const { return (_symbol == symbol); } + inline bool operator!=(const Symbol& symbol) const { return (_symbol != symbol); } + inline bool operator==(const PortType& type) const { return (_symbol == type._symbol); } + inline bool operator!=(const PortType& type) const { return (_symbol != type._symbol); } + + inline bool is_audio() { return _symbol == AUDIO; } + inline bool is_control() { return _symbol == CONTROL; } + inline bool is_events() { return _symbol == EVENTS; } + inline bool is_value() { return _symbol == VALUE; } + +private: + + static inline const char* type_uri(unsigned symbol_num) { + switch (symbol_num) { + case 1: return "lv2:AudioPort"; + case 2: return "lv2:ControlPort"; + case 3: return "lv2ev:EventPort"; + case 4: return "lv2ev:EventPort"; // MIDI (no longer used) + case 5: return "lv2ev:EventPort"; // OSC (no longer used) + case 6: return "sp:StringPort"; // String Port (no longer used) + case 7: return "obj:ValuePort"; + default: return ""; + } + } + + Symbol _symbol; +}; + + +} // namespace Shared +} // namespace Ingen + +#endif // PORTTYPE_H -- cgit v1.2.1