summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
Diffstat (limited to 'ingen')
-rw-r--r--ingen/Atom.hpp2
-rw-r--r--ingen/AtomReader.hpp1
-rw-r--r--ingen/AtomSink.hpp1
-rw-r--r--ingen/AtomWriter.hpp1
-rw-r--r--ingen/ClashAvoider.hpp1
-rw-r--r--ingen/Configuration.hpp3
-rw-r--r--ingen/Interface.hpp1
-rw-r--r--ingen/URIs.hpp2
-rw-r--r--ingen/client/PluginModel.hpp1
-rw-r--r--ingen/client/PluginUI.hpp1
-rw-r--r--ingen/client/PortModel.hpp2
-rw-r--r--ingen/client/SigClientInterface.hpp24
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp33
-rw-r--r--ingen/types.hpp7
14 files changed, 36 insertions, 44 deletions
diff --git a/ingen/Atom.hpp b/ingen/Atom.hpp
index 7a3e5797..2e585a47 100644
--- a/ingen/Atom.hpp
+++ b/ingen/Atom.hpp
@@ -31,7 +31,7 @@ class Forge;
/**
A generic typed data container.
-
+
An Atom holds a value with some type and size, both specified by a uint32_t.
Values with size less than sizeof(void*) are stored inline: no dynamic
allocation occurs so Atoms may be created in hard real-time threads.
diff --git a/ingen/AtomReader.hpp b/ingen/AtomReader.hpp
index 1cf55bb5..b4c4418a 100644
--- a/ingen/AtomReader.hpp
+++ b/ingen/AtomReader.hpp
@@ -67,4 +67,3 @@ private:
} // namespace Ingen
#endif // INGEN_ATOMREADER_HPP
-
diff --git a/ingen/AtomSink.hpp b/ingen/AtomSink.hpp
index ae8fd07a..ade5e147 100644
--- a/ingen/AtomSink.hpp
+++ b/ingen/AtomSink.hpp
@@ -37,4 +37,3 @@ public:
} // namespace Ingen
#endif // INGEN_ATOMSINK_HPP
-
diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp
index a0a799e2..c591c528 100644
--- a/ingen/AtomWriter.hpp
+++ b/ingen/AtomWriter.hpp
@@ -98,4 +98,3 @@ private:
} // namespace Ingen
#endif // INGEN_ATOMWRITER_HPP
-
diff --git a/ingen/ClashAvoider.hpp b/ingen/ClashAvoider.hpp
index 60affa2a..98d508d4 100644
--- a/ingen/ClashAvoider.hpp
+++ b/ingen/ClashAvoider.hpp
@@ -105,4 +105,3 @@ private:
} // namespace Ingen
#endif // INGEN_CLASHAVOIDER_HPP
-
diff --git a/ingen/Configuration.hpp b/ingen/Configuration.hpp
index ffa9723e..acad6d22 100644
--- a/ingen/Configuration.hpp
+++ b/ingen/Configuration.hpp
@@ -145,7 +145,7 @@ private:
int set_value_from_string(Configuration::Option& option,
const std::string& value)
- throw (Configuration::OptionError);
+ throw (Configuration::OptionError);
Forge& _forge;
const std::string _shortdesc;
@@ -160,4 +160,3 @@ private:
} // namespace Ingen
#endif // INGEN_CONFIGURATION_HPP
-
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp
index 0fc90d42..d5fe0b97 100644
--- a/ingen/Interface.hpp
+++ b/ingen/Interface.hpp
@@ -105,4 +105,3 @@ public:
} // namespace Ingen
#endif // INGEN_INTERFACE_HPP
-
diff --git a/ingen/URIs.hpp b/ingen/URIs.hpp
index 44f57e3f..ba822947 100644
--- a/ingen/URIs.hpp
+++ b/ingen/URIs.hpp
@@ -24,7 +24,7 @@
#include "raul/URI.hpp"
namespace Raul {
- class Forge;
+class Forge;
}
namespace Ingen {
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index 016e444e..79fae72d 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -108,4 +108,3 @@ private:
} // namespace Ingen
#endif // INGEN_CLIENT_PLUGINMODEL_HPP
-
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index 1857d3e2..63e1074d 100644
--- a/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
@@ -80,4 +80,3 @@ private:
} // namespace Ingen
#endif // INGEN_CLIENT_PLUGINUI_HPP
-
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 84a5d0d8..647aa922 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -45,7 +45,7 @@ public:
bool supports(const Raul::URI& value_type) const;
- inline uint32_t index() const { return _index; }
+ inline uint32_t index() const { return _index; }
inline const Atom& value() const { return get_property(_uris.ingen_value); }
inline bool connected() const { return (_connections > 0); }
inline bool is_input() const { return (_direction == Direction::INPUT); }
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 2210d4f4..07e6e333 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -70,44 +70,44 @@ protected:
#define EMIT(name, ...) { _signal_ ## name (__VA_ARGS__); }
void bundle_begin()
- { EMIT(bundle_begin); }
+ { EMIT(bundle_begin); }
void bundle_end()
- { EMIT(bundle_end); }
+ { EMIT(bundle_end); }
void response(int32_t id, Status status, const std::string& subject)
- { EMIT(response, id, status, subject); }
+ { EMIT(response, id, status, subject); }
void error(const std::string& msg)
- { EMIT(error, msg); }
+ { EMIT(error, msg); }
void put(const Raul::URI& uri,
const Resource::Properties& properties,
Resource::Graph ctx=Resource::Graph::DEFAULT)
- { EMIT(put, uri, properties, ctx); }
+ { EMIT(put, uri, properties, ctx); }
void delta(const Raul::URI& uri,
const Resource::Properties& remove,
const Resource::Properties& add)
- { EMIT(delta, uri, remove, add); }
+ { EMIT(delta, uri, remove, add); }
void connect(const Raul::Path& tail, const Raul::Path& head)
- { EMIT(connection, tail, head); }
+ { EMIT(connection, tail, head); }
void del(const Raul::URI& uri)
- { EMIT(object_deleted, uri); }
+ { EMIT(object_deleted, uri); }
void move(const Raul::Path& old_path, const Raul::Path& new_path)
- { EMIT(object_moved, old_path, new_path); }
+ { EMIT(object_moved, old_path, new_path); }
void disconnect(const Raul::Path& tail, const Raul::Path& head)
- { EMIT(disconnection, tail, head); }
+ { EMIT(disconnection, tail, head); }
void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
- { EMIT(disconnect_all, graph, path); }
+ { EMIT(disconnect_all, graph, path); }
void set_property(const Raul::URI& subject, const Raul::URI& key, const Atom& value)
- { EMIT(property_change, subject, key, value); }
+ { EMIT(property_change, subject, key, value); }
void set_response_id(int32_t id) {}
void get(const Raul::URI& uri) {}
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 562c5fca..dbfe23bb 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -67,44 +67,44 @@ public:
virtual Raul::URI uri() const { return Raul::URI("ingen:/clients/sig_queue"); }
void bundle_begin()
- { push_sig(bundle_begin_slot); }
+ { push_sig(bundle_begin_slot); }
void bundle_end()
- { push_sig(bundle_end_slot); }
+ { push_sig(bundle_end_slot); }
void response(int32_t id, Status status, const std::string& subject)
- { push_sig(sigc::bind(response_slot, id, status, subject)); }
+ { push_sig(sigc::bind(response_slot, id, status, subject)); }
void error(const std::string& msg)
- { push_sig(sigc::bind(error_slot, msg)); }
+ { push_sig(sigc::bind(error_slot, msg)); }
void put(const Raul::URI& path,
const Resource::Properties& properties,
Resource::Graph ctx=Resource::Graph::DEFAULT)
- { push_sig(sigc::bind(put_slot, path, properties, ctx)); }
+ { push_sig(sigc::bind(put_slot, path, properties, ctx)); }
void delta(const Raul::URI& path,
const Resource::Properties& remove,
const Resource::Properties& add)
- { push_sig(sigc::bind(delta_slot, path, remove, add)); }
+ { push_sig(sigc::bind(delta_slot, path, remove, add)); }
void connect(const Raul::Path& tail, const Raul::Path& head)
- { push_sig(sigc::bind(connection_slot, tail, head)); }
+ { push_sig(sigc::bind(connection_slot, tail, head)); }
void del(const Raul::URI& uri)
- { push_sig(sigc::bind(object_deleted_slot, uri)); }
+ { push_sig(sigc::bind(object_deleted_slot, uri)); }
void move(const Raul::Path& old_path, const Raul::Path& new_path)
- { push_sig(sigc::bind(object_moved_slot, old_path, new_path)); }
+ { push_sig(sigc::bind(object_moved_slot, old_path, new_path)); }
void disconnect(const Raul::Path& tail, const Raul::Path& head)
- { push_sig(sigc::bind(disconnection_slot, tail, head)); }
+ { push_sig(sigc::bind(disconnection_slot, tail, head)); }
void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
- { push_sig(sigc::bind(disconnect_all_slot, graph, path)); }
+ { push_sig(sigc::bind(disconnect_all_slot, graph, path)); }
void set_property(const Raul::URI& subject, const Raul::URI& key, const Atom& value)
- { push_sig(sigc::bind(property_change_slot, subject, key, value)); }
+ { push_sig(sigc::bind(property_change_slot, subject, key, value)); }
/** Process all queued events - Called from GTK thread to emit signals. */
bool emit_signals() {
@@ -144,15 +144,16 @@ private:
Raul::SRSWQueue<Closure> _sigs;
+ using Properties = Resource::Properties;
+ using Graph = Resource::Graph;
+
sigc::slot<void> bundle_begin_slot;
sigc::slot<void> bundle_end_slot;
sigc::slot<void, int32_t, Status, std::string> response_slot;
sigc::slot<void, std::string> error_slot;
sigc::slot<void, Raul::URI, Raul::URI, Raul::Symbol> new_plugin_slot;
- sigc::slot<void, Raul::URI, Resource::Properties,
- Resource::Graph> put_slot;
- sigc::slot<void, Raul::URI, Resource::Properties,
- Resource::Properties> delta_slot;
+ sigc::slot<void, Raul::URI, Properties, Graph> put_slot;
+ sigc::slot<void, Raul::URI, Properties, Properties> delta_slot;
sigc::slot<void, Raul::Path, Raul::Path> connection_slot;
sigc::slot<void, Raul::URI> object_deleted_slot;
sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot;
diff --git a/ingen/types.hpp b/ingen/types.hpp
index 0f0fe718..71f044d9 100644
--- a/ingen/types.hpp
+++ b/ingen/types.hpp
@@ -35,17 +35,17 @@ using WPtr = std::weak_ptr<T>;
template <class T>
void NullDeleter(T* ptr) {}
-template<class T, class U>
+template<class T, class U>
SPtr<T> static_ptr_cast(const SPtr<U>& r) {
return std::static_pointer_cast<T>(r);
}
-template<class T, class U>
+template<class T, class U>
SPtr<T> dynamic_ptr_cast(const SPtr<U>& r) {
return std::dynamic_pointer_cast<T>(r);
}
-template<class T, class U>
+template<class T, class U>
SPtr<T> const_ptr_cast(const SPtr<U>& r) {
return std::const_pointer_cast<T>(r);
}
@@ -53,4 +53,3 @@ SPtr<T> const_ptr_cast(const SPtr<U>& r) {
} // namespace Ingen
#endif // INGEN_TYPES_HPP
-
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-28 11:57:53 +0000