From d6a3c886895f1de314569c39a00005c2c2272c13 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 10 Jan 2011 04:54:26 +0000 Subject: Remove shared/engine dependency on sigc++. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2814 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/PluginModel.hpp | 1 + src/shared/HTTPSender.cpp | 1 + src/shared/ResourceImpl.cpp | 1 - src/shared/ResourceImpl.hpp | 3 --- wscript | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index 362188f9..c3a27713 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -94,6 +94,7 @@ public: // Signals sigc::signal signal_changed; + sigc::signal signal_property; protected: friend class ClientStore; diff --git a/src/shared/HTTPSender.cpp b/src/shared/HTTPSender.cpp index fe7dfea4..4a3db5d3 100644 --- a/src/shared/HTTPSender.cpp +++ b/src/shared/HTTPSender.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp index 1801eb9f..dc9bfbae 100644 --- a/src/shared/ResourceImpl.cpp +++ b/src/shared/ResourceImpl.cpp @@ -52,7 +52,6 @@ ResourceImpl::add_property(const Raul::URI& uri, const Raul::Atom& value) return; _properties.insert(make_pair(uri, value)); - signal_property.emit(uri, value); } diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp index 5173e947..6bb88a76 100644 --- a/src/shared/ResourceImpl.hpp +++ b/src/shared/ResourceImpl.hpp @@ -19,7 +19,6 @@ #define INGEN_SHARED_RESOURCEIMPL_HPP #include -#include #include "raul/URI.hpp" #include "raul/SharedPtr.hpp" #include "interface/Resource.hpp" @@ -55,8 +54,6 @@ public: void dump(std::ostream& os) const; - sigc::signal signal_property; - /** Get the ingen type from a set of Properties. * If some coherent ingen type is found, true is returned and the appropriate * output parameter set to true. Otherwise false is returned. diff --git a/wscript b/wscript index d5741fb3..c1e368a8 100644 --- a/wscript +++ b/wscript @@ -62,7 +62,7 @@ def configure(conf): autowaf.check_pkg(conf, 'libsoup-2.4', uselib_store='SOUP', atleast_version='2.4.0', mandatory=False) if not Options.options.no_ladspa: - autowaf.check_header(conf, 'ladspa.h', 'HAVE_LADSPA_H', mandatory=False) + autowaf.check_header(conf, 'ladspa.h', mandatory=False) if not Options.options.no_osc: autowaf.check_pkg(conf, 'liblo', uselib_store='LIBLO', atleast_version='0.25', mandatory=False) -- cgit v1.2.1