summaryrefslogtreecommitdiffstats
path: root/src/common/interface
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-11-09 03:45:35 +0000
committerDavid Robillard <d@drobilla.net>2008-11-09 03:45:35 +0000
commit72ffe8b96f492805b16df8d2ffa452e67046b974 (patch)
tree4c3e565f34e334c8cc3a58ab052ea2156eb4cfdc /src/common/interface
parent5d1f579900182f283a1c21ad4e59daf7f035e219 (diff)
downloadingen-72ffe8b96f492805b16df8d2ffa452e67046b974.tar.gz
ingen-72ffe8b96f492805b16df8d2ffa452e67046b974.tar.bz2
ingen-72ffe8b96f492805b16df8d2ffa452e67046b974.zip
Add concept of 'Resource' and make plugins a resource (as well as graph objects).
Get rid of crufty imperative Plugin API. Loading of plugin data from engine over HTTP. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1713 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/common/interface')
-rw-r--r--src/common/interface/GraphObject.hpp7
-rw-r--r--src/common/interface/Plugin.hpp10
-rw-r--r--src/common/interface/Resource.hpp49
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
+