diff options
| -rw-r--r-- | ingen/Module.hpp | 7 | ||||
| -rw-r--r-- | src/World.cpp | 2 | ||||
| -rw-r--r-- | src/gui/ingen_gui_lv2.cpp | 2 | ||||
| -rw-r--r-- | src/ingen/main.cpp | 4 | ||||
| -rw-r--r-- | src/serialisation/Serialiser.cpp | 17 | ||||
| -rw-r--r-- | src/server/GraphObjectImpl.cpp | 5 | ||||
| -rw-r--r-- | src/server/PatchImpl.cpp | 2 | ||||
| -rw-r--r-- | src/server/ingen_lv2.cpp | 2 | ||||
| -rw-r--r-- | src/server/mix.cpp | 1 |
9 files changed, 18 insertions, 24 deletions
diff --git a/ingen/Module.hpp b/ingen/Module.hpp index 3decc185..cb3d90b2 100644 --- a/ingen/Module.hpp +++ b/ingen/Module.hpp @@ -50,4 +50,11 @@ private: } // namespace Ingen +extern "C" { + +/** Prototype for the ingen_module_load() entry point in an ingen module. */ +Ingen::Module* ingen_module_load(); + +} + #endif // INGEN_MODULE_HPP diff --git a/src/World.cpp b/src/World.cpp index c7ce14ba..1bf84732 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -53,7 +53,7 @@ namespace Serialisation { class Parser; class Serialiser; } * * \param name The base name of the module, e.g. "ingen_serialisation" */ -Glib::Module* +static Glib::Module* ingen_load_module(const string& name) { Glib::Module* module = NULL; diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 9407a0c7..0e512801 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -169,7 +169,7 @@ port_event(LV2UI_Handle handle, ui->reader->write(atom); } -const void* +static const void* extension_data(const char* uri) { return NULL; diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 651c7ad0..16152a87 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -46,7 +46,7 @@ using namespace Ingen; Ingen::World* world = NULL; -void +static void ingen_interrupt(int signal) { if (signal == SIGTERM) { @@ -61,7 +61,7 @@ ingen_interrupt(int signal) } } -void +static void ingen_try(bool cond, const char* msg) { if (!cond) { diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index c1842022..5ad62e7c 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -160,23 +160,6 @@ Serialiser::Impl::write_manifest(const std::string& bundle_path, finish(); } -std::string -normal_bundle_uri(const std::string& uri) -{ - std::string ret = uri; - size_t i; - while ((i = ret.find("/./")) != std::string::npos) { - ret = ret.substr(0, i) + ret.substr(i + 2); - } - const size_t last_slash = ret.find_last_of("/"); - if (last_slash != std::string::npos) { - return ret.substr(0, last_slash); - } else { - return ret + "/"; - } - return ret; -} - void Serialiser::write_bundle(SharedPtr<const GraphObject> patch, const std::string& path) diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp index 0d07b510..0b66d05e 100644 --- a/src/server/GraphObjectImpl.cpp +++ b/src/server/GraphObjectImpl.cpp @@ -16,6 +16,8 @@ #include <string> +#include "raul/log.hpp" + #include "GraphObjectImpl.hpp" #include "PatchImpl.hpp" #include "ThreadManager.hpp" @@ -53,7 +55,8 @@ GraphObjectImpl::parent_patch() const SharedPtr<GraphObject> GraphObjectImpl::find_child(const std::string& name) const { - throw; + Raul::error("GraphObjectImpl::find_child called\n"); + return SharedPtr<GraphObject>(); } } // namespace Server diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp index ee5ea230..16cff0c9 100644 --- a/src/server/PatchImpl.cpp +++ b/src/server/PatchImpl.cpp @@ -389,7 +389,7 @@ PatchImpl::compile() const for (Nodes::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i) { NodeImpl* const node = (*i); // Either a sink or connected to our output ports: - if (!node->traversed() && node->dependants().size() == 0) + if (!node->traversed() && node->dependants().empty()) compile_recursive(node, compiled_patch); } diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 7da7f476..33de440f 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -709,7 +709,7 @@ ingen_restore(LV2_Handle instance, return LV2_STATE_SUCCESS; } -const void* +static const void* ingen_extension_data(const char* uri) { static const LV2_State_Interface state = { ingen_save, ingen_restore }; diff --git a/src/server/mix.cpp b/src/server/mix.cpp index c340a8a2..b4ba4b8a 100644 --- a/src/server/mix.cpp +++ b/src/server/mix.cpp @@ -21,6 +21,7 @@ #include "Buffer.hpp" #include "Context.hpp" +#include "mix.hpp" namespace Ingen { namespace Server { |