summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/Builder.cpp1
-rw-r--r--src/shared/ClashAvoider.cpp3
-rw-r--r--src/shared/ClashAvoider.hpp6
-rw-r--r--src/shared/ResourceImpl.cpp45
-rw-r--r--src/shared/ResourceImpl.hpp14
-rw-r--r--src/shared/runtime_paths.cpp1
-rw-r--r--src/shared/runtime_paths.hpp2
-rw-r--r--src/shared/wscript3
8 files changed, 56 insertions, 19 deletions
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 3bd9e75a..f73b0e11 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -15,6 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "raul/Atom.hpp"
#include "Builder.hpp"
#include "common/interface/CommonInterface.hpp"
#include "common/interface/Patch.hpp"
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index 10d22d5d..ee2c1566 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -25,7 +25,8 @@ namespace Ingen {
namespace Shared {
-const Raul::Path
+/** Always returns a valid Raul::Path */
+const std::string
ClashAvoider::map_path(const Raul::Path& in)
{
//cout << "MAP PATH: " << in;
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index 91c58c0e..1ddee704 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -21,10 +21,10 @@
#include <inttypes.h>
#include <string>
#include <map>
-#include "raul/Atom.hpp"
-#include "raul/Path.hpp"
#include "interface/CommonInterface.hpp"
+namespace Raul { class Atom; class Path; }
+
namespace Ingen {
namespace Shared {
@@ -85,7 +85,7 @@ public:
void destroy(const std::string& path);
private:
- const Raul::Path map_path(const Raul::Path& in);
+ const std::string map_path(const Raul::Path& in);
Store& _store;
CommonInterface& _target;
diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp
new file mode 100644
index 00000000..4dd25602
--- /dev/null
+++ b/src/shared/ResourceImpl.cpp
@@ -0,0 +1,45 @@
+/* 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
+ */
+
+#include "raul/Atom.hpp"
+#include "ResourceImpl.hpp"
+
+namespace Ingen {
+namespace Shared {
+
+
+void
+ResourceImpl::set_property(const std::string& uri, const Raul::Atom& value)
+{
+ _properties[uri] = value;
+}
+
+
+const Raul::Atom&
+ResourceImpl::get_property(const std::string& uri) const
+{
+ static const Raul::Atom nil;
+ Properties::const_iterator i = _properties.find(uri);
+ if (i == _properties.end())
+ return nil;
+ else
+ return i->second;
+}
+
+
+} // namespace Shared
+} // namespace Ingen
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp
index 8181ed07..2d438487 100644
--- a/src/shared/ResourceImpl.hpp
+++ b/src/shared/ResourceImpl.hpp
@@ -37,18 +37,8 @@ public:
const Properties& properties() const { return _properties; }
Properties& properties() { return _properties; }
- virtual void set_property(const std::string& uri, const Raul::Atom& value) {
- _properties[uri] = value;
- }
-
- const Raul::Atom& get_property(const std::string& uri) const {
- static const Raul::Atom nil;
- Properties::const_iterator i = _properties.find(uri);
- if (i == _properties.end())
- return nil;
- else
- return i->second;
- }
+ const Raul::Atom& get_property(const std::string& uri) const;
+ void set_property(const std::string& uri, const Raul::Atom& value);
private:
std::string _uri;
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp
index d122aba0..1e9c3663 100644
--- a/src/shared/runtime_paths.cpp
+++ b/src/shared/runtime_paths.cpp
@@ -16,6 +16,7 @@
*/
#include <iostream>
+#include "config.h"
#include "runtime_paths.hpp"
#include <glibmm/module.h>
diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp
index b8c28cce..8081a249 100644
--- a/src/shared/runtime_paths.hpp
+++ b/src/shared/runtime_paths.hpp
@@ -27,8 +27,6 @@
#include <stdlib.h>
#include <limits.h>
#include <string>
-#include "config.h"
-#include "shared/runtime_paths.hpp"
namespace Ingen {
namespace Shared {
diff --git a/src/shared/wscript b/src/shared/wscript
index 1250c040..83b3e7c1 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -8,8 +8,9 @@ def build(bld):
ClashAvoider.cpp
LV2Features.cpp
LV2URIMap.cpp
- Store.cpp
+ ResourceImpl.cpp
runtime_paths.cpp
+ Store.cpp
'''
if bld.env['HAVE_LIBLO'] == 1:
obj.source += ' OSCSender.cpp '