diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/interface/GraphObject.hpp | 7 | ||||
| -rw-r--r-- | src/common/interface/Plugin.hpp | 10 | ||||
| -rw-r--r-- | src/common/interface/Resource.hpp | 49 |
3 files changed, 58 insertions, 8 deletions
diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp index 013977d3..a82dd278 100644 --- a/src/common/interface/GraphObject.hpp +++ b/src/common/interface/GraphObject.hpp @@ -26,6 +26,7 @@ #include "raul/Atom.hpp" #include "raul/SharedPtr.hpp" #include "raul/WeakPtr.hpp" +#include "interface/Resource.hpp" using Raul::PathTable; @@ -40,19 +41,17 @@ namespace Shared { * \ingroup interface */ class GraphObject : public Raul::Deletable + , public virtual Resource { public: typedef std::map<std::string, Raul::Atom> Variables; - typedef std::map<std::string, Raul::Atom> Properties; typedef PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator; - + virtual const Raul::Path path() const = 0; virtual const Raul::Symbol symbol() const = 0; virtual const Variables& variables() const = 0; virtual Variables& variables() = 0; - virtual const Properties& properties() const = 0; - virtual Properties& properties() = 0; virtual bool polyphonic() const = 0; // FIXME: return WeakPtr, and stupid name diff --git a/src/common/interface/Plugin.hpp b/src/common/interface/Plugin.hpp index db67bf08..30b453f3 100644 --- a/src/common/interface/Plugin.hpp +++ b/src/common/interface/Plugin.hpp @@ -19,18 +19,19 @@ #define PLUGIN_H #include <string> +#include <iostream> +#include "interface/Resource.hpp" namespace Ingen { namespace Shared { -class Plugin +class Plugin : virtual public Resource { public: enum Type { LV2, LADSPA, Internal, Patch }; - virtual Type type() const = 0; - virtual const std::string& uri() const = 0; + virtual Type type() const = 0; inline const char* type_uri() const { switch (type()) { @@ -52,7 +53,8 @@ public: else if (uri == "ingen:Patch") return Patch; else - return Internal; + std::cerr << "WARNING: Unknown plugin type " << uri << std::endl; + return Internal; } }; diff --git a/src/common/interface/Resource.hpp b/src/common/interface/Resource.hpp new file mode 100644 index 00000000..32c760d7 --- /dev/null +++ b/src/common/interface/Resource.hpp @@ -0,0 +1,49 @@ +/* This file is part of Ingen. + * Copyright (C) 2008 Dave Robillard <http://drobilla.net> + * + * 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 RESOURCE_HPP +#define RESOURCE_HPP + +#include <string> +#include <map> +#include "raul/Atom.hpp" + +namespace Ingen { +namespace Shared { + + +class Resource +{ +public: + typedef std::map<std::string, Raul::Atom> Properties; + + virtual const std::string uri() const = 0; + virtual const Properties& properties() const = 0; + virtual Properties& properties() = 0; + + virtual void set_property(const std::string& uri, + const Raul::Atom& value) = 0; + + virtual const Raul::Atom& get_property(const std::string& uri) const = 0; +}; + + +} // namespace Shared +} // namespace Ingen + +#endif // RESOURCE_HPP + |