diff options
Diffstat (limited to 'src')
132 files changed, 340 insertions, 317 deletions
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index cd5ffb06..97930955 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -24,12 +24,13 @@ #include "raul/SharedPtr.hpp" #include <sigc++/sigc++.h> #include "raul/Path.hpp" -#include "raul/Atom.hpp" #include "raul/PathTable.hpp" #include "raul/TableImpl.hpp" #include "interface/EngineInterface.hpp" #include "shared/Store.hpp" +namespace Raul { class Atom; } + using namespace std; using Ingen::Shared::EngineInterface; using Raul::Path; diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 82a5e578..794816bb 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -30,11 +30,6 @@ #include <libxml/xpath.h> #include "raul/Path.hpp" #include "interface/EngineInterface.hpp" -#include "PatchModel.hpp" -#include "NodeModel.hpp" -#include "ConnectionModel.hpp" -#include "PortModel.hpp" -#include "PluginModel.hpp" #include "DeprecatedLoader.hpp" #define NS_INGEN "http://drobilla.net/ns/ingen#" diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp index ad1a8069..37d31f3f 100644 --- a/src/client/DeprecatedLoader.hpp +++ b/src/client/DeprecatedLoader.hpp @@ -26,7 +26,6 @@ #include <glibmm/ustring.h> #include <libxml/tree.h> #include "raul/SharedPtr.hpp" -#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "interface/GraphObject.hpp" #include "ObjectModel.hpp" @@ -35,6 +34,8 @@ using std::string; using Ingen::Shared::EngineInterface; using Ingen::Shared::GraphObject; +namespace Raul { class Path; } + namespace Ingen { namespace Client { diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp index 9464407a..969d617e 100644 --- a/src/client/HTTPClientReceiver.cpp +++ b/src/client/HTTPClientReceiver.cpp @@ -22,6 +22,7 @@ #include <sstream> #include <sys/socket.h> #include <errno.h> +#include "raul/Atom.hpp" #include "module/Module.hpp" #include "HTTPClientReceiver.hpp" diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index 9e966f63..5b1f6ce8 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -20,7 +20,6 @@ #include "config.h" #include "interface/Port.hpp" #include "NodeModel.hpp" -#include "PatchModel.hpp" namespace Ingen { namespace Client { diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index 3ce16413..1cf7233a 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -22,7 +22,6 @@ #include <iostream> #include <string> #include <sigc++/sigc++.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "interface/Node.hpp" #include "interface/Port.hpp" @@ -30,6 +29,8 @@ #include "PortModel.hpp" #include "PluginModel.hpp" +namespace Raul { class Path; } + namespace Ingen { namespace Client { diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp index 5f4eb11c..f1850d94 100644 --- a/src/client/ObjectModel.hpp +++ b/src/client/ObjectModel.hpp @@ -28,11 +28,9 @@ #include "raul/Atom.hpp" #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "raul/PathTable.hpp" #include "interface/GraphObject.hpp" #include "shared/ResourceImpl.hpp" -using Raul::PathTable; using std::string; using Raul::Atom; using Raul::Path; diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 7198235a..e5ec1d5c 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -16,7 +16,9 @@ */ #include <sstream> +#include "config.h" #include "raul/Path.hpp" +#include "raul/Atom.hpp" #include "PluginModel.hpp" #include "PatchModel.hpp" #include "PluginUI.hpp" @@ -160,5 +162,16 @@ PluginModel::get_lv2_icon_path(SLV2Plugin plugin) } #endif + +const string +PluginModel::string_property(const std::string& name) const +{ + const Raul::Atom& atom = get_property(name); + if (atom.type() == Raul::Atom::STRING) + return atom.get_string(); + else + return ""; +} + } // namespace Client } // namespace Ingen diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index c59da63b..c93f5fda 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -21,7 +21,6 @@ #include "config.h" #include <string> #include <iostream> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "redlandmm/World.hpp" #ifdef HAVE_SLV2 @@ -92,15 +91,9 @@ public: static Redland::World* rdf_world() { return _rdf_world; } private: - const Type _type; + const Type _type; - const string string_property(const std::string& name) const { - const Raul::Atom& atom = get_property(name); - if (atom.type() == Raul::Atom::STRING) - return atom.get_string(); - else - return ""; - } + const string string_property(const std::string& name) const; #ifdef HAVE_SLV2 static SLV2World _slv2_world; diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index a0486ed5..3c4d779c 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -23,10 +23,11 @@ #include <string> #include <sigc++/sigc++.h> #include "raul/SharedPtr.hpp" -#include "raul/Path.hpp" #include "interface/Port.hpp" #include "ObjectModel.hpp" +namespace Raul { class Path; } + namespace Ingen { namespace Client { diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index dc3e342e..b855dc33 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -22,9 +22,9 @@ #include <string> #include <sigc++/sigc++.h> #include <glibmm/thread.h> +#include "raul/Atom.hpp" #include "interface/ClientInterface.hpp" #include "SigClientInterface.hpp" -#include "raul/Atom.hpp" #include "raul/SRSWQueue.hpp" using std::string; diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp index d904ea9d..ee5f4791 100644 --- a/src/common/interface/ClientInterface.hpp +++ b/src/common/interface/ClientInterface.hpp @@ -21,7 +21,6 @@ #include <stdio.h> #include <string> #include <inttypes.h> -#include "raul/Atom.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp index a68cf175..bf4486b1 100644 --- a/src/common/interface/CommonInterface.hpp +++ b/src/common/interface/CommonInterface.hpp @@ -20,11 +20,11 @@ #include <inttypes.h> #include <string> -#include "raul/SharedPtr.hpp" -#include "raul/Atom.hpp" #include "interface/CommonInterface.hpp" #include "interface/GraphObject.hpp" +namespace Raul { class Atom; } + namespace Ingen { namespace Shared { diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp index 55153d63..dc5be1dc 100644 --- a/src/common/interface/EngineInterface.hpp +++ b/src/common/interface/EngineInterface.hpp @@ -20,7 +20,6 @@ #include <inttypes.h> #include <string> -#include "raul/SharedPtr.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp index cf623c3c..eac5bf86 100644 --- a/src/common/interface/GraphObject.hpp +++ b/src/common/interface/GraphObject.hpp @@ -23,12 +23,11 @@ #include "raul/Deletable.hpp" #include "raul/PathTable.hpp" #include "raul/Symbol.hpp" -#include "raul/Atom.hpp" #include "raul/SharedPtr.hpp" #include "raul/WeakPtr.hpp" #include "interface/Resource.hpp" -using Raul::PathTable; +namespace Raul { class Atom; } namespace Ingen { namespace Shared { @@ -46,7 +45,7 @@ class GraphObject : public Raul::Deletable public: typedef std::map<std::string, Raul::Atom> Variables; - typedef PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator; + typedef Raul::PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator; virtual void set_path(const Raul::Path& path) = 0; diff --git a/src/common/interface/Port.hpp b/src/common/interface/Port.hpp index 6977d249..f4d7ea67 100644 --- a/src/common/interface/Port.hpp +++ b/src/common/interface/Port.hpp @@ -15,13 +15,14 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PORT_H -#define PORT_H +#ifndef INGEN_INTERFACE_PORT_HPP +#define INGEN_INTERFACE_PORT_HPP -#include "raul/Atom.hpp" #include "GraphObject.hpp" #include "DataType.hpp" +namespace Raul { class Atom; } + namespace Ingen { namespace Shared { @@ -45,4 +46,4 @@ public: } // namespace Shared } // namespace Ingen -#endif // PORT_H +#endif // INGEN_INTERFACE_PORT_HPP diff --git a/src/common/interface/Resource.hpp b/src/common/interface/Resource.hpp index 32c760d7..109e1021 100644 --- a/src/common/interface/Resource.hpp +++ b/src/common/interface/Resource.hpp @@ -20,7 +20,8 @@ #include <string> #include <map> -#include "raul/Atom.hpp" + +namespace Raul { class Atom; } namespace Ingen { namespace Shared { diff --git a/src/engine/AudioBuffer.cpp b/src/engine/AudioBuffer.cpp index c79d6f61..6456bb73 100644 --- a/src/engine/AudioBuffer.cpp +++ b/src/engine/AudioBuffer.cpp @@ -18,8 +18,8 @@ #include <iostream> #include <cassert> #include <stdlib.h> +#include "config.h" #include "AudioBuffer.hpp" -//#include "config.h" using namespace std; @@ -48,7 +48,7 @@ AudioBuffer::AudioBuffer(size_t size) void AudioBuffer::alloc_local_data(size_t size) { -#ifdef POSIX_MEMALIGN +#ifdef HAVE_POSIX_MEMALIGN const int ret = posix_memalign((void**)&_local_data, 16, size * sizeof(Sample)); #else _local_data = (Sample*)malloc(size * sizeof(Sample)); diff --git a/src/engine/AudioDriver.hpp b/src/engine/AudioDriver.hpp index ccbc8da4..a478f945 100644 --- a/src/engine/AudioDriver.hpp +++ b/src/engine/AudioDriver.hpp @@ -18,12 +18,13 @@ #ifndef AUDIODRIVER_H #define AUDIODRIVER_H -#include "raul/List.hpp" #include "raul/Path.hpp" #include "Driver.hpp" #include "types.hpp" #include "interface/DataType.hpp" +namespace Raul { class Path; } + namespace Ingen { class PatchImpl; diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp index a810aef2..a13550a7 100644 --- a/src/engine/ClientBroadcaster.cpp +++ b/src/engine/ClientBroadcaster.cpp @@ -20,16 +20,11 @@ #include <unistd.h> #include "interface/ClientInterface.hpp" #include "ClientBroadcaster.hpp" -#include "EngineStore.hpp" -#include "NodeFactory.hpp" -#include "util.hpp" -#include "PatchImpl.hpp" -#include "NodeImpl.hpp" #include "PluginImpl.hpp" -#include "PortImpl.hpp" #include "ConnectionImpl.hpp" -#include "AudioDriver.hpp" +#include "EngineStore.hpp" #include "ObjectSender.hpp" +#include "util.hpp" using namespace std; using Ingen::Shared::ClientInterface; diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index daf50a80..a4ef004c 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -24,7 +24,6 @@ #include <pthread.h> #include "raul/SharedPtr.hpp" #include "interface/ClientInterface.hpp" -#include "types.hpp" #include "NodeFactory.hpp" using std::string; diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp index 46e7fcc6..60944d6c 100644 --- a/src/engine/ConnectionImpl.cpp +++ b/src/engine/ConnectionImpl.cpp @@ -19,7 +19,6 @@ #include "raul/Maid.hpp" #include "util.hpp" #include "ConnectionImpl.hpp" -#include "NodeImpl.hpp" #include "PortImpl.hpp" #include "AudioBuffer.hpp" #include "ProcessContext.hpp" diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp index 22bf9069..e3bad1e1 100644 --- a/src/engine/ConnectionImpl.hpp +++ b/src/engine/ConnectionImpl.hpp @@ -24,7 +24,6 @@ #include "interface/DataType.hpp" #include "interface/Connection.hpp" #include "PortImpl.hpp" -#include "types.hpp" namespace Ingen { diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp index 73be4a3b..a11fffba 100644 --- a/src/engine/Driver.hpp +++ b/src/engine/Driver.hpp @@ -20,10 +20,11 @@ #include <string> #include <boost/utility.hpp> -#include "raul/Path.hpp" #include "interface/DataType.hpp" #include "DuplexPort.hpp" +namespace Raul { class Path; } + namespace Ingen { class DuplexPort; diff --git a/src/engine/DuplexPort.cpp b/src/engine/DuplexPort.cpp index 84d53be6..ec521e82 100644 --- a/src/engine/DuplexPort.cpp +++ b/src/engine/DuplexPort.cpp @@ -31,7 +31,15 @@ using namespace std; namespace Ingen { -DuplexPort::DuplexPort(NodeImpl* parent, const string& name, uint32_t index, uint32_t poly, DataType type, const Atom& value, size_t buffer_size, bool is_output) +DuplexPort::DuplexPort( + NodeImpl* parent, + const string& name, + uint32_t index, + uint32_t poly, + DataType type, + const Raul::Atom& value, + size_t buffer_size, + bool is_output) : PortImpl(parent, name, index, poly, type, value, buffer_size) , InputPort(parent, name, index, poly, type, value, buffer_size) , OutputPort(parent, name, index, poly, type, value, buffer_size) diff --git a/src/engine/DuplexPort.hpp b/src/engine/DuplexPort.hpp index c929e74a..31a64ded 100644 --- a/src/engine/DuplexPort.hpp +++ b/src/engine/DuplexPort.hpp @@ -19,8 +19,6 @@ #define DUPLEXPORT_H #include <string> -#include "raul/Array.hpp" -#include "types.hpp" #include "Buffer.hpp" #include "InputPort.hpp" #include "OutputPort.hpp" @@ -46,7 +44,7 @@ public: uint32_t index, uint32_t poly, DataType type, - const Atom& value, + const Raul::Atom& value, size_t buffer_size, bool is_output); diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index b5cbfdb4..49f6e10c 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -23,7 +23,6 @@ #include "raul/Maid.hpp" #include "raul/SharedPtr.hpp" #include "Engine.hpp" -#include "config.h" #include "tuning.hpp" #include "Event.hpp" #include "common/interface/EventType.hpp" @@ -151,11 +150,6 @@ Engine::main() bool Engine::main_iteration() { -/*#ifdef HAVE_LASH - // Process any pending LASH events - if (lash_driver->enabled()) - lash_driver->process_events(); -#endif*/ // Run the maid (garbage collector) _post_processor->process(); _maid->cleanup(); diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index 261f135f..68755d85 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -18,7 +18,6 @@ #ifndef ENGINE_H #define ENGINE_H -#include "config.h" #include <cassert> #include <vector> #include <set> diff --git a/src/engine/EngineStore.hpp b/src/engine/EngineStore.hpp index 57213be3..7786f596 100644 --- a/src/engine/EngineStore.hpp +++ b/src/engine/EngineStore.hpp @@ -19,7 +19,6 @@ #define OBJECTSTORE_H #include <string> -#include "raul/PathTable.hpp" #include "raul/SharedPtr.hpp" #include "shared/Store.hpp" diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp index 98a98a20..26ad38de 100644 --- a/src/engine/EventBuffer.cpp +++ b/src/engine/EventBuffer.cpp @@ -18,10 +18,10 @@ #define __STDC_LIMIT_MACROS 1 #include <stdint.h> #include <iostream> +#include "config.h" #include "EventBuffer.hpp" #include "lv2ext/lv2_event.h" #include "lv2ext/lv2_event_helpers.h" -//#include "config.h" using namespace std; diff --git a/src/engine/EventSink.hpp b/src/engine/EventSink.hpp index be739de9..95795969 100644 --- a/src/engine/EventSink.hpp +++ b/src/engine/EventSink.hpp @@ -21,7 +21,6 @@ #include <list> #include <utility> #include "raul/RingBuffer.hpp" -#include "types.hpp" namespace Ingen { diff --git a/src/engine/EventSource.hpp b/src/engine/EventSource.hpp index 0e589bdc..f3377393 100644 --- a/src/engine/EventSource.hpp +++ b/src/engine/EventSource.hpp @@ -18,8 +18,6 @@ #ifndef EVENTSOURCE_H #define EVENTSOURCE_H -#include "types.hpp" - namespace Ingen { class Event; diff --git a/src/engine/GraphObjectImpl.cpp b/src/engine/GraphObjectImpl.cpp index 0e1abc57..b08a9ffc 100644 --- a/src/engine/GraphObjectImpl.cpp +++ b/src/engine/GraphObjectImpl.cpp @@ -15,12 +15,28 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "raul/Atom.hpp" #include "GraphObjectImpl.hpp" #include "PatchImpl.hpp" #include "EngineStore.hpp" namespace Ingen { +void +GraphObjectImpl::set_variable(const std::string& key, const Atom& value) +{ + _variables[key] = value; +} + + +const Atom& +GraphObjectImpl::get_variable(const std::string& key) +{ + static const Atom null_atom; + Variables::iterator i = _variables.find(key); + return (i != _variables.end()) ? (*i).second : null_atom; +} + PatchImpl* GraphObjectImpl::parent_patch() const diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp index ab5eb24b..8cd0d707 100644 --- a/src/engine/GraphObjectImpl.hpp +++ b/src/engine/GraphObjectImpl.hpp @@ -24,12 +24,9 @@ #include <cassert> #include "raul/Deletable.hpp" #include "raul/Path.hpp" -#include "raul/Atom.hpp" #include "interface/GraphObject.hpp" #include "shared/ResourceImpl.hpp" -#include "types.hpp" -using Raul::Atom; using Raul::Path; using Raul::Symbol; @@ -74,14 +71,8 @@ public: assert(_name.find("/") == std::string::npos); } - void set_variable(const std::string& key, const Atom& value) - { _variables[key] = value; } - - const Atom& get_variable(const std::string& key) { - static Atom null_atom; - Variables::iterator i = _variables.find(key); - return (i != _variables.end()) ? (*i).second : null_atom; - } + const Raul::Atom& get_variable(const std::string& key); + void set_variable(const std::string& key, const Raul::Atom& value); const Variables& variables() const { return _variables; } Variables& variables() { return _variables; } @@ -117,7 +108,7 @@ protected: std::string _name; bool _polyphonic; -private: +private: Variables _variables; }; diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index e168d8cd..5eab2d2a 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -23,7 +23,6 @@ #include <iostream> #include <lo/lo.h> #include <pthread.h> -#include "types.hpp" #include "raul/Thread.hpp" #include "interface/ClientInterface.hpp" #include "shared/HTTPSender.hpp" diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index cf5299ed..11803d35 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -20,19 +20,20 @@ #include <cstdio> #include <string> #include <boost/format.hpp> +#include "raul/Atom.hpp" #include "raul/SharedPtr.hpp" -#include "types.hpp" #include "interface/ClientInterface.hpp" #include "module/Module.hpp" +#include "serialisation/Parser.hpp" #include "serialisation/serialisation.hpp" #include "serialisation/Serialiser.hpp" -#include "serialisation/Parser.hpp" -#include "engine/ThreadManager.hpp" -#include "HTTPEngineReceiver.hpp" -#include "QueuedEventSource.hpp" #include "ClientBroadcaster.hpp" +#include "Engine.hpp" #include "EngineStore.hpp" #include "HTTPClientSender.hpp" +#include "HTTPEngineReceiver.hpp" +#include "QueuedEventSource.hpp" +#include "ThreadManager.hpp" using namespace std; using namespace Ingen::Shared; diff --git a/src/engine/HTTPEngineReceiver.hpp b/src/engine/HTTPEngineReceiver.hpp index a6ed8825..d47e9747 100644 --- a/src/engine/HTTPEngineReceiver.hpp +++ b/src/engine/HTTPEngineReceiver.hpp @@ -18,11 +18,9 @@ #ifndef HTTPENGINERECEIVER_H #define HTTPENGINERECEIVER_H -#include "config.h" #include <string> #include <stdint.h> #include <libsoup/soup.h> -#include "raul/SharedPtr.hpp" #include "QueuedEngineInterface.hpp" namespace Ingen { diff --git a/src/engine/InputPort.cpp b/src/engine/InputPort.cpp index 531ca468..9282ca22 100644 --- a/src/engine/InputPort.cpp +++ b/src/engine/InputPort.cpp @@ -32,13 +32,13 @@ using namespace std; namespace Ingen { -InputPort::InputPort(NodeImpl* parent, - const string& name, - uint32_t index, - uint32_t poly, - DataType type, - const Atom& value, - size_t buffer_size) +InputPort::InputPort(NodeImpl* parent, + const string& name, + uint32_t index, + uint32_t poly, + DataType type, + const Raul::Atom& value, + size_t buffer_size) : PortImpl(parent, name, index, poly, type, value, buffer_size) { } diff --git a/src/engine/InputPort.hpp b/src/engine/InputPort.hpp index fa190920..4471bb8c 100644 --- a/src/engine/InputPort.hpp +++ b/src/engine/InputPort.hpp @@ -47,13 +47,13 @@ class NodeImpl; class InputPort : virtual public PortImpl { public: - InputPort(NodeImpl* parent, - const string& name, - uint32_t index, - uint32_t poly, - DataType type, - const Atom& value, - size_t buffer_size); + InputPort(NodeImpl* parent, + const string& name, + uint32_t index, + uint32_t poly, + DataType type, + const Raul::Atom& value, + size_t buffer_size); virtual ~InputPort() {} diff --git a/src/engine/InternalController.cpp b/src/engine/InternalController.cpp index 8e378f50..b8b75671 100644 --- a/src/engine/InternalController.cpp +++ b/src/engine/InternalController.cpp @@ -27,7 +27,6 @@ #include "AudioBuffer.hpp" #include "ProcessContext.hpp" #include "EventBuffer.hpp" -#include "Engine.hpp" #include "util.hpp" namespace Ingen { @@ -44,7 +43,7 @@ ControllerNode::ControllerNode(const string& path, { _ports = new Raul::Array<PortImpl*>(6); - _midi_in_port = new InputPort(this, "input", 0, 1, DataType::EVENT, Atom(), _buffer_size); + _midi_in_port = new InputPort(this, "input", 0, 1, DataType::EVENT, Raul::Atom(), _buffer_size); _ports->at(0) = _midi_in_port; _param_port = new InputPort(this, "controller", 1, 1, DataType::CONTROL, 0.0f, 1); @@ -95,7 +94,7 @@ ControllerNode::process(ProcessContext& context) void -ControllerNode::control(ProcessContext& context, uchar control_num, uchar val, FrameTime time) +ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t val, FrameTime time) { assert(time - context.start() < _buffer_size); diff --git a/src/engine/InternalController.hpp b/src/engine/InternalController.hpp index a861decc..d33515b4 100644 --- a/src/engine/InternalController.hpp +++ b/src/engine/InternalController.hpp @@ -41,7 +41,7 @@ public: void process(ProcessContext& context); - void control(ProcessContext& context, uchar control_num, uchar val, FrameTime time); + void control(ProcessContext& context, uint8_t control_num, uint8_t val, FrameTime time); void learn() { _learning = true; } diff --git a/src/engine/InternalNote.cpp b/src/engine/InternalNote.cpp index 7bb9c4aa..838d0ba7 100644 --- a/src/engine/InternalNote.cpp +++ b/src/engine/InternalNote.cpp @@ -45,7 +45,7 @@ NoteNode::NoteNode(const string& path, bool polyphonic, PatchImpl* parent, Sampl { _ports = new Raul::Array<PortImpl*>(5); - _midi_in_port = new InputPort(this, "input", 0, 1, DataType::EVENT, Atom(), _buffer_size); + _midi_in_port = new InputPort(this, "input", 0, 1, DataType::EVENT, Raul::Atom(), _buffer_size); _ports->at(0) = _midi_in_port; _freq_port = new OutputPort(this, "frequency", 1, _polyphony, DataType::AUDIO, 440.0f, _buffer_size); @@ -185,7 +185,7 @@ NoteNode::process(ProcessContext& context) void -NoteNode::note_on(ProcessContext& context, uchar note_num, uchar velocity, FrameTime time) +NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time) { assert(time >= context.start() && time <= context.end()); assert(time - context.start() < _buffer_size); @@ -265,7 +265,7 @@ NoteNode::note_on(ProcessContext& context, uchar note_num, uchar velocity, Frame void -NoteNode::note_off(ProcessContext& context, uchar note_num, FrameTime time) +NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) { assert(time >= context.start() && time <= context.end()); assert(time - context.start() < _buffer_size); @@ -305,10 +305,10 @@ NoteNode::free_voice(ProcessContext& context, uint32_t voice, FrameTime time) assert(time - context.start() < _buffer_size); // Find a key to reassign to the freed voice (the newest, if there is one) - Key* replace_key = NULL; - uchar replace_key_num = 0; + Key* replace_key = NULL; + uint8_t replace_key_num = 0; - for (uchar i = 0; i <= 127; ++i) { + for (uint8_t i = 0; i <= 127; ++i) { if (_keys[i].state == Key::ON_UNASSIGNED) { if (replace_key == NULL || _keys[i].time > replace_key->time) { replace_key = &_keys[i]; diff --git a/src/engine/InternalNote.hpp b/src/engine/InternalNote.hpp index a6aa2807..9e441a65 100644 --- a/src/engine/InternalNote.hpp +++ b/src/engine/InternalNote.hpp @@ -45,8 +45,8 @@ public: void process(ProcessContext& context); - void note_on(ProcessContext& context, uchar note_num, uchar velocity, FrameTime time); - void note_off(ProcessContext& context, uchar note_num, FrameTime time); + void note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time); + void note_off(ProcessContext& context, uint8_t note_num, FrameTime time); void all_notes_off(ProcessContext& context, FrameTime time); void sustain_on(ProcessContext& context, FrameTime time); @@ -64,7 +64,7 @@ private: struct Voice { enum State { FREE, ACTIVE, HOLDING }; Voice() : state(FREE), note(0) {} - State state; uchar note; SampleCount time; + State state; uint8_t note; SampleCount time; }; float note_to_freq(int num); diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp index e93f7b9b..059f3699 100644 --- a/src/engine/InternalPlugin.hpp +++ b/src/engine/InternalPlugin.hpp @@ -31,7 +31,6 @@ #include <string> #include <iostream> #include "slv2/slv2.h" -#include "types.hpp" #include "PluginImpl.hpp" #define NS_INGEN "http://drobilla.net/ns/ingen#" diff --git a/src/engine/InternalTrigger.cpp b/src/engine/InternalTrigger.cpp index a4cc3609..9ff74b40 100644 --- a/src/engine/InternalTrigger.cpp +++ b/src/engine/InternalTrigger.cpp @@ -38,7 +38,7 @@ TriggerNode::TriggerNode(const string& path, bool polyphonic, PatchImpl* parent, { _ports = new Raul::Array<PortImpl*>(5); - _midi_in_port = new InputPort(this, "input", 0, 1, DataType::EVENT, Atom(), _buffer_size); + _midi_in_port = new InputPort(this, "input", 0, 1, DataType::EVENT, Raul::Atom(), _buffer_size); _ports->at(0) = _midi_in_port; _note_port = new InputPort(this, "note", 1, 1, DataType::CONTROL, 60.0f, 1); @@ -107,7 +107,7 @@ TriggerNode::process(ProcessContext& context) void -TriggerNode::note_on(ProcessContext& context, uchar note_num, uchar velocity, FrameTime time) +TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time) { assert(time >= context.start() && time <= context.end()); assert(time - context.start() < _buffer_size); @@ -123,7 +123,7 @@ TriggerNode::note_on(ProcessContext& context, uchar note_num, uchar velocity, Fr /*cerr << "[TriggerNode] " << path() << " Note " << (int)note_num << " on @ " << time << endl;*/ Sample filter_note = ((AudioBuffer*)_note_port->buffer(0))->value_at(0); - if (filter_note >= 0.0 && filter_note < 127.0 && (note_num == (uchar)filter_note)) { + if (filter_note >= 0.0 && filter_note < 127.0 && (note_num == (uint8_t)filter_note)) { ((AudioBuffer*)_gate_port->buffer(0))->set_value(1.0f, context.start(), time); ((AudioBuffer*)_trig_port->buffer(0))->set_value(1.0f, context.start(), time); ((AudioBuffer*)_trig_port->buffer(0))->set_value(0.0f, context.start(), time + 1); @@ -134,7 +134,7 @@ TriggerNode::note_on(ProcessContext& context, uchar note_num, uchar velocity, Fr void -TriggerNode::note_off(ProcessContext& context, uchar note_num, FrameTime time) +TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) { assert(time >= context.start() && time <= context.end()); assert(time - context.start() < _buffer_size); diff --git a/src/engine/InternalTrigger.hpp b/src/engine/InternalTrigger.hpp index 8040a157..8f287d0f 100644 --- a/src/engine/InternalTrigger.hpp +++ b/src/engine/InternalTrigger.hpp @@ -44,8 +44,8 @@ public: void process(ProcessContext& context); - void note_on(ProcessContext& context, uchar note_num, uchar velocity, FrameTime time); - void note_off(ProcessContext& context, uchar note_num, FrameTime time); + void note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time); + void note_off(ProcessContext& context, uint8_t note_num, FrameTime time); void learn() { _learning = true; } diff --git a/src/engine/JackAudioDriver.cpp b/src/engine/JackAudioDriver.cpp index 864c843b..f7507541 100644 --- a/src/engine/JackAudioDriver.cpp +++ b/src/engine/JackAudioDriver.cpp @@ -28,7 +28,6 @@ #include "QueuedEvent.hpp" #include "EventSource.hpp" #include "PostProcessor.hpp" -#include "NodeImpl.hpp" #include "PatchImpl.hpp" #include "PortImpl.hpp" #include "MidiDriver.hpp" diff --git a/src/engine/JackAudioDriver.hpp b/src/engine/JackAudioDriver.hpp index 275aca79..57c7f74e 100644 --- a/src/engine/JackAudioDriver.hpp +++ b/src/engine/JackAudioDriver.hpp @@ -21,12 +21,13 @@ #include <jack/jack.h> #include <jack/transport.h> #include "raul/Thread.hpp" -#include "raul/Path.hpp" #include "raul/List.hpp" #include "AudioDriver.hpp" #include "Buffer.hpp" #include "ProcessContext.hpp" +namespace Raul { class Path; } + namespace Ingen { class Engine; diff --git a/src/engine/JackMidiDriver.cpp b/src/engine/JackMidiDriver.cpp index 0101212c..d95f30ff 100644 --- a/src/engine/JackMidiDriver.cpp +++ b/src/engine/JackMidiDriver.cpp @@ -23,7 +23,6 @@ #include "module/World.hpp" #include "lv2ext/lv2_event_helpers.h" #include "shared/LV2URIMap.hpp" -#include "types.hpp" #include "JackMidiDriver.hpp" #include "JackAudioDriver.hpp" #include "ThreadManager.hpp" diff --git a/src/engine/JackMidiDriver.hpp b/src/engine/JackMidiDriver.hpp index 2c78c439..02bcd5c1 100644 --- a/src/engine/JackMidiDriver.hpp +++ b/src/engine/JackMidiDriver.hpp @@ -21,7 +21,6 @@ #include <jack/jack.h> #include <jack/midiport.h> #include "raul/List.hpp" -#include "config.h" #include "MidiDriver.hpp" namespace Ingen { diff --git a/src/engine/LADSPAPlugin.cpp b/src/engine/LADSPAPlugin.cpp index 38db3164..2f1a7c1f 100644 --- a/src/engine/LADSPAPlugin.cpp +++ b/src/engine/LADSPAPlugin.cpp @@ -20,7 +20,6 @@ #include <iostream> #include "LADSPAPlugin.hpp" #include "LADSPANode.hpp" -#include "NodeImpl.hpp" #include "Engine.hpp" #include "AudioDriver.hpp" diff --git a/src/engine/LADSPAPlugin.hpp b/src/engine/LADSPAPlugin.hpp index e9d11edf..1bc25b7a 100644 --- a/src/engine/LADSPAPlugin.hpp +++ b/src/engine/LADSPAPlugin.hpp @@ -18,8 +18,6 @@ #ifndef LADSPAPLUGIN_H #define LADSPAPLUGIN_H -#include "config.h" - #include <cstdlib> #include <glibmm/module.h> #include <boost/utility.hpp> @@ -27,7 +25,6 @@ #include <string> #include <iostream> #include "raul/Path.hpp" -#include "types.hpp" #include "PluginImpl.hpp" namespace Ingen { diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp index b1e0c9c4..80758553 100644 --- a/src/engine/LV2Node.cpp +++ b/src/engine/LV2Node.cpp @@ -221,7 +221,7 @@ LV2Node::instantiate() // FIXME: need nice type preserving SLV2Value -> Raul::Atom conversion const float def = isnan(def_values[j]) ? 0.0f : def_values[j]; - const Atom defatm = def; + const Raul::Atom defatm = def; if (direction == INPUT) port = new InputPort(this, port_name, j, _polyphony, data_type, defatm, port_buffer_size); diff --git a/src/engine/LV2Plugin.hpp b/src/engine/LV2Plugin.hpp index 46a7607a..694c3167 100644 --- a/src/engine/LV2Plugin.hpp +++ b/src/engine/LV2Plugin.hpp @@ -32,7 +32,6 @@ #include <iostream> #include "slv2/slv2.h" #include "raul/SharedPtr.hpp" -#include "types.hpp" #include "PluginImpl.hpp" #include "LV2Info.hpp" diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp index 30f04b05..010d7067 100644 --- a/src/engine/MessageContext.cpp +++ b/src/engine/MessageContext.cpp @@ -15,6 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "raul/Atom.hpp" #include "MessageContext.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/MidiDriver.hpp b/src/engine/MidiDriver.hpp index e268124b..8bc07ff4 100644 --- a/src/engine/MidiDriver.hpp +++ b/src/engine/MidiDriver.hpp @@ -19,7 +19,6 @@ #define MIDIDRIVER_H #include <iostream> -#include "types.hpp" #include "Driver.hpp" #include "EventBuffer.hpp" #include "ProcessContext.hpp" diff --git a/src/engine/NodeBase.hpp b/src/engine/NodeBase.hpp index 790e6b72..a20ebbb4 100644 --- a/src/engine/NodeBase.hpp +++ b/src/engine/NodeBase.hpp @@ -23,6 +23,8 @@ #include <cstdlib> #include "raul/Semaphore.hpp" #include "raul/AtomicInt.hpp" +#include "raul/Array.hpp" +#include "raul/Atom.hpp" #include "interface/Port.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp index 8031e27b..d7a8b887 100644 --- a/src/engine/NodeFactory.cpp +++ b/src/engine/NodeFactory.cpp @@ -22,6 +22,7 @@ #include <float.h> #include <cmath> #include "redlandmm/World.hpp" +#include "raul/Atom.hpp" #include "module/World.hpp" #include "NodeFactory.hpp" #include "ThreadManager.hpp" diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp index f25f31fa..430c230b 100644 --- a/src/engine/NodeFactory.hpp +++ b/src/engine/NodeFactory.hpp @@ -30,7 +30,6 @@ #include "slv2/slv2.h" #include "LV2Info.hpp" #endif -#include "types.hpp" using std::string; diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp index bedc855d..5695f0fc 100644 --- a/src/engine/NodeImpl.hpp +++ b/src/engine/NodeImpl.hpp @@ -19,9 +19,7 @@ #define NODEIMPL_H #include <string> -#include "raul/Array.hpp" #include "interface/Node.hpp" -#include "types.hpp" #include "GraphObjectImpl.hpp" namespace Raul { template <typename T> class List; class Maid; } diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index b5900f11..93e339f6 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -15,21 +15,18 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "OSCClientSender.hpp" #include <cassert> #include <iostream> #include <unistd.h> #include "raul/AtomLiblo.hpp" +#include "interface/ClientInterface.hpp" #include "EngineStore.hpp" -#include "NodeFactory.hpp" -#include "util.hpp" -#include "PatchImpl.hpp" #include "NodeImpl.hpp" +#include "OSCClientSender.hpp" +#include "PatchImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" -#include "ConnectionImpl.hpp" -#include "AudioDriver.hpp" -#include "interface/ClientInterface.hpp" +#include "util.hpp" using namespace std; diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp index eda067a8..1d1c47c5 100644 --- a/src/engine/OSCClientSender.hpp +++ b/src/engine/OSCClientSender.hpp @@ -23,7 +23,6 @@ #include <iostream> #include <lo/lo.h> #include <pthread.h> -#include "types.hpp" #include "interface/ClientInterface.hpp" #include "interface/GraphObject.hpp" #include "shared/OSCSender.hpp" diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index b2131928..e7a5daae 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -21,15 +21,16 @@ #include <cstdlib> #include <string> #include <lo/lo.h> +#include "config.h" #include "raul/SharedPtr.hpp" #include "raul/AtomLiblo.hpp" -#include "types.hpp" #include "interface/ClientInterface.hpp" -#include "engine/ThreadManager.hpp" +#include "ClientBroadcaster.hpp" +#include "Engine.hpp" +#include "OSCClientSender.hpp" #include "OSCEngineReceiver.hpp" #include "QueuedEventSource.hpp" -#include "OSCClientSender.hpp" -#include "ClientBroadcaster.hpp" +#include "ThreadManager.hpp" using namespace std; @@ -638,10 +639,9 @@ int OSCEngineReceiver::_note_on_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { /* - const char* node_path = &argv[1]->s; - const uchar note_num = argv[2]->i; - const uchar velocity = argv[3]->i; + const uint8_t note_num = argv[2]->i; + const uint8_t velocity = argv[3]->i; */ cerr << "FIXME: OSC note on\n"; //note_on(node_path, note_num, velocity); @@ -659,9 +659,8 @@ int OSCEngineReceiver::_note_off_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { /* - const char* patch_path = &argv[1]->s; - const uchar note_num = argv[2]->i; + const uint8_t note_num = argv[2]->i; */ cerr << "FIXME: OSC note off\n"; //note_off(patch_path, note_num); diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index 0afea8dc..75094f55 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -18,11 +18,9 @@ #ifndef OSCENGINERECEIVER_H #define OSCENGINERECEIVER_H -#include "config.h" #include <string> #include <stdint.h> #include <lo/lo.h> -#include "raul/SharedPtr.hpp" #include "QueuedEngineInterface.hpp" #include "Responder.hpp" using std::string; diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp index aff9514e..81759fae 100644 --- a/src/engine/ObjectSender.cpp +++ b/src/engine/ObjectSender.cpp @@ -21,7 +21,6 @@ #include "PatchImpl.hpp" #include "NodeImpl.hpp" #include "PortImpl.hpp" -#include "PortImpl.hpp" #include "ConnectionImpl.hpp" #include "NodeFactory.hpp" #include "interface/DataType.hpp" diff --git a/src/engine/OutputPort.cpp b/src/engine/OutputPort.cpp index 116d9a3e..e86d5a98 100644 --- a/src/engine/OutputPort.cpp +++ b/src/engine/OutputPort.cpp @@ -25,13 +25,13 @@ using namespace std; namespace Ingen { -OutputPort::OutputPort(NodeImpl* parent, - const string& name, - uint32_t index, - uint32_t poly, - DataType type, - const Atom& value, - size_t buffer_size) +OutputPort::OutputPort(NodeImpl* parent, + const string& name, + uint32_t index, + uint32_t poly, + DataType type, + const Raul::Atom& value, + size_t buffer_size) : PortImpl(parent, name, index, poly, type, value, buffer_size) { if (type == DataType::CONTROL) diff --git a/src/engine/OutputPort.hpp b/src/engine/OutputPort.hpp index 8d441b5c..cd5e201a 100644 --- a/src/engine/OutputPort.hpp +++ b/src/engine/OutputPort.hpp @@ -21,7 +21,6 @@ #include <string> #include <cstdlib> #include "PortImpl.hpp" -#include "types.hpp" namespace Ingen { @@ -45,7 +44,7 @@ public: uint32_t index, uint32_t poly, DataType type, - const Atom& value, + const Raul::Atom& value, size_t buffer_size); void pre_process(ProcessContext& context); diff --git a/src/engine/PatchImpl.cpp b/src/engine/PatchImpl.cpp index b7de5103..443ec4a4 100644 --- a/src/engine/PatchImpl.cpp +++ b/src/engine/PatchImpl.cpp @@ -348,7 +348,7 @@ PatchImpl::create_port(const string& name, DataType type, size_t buffer_size, bo assert( !(type == DataType::UNKNOWN) ); - return new DuplexPort(this, name, num_ports(), _polyphony, type, Atom(), buffer_size, is_output); + return new DuplexPort(this, name, num_ports(), _polyphony, type, Raul::Atom(), buffer_size, is_output); } diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp index 78135069..bbd13b76 100644 --- a/src/engine/PatchImpl.hpp +++ b/src/engine/PatchImpl.hpp @@ -21,7 +21,6 @@ #include <cstdlib> #include <string> #include "raul/List.hpp" -#include "raul/SharedPtr.hpp" #include "interface/DataType.hpp" #include "interface/Patch.hpp" #include "NodeBase.hpp" diff --git a/src/engine/PluginImpl.hpp b/src/engine/PluginImpl.hpp index 2b78b29a..17a3d116 100644 --- a/src/engine/PluginImpl.hpp +++ b/src/engine/PluginImpl.hpp @@ -18,15 +18,12 @@ #ifndef PLUGINIMPL_H #define PLUGINIMPL_H -#include "config.h" - #include <cstdlib> #include <glibmm/module.h> #include <boost/utility.hpp> #include <dlfcn.h> #include <string> #include <iostream> -#include "types.hpp" #include "interface/Plugin.hpp" #include "shared/ResourceImpl.hpp" diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp index 4669dba4..1e137b75 100644 --- a/src/engine/PortImpl.cpp +++ b/src/engine/PortImpl.cpp @@ -32,13 +32,13 @@ using namespace std; namespace Ingen { -PortImpl::PortImpl(NodeImpl* const node, - const string& name, - uint32_t index, - uint32_t poly, - DataType type, - const Atom& value, - size_t buffer_size) +PortImpl::PortImpl(NodeImpl* const node, + const string& name, + uint32_t index, + uint32_t poly, + DataType type, + const Raul::Atom& value, + size_t buffer_size) : GraphObjectImpl(node, name, (type == DataType::AUDIO || type == DataType::CONTROL)) , _index(index) , _poly(poly) @@ -48,7 +48,7 @@ PortImpl::PortImpl(NodeImpl* const node, , _fixed_buffers(false) , _broadcast(false) , _set_by_user(false) - , _last_broadcasted_value(_value.type() == Atom::FLOAT ? _value.get_float() : 0.0f) // default? + , _last_broadcasted_value(_value.type() == Raul::Atom::FLOAT ? _value.get_float() : 0.0f) // default? , _context(Context::AUDIO) , _buffers(new Raul::Array<Buffer*>(poly)) , _prepared_buffers(NULL) diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp index 66108b56..afac4974 100644 --- a/src/engine/PortImpl.hpp +++ b/src/engine/PortImpl.hpp @@ -21,6 +21,7 @@ #include <cstdlib> #include <string> #include "raul/Array.hpp" +#include "raul/Atom.hpp" #include "interface/Port.hpp" #include "types.hpp" #include "GraphObjectImpl.hpp" @@ -28,7 +29,7 @@ #include "Buffer.hpp" #include "Context.hpp" -namespace Raul { class Maid; class Atom; } +namespace Raul { class Maid; } namespace Ingen { diff --git a/src/engine/PostProcessor.hpp b/src/engine/PostProcessor.hpp index 8f04a75c..bf4f557b 100644 --- a/src/engine/PostProcessor.hpp +++ b/src/engine/PostProcessor.hpp @@ -19,7 +19,6 @@ #define POSTPROCESSOR_H #include <pthread.h> -#include "types.hpp" #include "raul/SRSWQueue.hpp" #include "raul/List.hpp" diff --git a/src/engine/ProcessContext.hpp b/src/engine/ProcessContext.hpp index 57677126..daf04463 100644 --- a/src/engine/ProcessContext.hpp +++ b/src/engine/ProcessContext.hpp @@ -18,6 +18,7 @@ #ifndef PROCESSCONTEXT_H #define PROCESSCONTEXT_H +#include "types.hpp" #include "EventSink.hpp" #include "Context.hpp" diff --git a/src/engine/ProcessSlave.cpp b/src/engine/ProcessSlave.cpp index c7c868e8..3b29d61b 100644 --- a/src/engine/ProcessSlave.cpp +++ b/src/engine/ProcessSlave.cpp @@ -16,6 +16,7 @@ */ #include <iostream> +#include "raul/Atom.hpp" #include "ProcessSlave.hpp" #include "NodeImpl.hpp" #include "CompiledPatch.hpp" diff --git a/src/engine/ProcessSlave.hpp b/src/engine/ProcessSlave.hpp index c1444815..22c387c0 100644 --- a/src/engine/ProcessSlave.hpp +++ b/src/engine/ProcessSlave.hpp @@ -18,14 +18,11 @@ #ifndef PROCESS_SLAVE_HPP #define PROCESS_SLAVE_HPP -#include "config.h" - #include <sstream> #include "raul/Slave.hpp" #include "raul/Array.hpp" #include "raul/AtomicInt.hpp" #include "ProcessContext.hpp" -#include "types.hpp" namespace Ingen { diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index c3bc56fe..fc3d7788 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -17,7 +17,6 @@ #include <iostream> #include "QueuedEngineInterface.hpp" -#include "config.h" #include "tuning.hpp" #include "QueuedEventSource.hpp" #include "events.hpp" diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 481c5438..49fe649b 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -22,12 +22,12 @@ #include <string> #include <memory> #include "raul/SharedPtr.hpp" +#include "types.hpp" #include "tuning.hpp" #include "interface/EngineInterface.hpp" #include "interface/ClientInterface.hpp" #include "Responder.hpp" #include "QueuedEventSource.hpp" -#include "Engine.hpp" using std::string; namespace Ingen { diff --git a/src/engine/QueuedEventSource.hpp b/src/engine/QueuedEventSource.hpp index 69ac15fe..f8ff2783 100644 --- a/src/engine/QueuedEventSource.hpp +++ b/src/engine/QueuedEventSource.hpp @@ -20,7 +20,6 @@ #include <cstdlib> #include <pthread.h> -#include "types.hpp" #include "raul/Semaphore.hpp" #include "raul/Slave.hpp" #include "raul/List.hpp" diff --git a/src/engine/Responder.hpp b/src/engine/Responder.hpp index 6f11ffd0..1cff0d8c 100644 --- a/src/engine/Responder.hpp +++ b/src/engine/Responder.hpp @@ -20,7 +20,6 @@ #include <inttypes.h> #include <string> -#include "raul/SharedPtr.hpp" #include "interface/ClientInterface.hpp" namespace Ingen { diff --git a/src/engine/events/CreatePatchEvent.hpp b/src/engine/events/CreatePatchEvent.hpp index 81ef6b44..0dfb3e50 100644 --- a/src/engine/events/CreatePatchEvent.hpp +++ b/src/engine/events/CreatePatchEvent.hpp @@ -19,11 +19,8 @@ #define CREATEPATCHEVENT_H #include <string> -#include "raul/Path.hpp" #include "QueuedEvent.hpp" -using std::string; - namespace Raul { template<typename T> class Array; } template<typename T> class TreeNode; @@ -40,7 +37,7 @@ class CompiledPatch; class CreatePatchEvent : public QueuedEvent { public: - CreatePatchEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& path, int poly); + CreatePatchEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const std::string& path, int poly); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/NoteEvent.cpp b/src/engine/events/NoteEvent.cpp index a53f5218..43f59e3c 100644 --- a/src/engine/events/NoteEvent.cpp +++ b/src/engine/events/NoteEvent.cpp @@ -33,7 +33,7 @@ namespace Ingen { * * Used to be triggered by MIDI. Not used anymore. */ -NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, NodeImpl* node, bool on, uchar note_num, uchar velocity) +NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, NodeImpl* node, bool on, uint8_t note_num, uint8_t velocity) : Event(engine, responder, timestamp), _node(node), _on(on), @@ -47,7 +47,7 @@ NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount * * Triggered by OSC. */ -NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& node_path, bool on, uchar note_num, uchar velocity) +NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& node_path, bool on, uint8_t note_num, uint8_t velocity) : Event(engine, responder, timestamp), _node(NULL), _node_path(node_path), diff --git a/src/engine/events/NoteEvent.hpp b/src/engine/events/NoteEvent.hpp index 31ae9d27..443b8d14 100644 --- a/src/engine/events/NoteEvent.hpp +++ b/src/engine/events/NoteEvent.hpp @@ -40,16 +40,16 @@ public: SampleCount timestamp, NodeImpl* node, bool on, - uchar note_num, - uchar velocity); + uint8_t note_num, + uint8_t velocity); NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& node_path, bool on, - uchar note_num, - uchar velocity); + uint8_t note_num, + uint8_t velocity); void execute(ProcessContext& context); void post_process(); @@ -58,8 +58,8 @@ private: NodeImpl* _node; const string _node_path; bool _on; - uchar _note_num; - uchar _velocity; + uint8_t _note_num; + uint8_t _velocity; }; diff --git a/src/engine/events/SetPortValueEvent.hpp b/src/engine/events/SetPortValueEvent.hpp index 6e26babe..64af26c9 100644 --- a/src/engine/events/SetPortValueEvent.hpp +++ b/src/engine/events/SetPortValueEvent.hpp @@ -19,6 +19,7 @@ #define SETPORTVALUEEVENT_H #include <string> +#include "raul/Atom.hpp" #include "QueuedEvent.hpp" #include "types.hpp" using std::string; diff --git a/src/engine/ingen_engine.cpp b/src/engine/ingen_engine.cpp index 08bbd5f8..f56392cf 100644 --- a/src/engine/ingen_engine.cpp +++ b/src/engine/ingen_engine.cpp @@ -15,8 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include <string> #include "raul/Process.hpp" #include "ingen_engine.hpp" diff --git a/src/engine/types.hpp b/src/engine/types.hpp index 5fedf4f3..52d423b9 100644 --- a/src/engine/types.hpp +++ b/src/engine/types.hpp @@ -21,10 +21,6 @@ #include <stdint.h> #include <cstddef> -typedef unsigned char uchar; -typedef unsigned int uint; -typedef unsigned long ulong; - typedef float Sample; typedef uint32_t SampleCount; typedef uint32_t SampleRate; diff --git a/src/gui/App.cpp b/src/gui/App.cpp index f2eaed47..ce6158d7 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -29,12 +29,12 @@ #include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" +#include "engine/Engine.hpp" #include "interface/EngineInterface.hpp" #include "serialisation/serialisation.hpp" #include "client/ObjectModel.hpp" #include "client/PatchModel.hpp" #include "client/ClientStore.hpp" -#include "engine/Engine.hpp" #include "shared/runtime_paths.hpp" #include "NodeModule.hpp" #include "ControlPanel.hpp" @@ -56,6 +56,8 @@ using namespace std; using namespace Ingen::Client; +namespace Raul { class Deletable; } + namespace Ingen { namespace Client { class PluginModel; } } namespace Ingen { diff --git a/src/gui/BreadCrumb.hpp b/src/gui/BreadCrumb.hpp index 62900a23..5de175c0 100644 --- a/src/gui/BreadCrumb.hpp +++ b/src/gui/BreadCrumb.hpp @@ -21,8 +21,8 @@ #include <gtkmm.h> #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "PatchView.hpp" #include "client/PatchModel.hpp" +#include "PatchView.hpp" namespace Ingen { namespace GUI { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 4e65a618..c21a462c 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -36,17 +36,20 @@ #include "client/OSCClientReceiver.hpp" #include "client/OSCEngineSender.hpp" #endif -#include "client/ThreadedSigClientInterface.hpp" #include "client/ClientStore.hpp" #include "client/PatchModel.hpp" +#include "client/ThreadedSigClientInterface.hpp" #include "module/Module.hpp" #include "App.hpp" #include "WindowFactory.hpp" #include "ConnectWindow.hpp" + using Ingen::QueuedEngineInterface; -using Ingen::Client::ThreadedSigClientInterface; +using namespace Ingen::Client; using namespace std; +namespace Raul { class Deletable; } + namespace Ingen { namespace GUI { diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index 4bec3606..87167b3f 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -16,7 +16,6 @@ */ #include "interface/EngineInterface.hpp" -#include "client/PatchModel.hpp" #include "client/NodeModel.hpp" #include "client/PortModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index 579531d8..c43d59ac 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -26,16 +26,18 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include "raul/Path.hpp" #include "Controls.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Path; } + +namespace Ingen { + +namespace Client { class PortModel; class NodeModel; -} } +} using namespace Ingen::Client; -namespace Ingen { namespace GUI { diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index 70d0ebc2..d76f4e17 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -15,8 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include <cmath> #include <iostream> #include <algorithm> diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp index 22d2509a..a946275f 100644 --- a/src/gui/LoadPatchWindow.hpp +++ b/src/gui/LoadPatchWindow.hpp @@ -22,12 +22,15 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PluginModel.hpp" -#include "client/PatchModel.hpp" -using Ingen::Client::PatchModel; + using namespace Ingen::Shared; namespace Ingen { + +namespace Client { class PatchModel; class PluginModel; } +using Ingen::Client::PluginModel; +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 5036427e..c82fed23 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -20,7 +20,6 @@ #include <algorithm> #include <ctype.h> #include "interface/EngineInterface.hpp" -#include "client/NodeModel.hpp" #include "client/PatchModel.hpp" #include "client/ClientStore.hpp" #include "App.hpp" diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 0faf4eb9..e9be576a 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -24,14 +24,16 @@ #include "raul/SharedPtr.hpp" #include "raul/Table.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" #include "client/ClientStore.hpp" -using Ingen::Client::PluginModel; -using Ingen::Client::PatchModel; + using namespace Ingen::Shared; namespace Ingen { + +namespace Client { class PatchModel; class PluginModel; } +using Ingen::Client::PluginModel; +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp index e343fc64..d6d26725 100644 --- a/src/gui/LoadRemotePatchWindow.hpp +++ b/src/gui/LoadRemotePatchWindow.hpp @@ -22,12 +22,13 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" using namespace Ingen::Shared; -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/LoadSubpatchWindow.hpp b/src/gui/LoadSubpatchWindow.hpp index e3d138c3..559df05c 100644 --- a/src/gui/LoadSubpatchWindow.hpp +++ b/src/gui/LoadSubpatchWindow.hpp @@ -21,13 +21,14 @@ #include <libglademm/xml.h> #include <gtkmm.h> #include "raul/SharedPtr.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" #include "interface/GraphObject.hpp" using namespace Ingen::Shared; -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp index 9fd7be07..a8a13508 100644 --- a/src/gui/NewSubpatchWindow.cpp +++ b/src/gui/NewSubpatchWindow.cpp @@ -17,7 +17,6 @@ #include "App.hpp" #include "interface/EngineInterface.hpp" -#include "client/NodeModel.hpp" #include "client/PatchModel.hpp" #include "client/ClientStore.hpp" #include "NewSubpatchWindow.hpp" diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp index b3482fdd..3c685d3f 100644 --- a/src/gui/NewSubpatchWindow.hpp +++ b/src/gui/NewSubpatchWindow.hpp @@ -22,12 +22,13 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" using namespace Ingen::Shared; -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { @@ -52,7 +53,7 @@ private: void cancel_clicked(); GraphObject::Variables _initial_data; - SharedPtr<PatchModel> _patch; + SharedPtr<PatchModel> _patch; Gtk::Entry* _name_entry; Gtk::Label* _message_label; diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 8e6f03ac..468364d1 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -19,12 +19,13 @@ #include <gtkmm.h> #include "interface/EngineInterface.hpp" #include "client/NodeModel.hpp" +#include "client/PluginModel.hpp" #include "App.hpp" #include "NodeMenu.hpp" #include "WindowFactory.hpp" using namespace std; -using std::cerr; using std::endl; +using namespace Ingen::Client; namespace Ingen { namespace GUI { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index c37dc415..cbe39c2f 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -20,7 +20,6 @@ #include <string> #include <gtkmm.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "client/NodeModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 016a9b01..846c5736 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -16,10 +16,11 @@ */ #include <cassert> +#include "config.h" #include "raul/Atom.hpp" #include "interface/EngineInterface.hpp" -#include "client/NodeModel.hpp" #include "client/PatchModel.hpp" +#include "client/NodeModel.hpp" #include "client/PluginUI.hpp" #include "App.hpp" #include "GladeFactory.hpp" diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 85ae8027..d5c9ff79 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -23,11 +23,12 @@ #include "raul/SharedPtr.hpp" #include "Port.hpp" -class Atom; +namespace Raul { class Atom; } namespace Ingen { namespace Client { - class PortModel; class NodeModel; + class PluginUI; + class PortModel; } } using namespace Ingen::Client; @@ -76,12 +77,12 @@ protected: void set_selected(bool b); void rename(); - void set_variable(const std::string& key, const Atom& value); + void set_variable(const std::string& key, const Raul::Atom& value); void set_property(const std::string& predicate, const Raul::Atom& value); void add_port(SharedPtr<PortModel> port, bool resize=true); - void value_changed(uint32_t index, const Atom& value); + void value_changed(uint32_t index, const Raul::Atom& value); void initialise_gui_values(); void create_menu(); diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index 838b8052..d1f6b5fe 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -21,7 +21,6 @@ #include <string> #include <gtkmm.h> #include <libglademm/xml.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "client/ObjectModel.hpp" using Ingen::Client::ObjectModel; diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index f257da4e..f435eadc 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -18,17 +18,15 @@ #ifndef PATCHCANVAS_H #define PATCHCANVAS_H -#include "config.h" - #include <string> #include <map> #include <boost/shared_ptr.hpp> +#include "config.h" #include "flowcanvas/Canvas.hpp" #include "flowcanvas/Module.hpp" #include "raul/SharedPtr.hpp" #include "raul/Path.hpp" #include "client/ConnectionModel.hpp" -#include "client/PatchModel.hpp" #include "interface/GraphObject.hpp" #include "NodeModule.hpp" @@ -38,11 +36,14 @@ using namespace Ingen::Shared; using std::string; using FlowCanvas::Port; using Ingen::Client::ConnectionModel; -using Ingen::Client::PatchModel; using Ingen::Client::NodeModel; using Ingen::Client::PortModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { class NodeModule; diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index 5e655e3e..60a50738 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -22,9 +22,9 @@ #include <boost/enable_shared_from_this.hpp> #include <libgnomecanvasmm.h> #include "flowcanvas/Module.hpp" -#include "raul/Atom.hpp" #include "Port.hpp" -using std::string; + +namespace Raul { class Atom; } namespace Ingen { namespace Client { class PortModel; diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index 6fcea6d9..6c8794e7 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -20,14 +20,16 @@ #include <gtkmm.h> #include <libglademm.h> -#include "raul/Path.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Path; } + +namespace Ingen { + +namespace Client { class ClientStore; -} } +} using Ingen::Client::ClientStore; -namespace Ingen { namespace GUI { class PatchWindow; diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index a392c767..474060f1 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -24,21 +24,22 @@ #include <libglademm.h> #include <libgnomecanvasmm.h> #include "raul/SharedPtr.hpp" -#include "raul/Atom.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Atom; } +namespace FlowCanvas { class Port; class Item; } + +namespace Ingen { + +namespace Client { class PortModel; class MetadataModel; class PatchModel; class ObjectModel; -} } +} using namespace Ingen::Client; -namespace FlowCanvas { class Port; class Item; } - -namespace Ingen { namespace GUI { - + class PatchCanvas; class LoadPluginWindow; class NewSubpatchWindow; diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp index 007d51b7..a8d0cca0 100644 --- a/src/gui/PatchWindow.hpp +++ b/src/gui/PatchWindow.hpp @@ -23,18 +23,19 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Path; } + +namespace Ingen { + +namespace Client { class PatchModel; class PortModel; class ObjectModel; -} } +} using namespace Ingen::Client; - -namespace Ingen { namespace GUI { class LoadPluginWindow; diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index e826c7dc..e3801424 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -23,12 +23,14 @@ #include "flowcanvas/Port.hpp" #include "raul/SharedPtr.hpp" #include "raul/WeakPtr.hpp" -#include "raul/Atom.hpp" -namespace Ingen { namespace Client { class PortModel; } } -using Ingen::Client::PortModel; +namespace Raul { class Atom; } namespace Ingen { + +namespace Client { class PortModel; } +using Ingen::Client::PortModel; + namespace GUI { diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 195d6af3..11c1243a 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -19,6 +19,7 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/EngineInterface.hpp" +#include "client/PatchModel.hpp" #include "client/PortModel.hpp" #include "App.hpp" #include "PortMenu.hpp" diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index a7df2117..d617e01f 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -20,7 +20,6 @@ #include <string> #include <gtkmm.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "client/PortModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index b8e05b20..d407f6db 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -27,7 +27,6 @@ #include "PatchCanvas.hpp" #include "Port.hpp" #include "WindowFactory.hpp" -using std::cerr; using std::cout; using std::endl; namespace Ingen { namespace GUI { @@ -80,7 +79,7 @@ SubpatchModule::browse_to_patch() void SubpatchModule::show_dialog() { - cerr << "FIXME: dialog\n"; + std::cerr << "FIXME: dialog" << std::endl; //m_patch->show_control_window(); } diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index 11c53a69..b01e1e29 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -22,7 +22,6 @@ #include <string> #include <libgnomecanvasmm.h> #include "raul/SharedPtr.hpp" -#include "client/PatchModel.hpp" #include "PatchPortModule.hpp" #include "NodeModule.hpp" using std::string; using std::list; diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index ec39abf3..cf9265db 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -20,9 +20,9 @@ #include "module/global.hpp" #include "module/World.hpp" #include "module/Module.hpp" -#include "client/PatchModel.hpp" #include "App.hpp" #include "ThreadedLoader.hpp" +#include "client/PatchModel.hpp" using namespace std; diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 50e5deb1..c0e30a63 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -26,7 +26,6 @@ #include "raul/Slave.hpp" #include <glibmm/thread.h> #include "interface/EngineInterface.hpp" -#include "client/PatchModel.hpp" #include "client/DeprecatedLoader.hpp" #include "serialisation/Serialiser.hpp" #include "serialisation/Parser.hpp" diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp index 4c3cfdfc..c81a278e 100644 --- a/src/gui/UploadPatchWindow.hpp +++ b/src/gui/UploadPatchWindow.hpp @@ -25,11 +25,13 @@ #include "raul/SharedPtr.hpp" #include "raul/Thread.hpp" #include "raul/AtomicInt.hpp" -#include "client/PatchModel.hpp" #include "client/PluginModel.hpp" -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { class UploadPatchWindow; diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index f7678554..b831db05 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -16,20 +16,22 @@ */ #include "config.h" -#include "WindowFactory.hpp" +#include "client/PatchModel.hpp" #include "App.hpp" -#include "PatchWindow.hpp" #include "GladeFactory.hpp" -#include "PatchPropertiesWindow.hpp" -#include "NodePropertiesWindow.hpp" -#include "PortPropertiesWindow.hpp" -#include "NodeControlWindow.hpp" -#include "LoadPluginWindow.hpp" #include "LoadPatchWindow.hpp" +#include "LoadPluginWindow.hpp" #include "LoadRemotePatchWindow.hpp" #include "LoadSubpatchWindow.hpp" -#include "RenameWindow.hpp" #include "NewSubpatchWindow.hpp" +#include "NodeControlWindow.hpp" +#include "NodePropertiesWindow.hpp" +#include "PatchPropertiesWindow.hpp" +#include "PatchView.hpp" +#include "PatchWindow.hpp" +#include "PortPropertiesWindow.hpp" +#include "RenameWindow.hpp" +#include "WindowFactory.hpp" #ifdef HAVE_CURL #include "UploadPatchWindow.hpp" #endif diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 487cbdb4..79da3902 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -22,24 +22,33 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "PatchView.hpp" -using Ingen::Client::PatchModel; using namespace Ingen::Shared; +namespace Raul { class Path; } + namespace Ingen { + +namespace Client { class PatchModel; class NodeModel; class ObjectModel; } +using Ingen::Client::PatchModel; +using Ingen::Client::NodeModel; +using Ingen::Client::ObjectModel; + namespace GUI { -class PatchWindow; +class LoadPatchWindow; +class LoadPluginWindow; +class LoadRemotePatchWindow; +class LoadSubpatchWindow; +class NewSubpatchWindow; class NodeControlWindow; -class PatchPropertiesWindow; class NodePropertiesWindow; +class PatchPropertiesWindow; +class PatchView; +class PatchWindow; class PortPropertiesWindow; -class LoadPatchWindow; -class LoadRemotePatchWindow; -class UploadPatchWindow; class RenameWindow; +class UploadPatchWindow; /** Manager/Factory for all windows. @@ -78,8 +87,8 @@ public: void clear(); private: - typedef std::map<Path, PatchWindow*> PatchWindowMap; - typedef std::map<Path, NodeControlWindow*> ControlWindowMap; + typedef std::map<Raul::Path, PatchWindow*> PatchWindowMap; + typedef std::map<Raul::Path, NodeControlWindow*> ControlWindowMap; PatchWindow* new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view); diff --git a/src/gui/gui.hpp b/src/gui/gui.hpp index b6f12add..d4e8f399 100644 --- a/src/gui/gui.hpp +++ b/src/gui/gui.hpp @@ -18,9 +18,7 @@ #ifndef INGEN_GUI_H #define INGEN_GUI_H -#include "config.h" #include "module/global.hpp" -#include "raul/SharedPtr.hpp" namespace Ingen { diff --git a/src/module/Module.cpp b/src/module/Module.cpp index 98984aac..100bb956 100644 --- a/src/module/Module.cpp +++ b/src/module/Module.cpp @@ -21,9 +21,9 @@ #include <glibmm/module.h> #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> +#include "config.h" #include "raul/SharedPtr.hpp" #include "shared/runtime_paths.hpp" -#include "config.h" using namespace std; diff --git a/src/serialisation/Parser.hpp b/src/serialisation/Parser.hpp index 26b79be4..7b5acede 100644 --- a/src/serialisation/Parser.hpp +++ b/src/serialisation/Parser.hpp @@ -21,15 +21,14 @@ #include <string> #include <glibmm/ustring.h> #include <boost/optional.hpp> -#include "raul/SharedPtr.hpp" -#include "raul/Path.hpp" -#include "raul/Table.hpp" #include "interface/GraphObject.hpp" #include "module/World.hpp" +namespace Raul { class Path; } namespace Redland { class World; class Model; class Node; } namespace Ingen { namespace Shared { class CommonInterface; } } + using namespace Ingen::Shared; namespace Ingen { diff --git a/src/serialisation/Serialiser.hpp b/src/serialisation/Serialiser.hpp index 6151bae2..8126e350 100644 --- a/src/serialisation/Serialiser.hpp +++ b/src/serialisation/Serialiser.hpp @@ -25,7 +25,6 @@ #include <cassert> #include "raul/SharedPtr.hpp" #include "raul/Path.hpp" -#include "raul/Atom.hpp" #include "redlandmm/World.hpp" #include "redlandmm/Model.hpp" #include "interface/GraphObject.hpp" diff --git a/src/serialisation/serialisation.cpp b/src/serialisation/serialisation.cpp index 7110feac..3615d8c9 100644 --- a/src/serialisation/serialisation.cpp +++ b/src/serialisation/serialisation.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" +#include "raul/Atom.hpp" #include "module/World.hpp" #include "serialisation.hpp" #include "Parser.hpp" 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 ' |