From ca32b189529ffc7c1d42af85f005dea54189218f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 20 Jan 2007 02:35:34 +0000 Subject: Added Machina. Moved some Jack and RDF functionality down to RAUL from Ingen, for use by Machina. git-svn-id: http://svn.drobilla.net/lad/raul@263 a436a847-0d15-0410-975c-d299462d15a1 --- raul/JackDriver.h | 12 +++++------- raul/Namespaces.h | 6 ------ raul/RDFQuery.h | 6 ------ 3 files changed, 5 insertions(+), 19 deletions(-) (limited to 'raul') diff --git a/raul/JackDriver.h b/raul/JackDriver.h index 52e22cd..b16eeb3 100644 --- a/raul/JackDriver.h +++ b/raul/JackDriver.h @@ -65,7 +65,7 @@ public: protected: /** Process callback. Derived classes should do all audio processing here. */ - virtual void on_process(jack_nframes_t nframes) {} + virtual void on_process(jack_nframes_t /*nframes*/) {} /** Graph order change callback. */ virtual void on_graph_order_changed() {} @@ -74,11 +74,11 @@ protected: * At the time this is called, buffer_size() will still return the old * size. Immediately afterwards, it will be set to the new value. */ - virtual void on_buffer_size_changed(jack_nframes_t size) {} + virtual void on_buffer_size_changed(jack_nframes_t /*size*/) {} - virtual void on_xrun() {} - virtual void on_shutdown() {} - virtual void on_error() {} + virtual void on_xrun() {} + virtual void on_shutdown() {} + virtual void on_error() {} private: @@ -88,8 +88,6 @@ private: void update_time(); - - static void jack_port_registration_cb(jack_port_id_t port_id, int registered, void* me); static int jack_graph_order_cb(void* me); static int jack_buffer_size_cb(jack_nframes_t buffer_size, void* me); diff --git a/raul/Namespaces.h b/raul/Namespaces.h index ab2c45a..d28089f 100644 --- a/raul/Namespaces.h +++ b/raul/Namespaces.h @@ -20,9 +20,6 @@ #include #include -namespace Ingen { -namespace Client { - /** Collection of RDF namespaces with prefixes. */ @@ -32,7 +29,4 @@ public: }; -} // namespace Client -} // namespace Ingen - #endif // RAUL_NAMESPACES_H diff --git a/raul/RDFQuery.h b/raul/RDFQuery.h index 5e972ca..8b0f362 100644 --- a/raul/RDFQuery.h +++ b/raul/RDFQuery.h @@ -22,9 +22,6 @@ #include #include "raul/Namespaces.h" -namespace Ingen { -namespace Client { - /** Pretty wrapper for a SPARQL query. * @@ -70,8 +67,5 @@ private: }; -} // namespace Client -} // namespace Ingen - #endif // RAUL_RDFQUERY_H -- cgit v1.2.1