diff options
author | David Robillard <d@drobilla.net> | 2008-10-18 16:58:12 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-10-18 16:58:12 +0000 |
commit | 18dbb3f103795daab90cabf83335c51cb7c05621 (patch) | |
tree | a1b6a0ae1ab5c600a8c04e7f97cd987df24b3229 /src/shared | |
parent | 49cf0af71d300585778b9bf55b74c781387a183e (diff) | |
download | ingen-18dbb3f103795daab90cabf83335c51cb7c05621.tar.gz ingen-18dbb3f103795daab90cabf83335c51cb7c05621.tar.bz2 ingen-18dbb3f103795daab90cabf83335c51cb7c05621.zip |
Build against local library versions no matter what.... hopefully....
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1677 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/Builder.cpp | 8 | ||||
-rw-r--r-- | src/shared/Builder.hpp | 2 | ||||
-rw-r--r-- | src/shared/ClashAvoider.hpp | 4 | ||||
-rw-r--r-- | src/shared/LV2Features.hpp | 2 | ||||
-rw-r--r-- | src/shared/LV2URIMap.hpp | 2 | ||||
-rw-r--r-- | src/shared/Store.cpp | 4 | ||||
-rw-r--r-- | src/shared/Store.hpp | 2 |
7 files changed, 10 insertions, 14 deletions
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp index 1eb127a5..48950e2e 100644 --- a/src/shared/Builder.cpp +++ b/src/shared/Builder.cpp @@ -22,7 +22,7 @@ #include "common/interface/Port.hpp" #include "common/interface/Connection.hpp" #include "common/interface/Plugin.hpp" -#include <iostream> + using namespace std; namespace Ingen { @@ -41,8 +41,7 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) SharedPtr<const Patch> patch = PtrCast<const Patch>(object); if (patch) { if (object->path() != "/") { - const std::string path_str = prefix.base() + object->path().substr(1); - //cout << "BUILDING PATCH " << path_str << endl; + const string path_str = prefix.base() + object->path().substr(1); _interface.new_patch(path_str, patch->internal_polyphony()); } @@ -50,7 +49,6 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) for (Patch::Connections::const_iterator i = patch->connections().begin(); i != patch->connections().end(); ++i) { string base = prefix.base() + object->path().substr(1); - cout << "*********** BASE: " << base << endl; _interface.connect(base + (*i)->src_port_path().substr(1), base + (*i)->dst_port_path().substr(1)); } @@ -60,7 +58,6 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) SharedPtr<const Node> node = PtrCast<const Node>(object); if (node) { Raul::Path path = prefix.base() + node->path().substr(1); - //cout << "BUILDING NODE " << path << endl; _interface.new_node(path, node->plugin()->uri()); build_object(prefix, object); return; @@ -69,7 +66,6 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) SharedPtr<const Port> port = PtrCast<const Port>(object); if (port) { Raul::Path path = prefix.base() + port->path().substr(1); - //cout << "BUILDING PORT " << path << endl; _interface.new_port(path, port->index(), port->type().uri(), !port->is_input()); build_object(prefix, object); return; diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp index a980bad2..f4b33538 100644 --- a/src/shared/Builder.hpp +++ b/src/shared/Builder.hpp @@ -18,7 +18,7 @@ #ifndef BUILDER_H #define BUILDER_H -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Raul { class Path; } diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp index f7016e4e..c6501b5f 100644 --- a/src/shared/ClashAvoider.hpp +++ b/src/shared/ClashAvoider.hpp @@ -21,8 +21,8 @@ #include <inttypes.h> #include <string> #include <map> -#include <raul/Atom.hpp> -#include <raul/Path.hpp> +#include "raul/Atom.hpp" +#include "raul/Path.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp index 4eac6daa..ef39c6b9 100644 --- a/src/shared/LV2Features.hpp +++ b/src/shared/LV2Features.hpp @@ -25,7 +25,7 @@ #include <map> #include <string> -#include <slv2/slv2.h> +#include "slv2/slv2.h" namespace Ingen { namespace Shared { diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp index 8821c4f6..a6642c28 100644 --- a/src/shared/LV2URIMap.hpp +++ b/src/shared/LV2URIMap.hpp @@ -26,7 +26,7 @@ #include <map> #include <string> #include <boost/utility.hpp> -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "common/lv2ext/lv2_uri_map.h" namespace Ingen { diff --git a/src/shared/Store.cpp b/src/shared/Store.cpp index 9f0f3624..d5e95e00 100644 --- a/src/shared/Store.cpp +++ b/src/shared/Store.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/PathTable.hpp> -#include <raul/TableImpl.hpp> +#include "raul/PathTable.hpp" +#include "raul/TableImpl.hpp" #include "common/interface/Node.hpp" #include "common/interface/Port.hpp" #include "Store.hpp" diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp index 27754345..809ebabc 100644 --- a/src/shared/Store.hpp +++ b/src/shared/Store.hpp @@ -20,7 +20,7 @@ #include <string> #include <glibmm/thread.h> -#include <raul/PathTable.hpp> +#include "raul/PathTable.hpp" #include "interface/GraphObject.hpp" using Raul::PathTable; |