diff options
| -rw-r--r-- | configure.ac | 29 | ||||
| -rw-r--r-- | raul/JackDriver.h | 12 | ||||
| -rw-r--r-- | raul/Namespaces.h | 6 | ||||
| -rw-r--r-- | raul/RDFQuery.h | 6 | ||||
| -rw-r--r-- | src/JackDriver.cpp | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 18 | ||||
| -rw-r--r-- | src/Namespaces.cpp (renamed from Namespaces.cpp) | 8 | ||||
| -rw-r--r-- | src/RDFQuery.cpp (renamed from RDFQuery.cpp) | 11 | ||||
| -rw-r--r-- | tests/Makefile.am | 10 |
9 files changed, 53 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index c0eaf8c..06d3560 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,9 @@ AC_ARG_ENABLE(unit-tests, [build_unit_tests="$enableval"]) AM_CONDITIONAL(BUILD_TESTS, [test "$build_unit_tests" = "yes"]) +# Check for glibmm +PKG_CHECK_MODULES(GLIBMM, glibmm-2.4) + build_smart_pointers="yes" AC_ARG_ENABLE(smart_pointers, [AS_HELP_STRING(--enable-smart_pointers, [Include smart pointers - requires boost (yes)])], @@ -69,6 +72,15 @@ if test "$build_smart_pointers" = "yes"; then fi AM_CONDITIONAL(WITH_BOOST, [test "$build_smart_pointers" = "yes"]) +build_jack="yes" +AC_ARG_ENABLE(jack, + [AS_HELP_STRING(--enable-jack, [Include JACK audio/midi support (yes)])], + [ if test x$enable_jack = xno ; then build_jack=no ; fi ]) +if test "$build_jack" = "yes"; then + PKG_CHECK_MODULES(JACK, jack >= 0.102.20, [], + AC_MSG_ERROR([JACK support requires jack (>= 0.102.20)])) +fi +AM_CONDITIONAL(WITH_JACK, [test "$build_jack" = "yes"]) build_raptor="yes" AC_ARG_ENABLE(raptor, @@ -80,6 +92,15 @@ if test "$build_raptor" = "yes"; then fi AM_CONDITIONAL(WITH_RAPTOR, [test "$build_raptor" = "yes"]) +build_rasqal="yes" +AC_ARG_ENABLE(rasqal, + [AS_HELP_STRING(--enable-rasqal, [Include Rasqal (RDF Querying) support (yes)])], + [ if test x$enable_rasqal = xno ; then build_rasqal=no ; fi ]) +if test "$build_rasqal" = "yes"; then + PKG_CHECK_MODULES(RASQAL, rasqal >= 0.9.11, [], + AC_MSG_ERROR([RDF query support requires rasqal (>= 0.9.11)])) +fi +AM_CONDITIONAL(WITH_RASQAL, [test "$build_rasqal" = "yes"]) build_liblo="yes" AC_ARG_ENABLE(liblo, @@ -107,9 +128,11 @@ AC_MSG_RESULT([Raul build configuration:]) AC_MSG_RESULT([]) AC_MSG_RESULT([Building unit tests: $build_unit_tests]) AC_MSG_RESULT([]) -AC_MSG_RESULT([OSC supprt: $build_liblo]) -AC_MSG_RESULT([RDF supprt: $build_raptor]) -AC_MSG_RESULT([Smart Pointers: $build_smart_pointers]) +AC_MSG_RESULT([OSC (Liblo) support: $build_liblo]) +AC_MSG_RESULT([RDF Serialization (Raptor) support: $build_raptor]) +AC_MSG_RESULT([RDF Querying (Rasqal) support: $build_rasqal]) +AC_MSG_RESULT([Jack support: $build_jack]) +AC_MSG_RESULT([Smart Pointers (Boost): $build_smart_pointers]) AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([]) 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 <map> #include <string> -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 <glibmm/ustring.h> #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 diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index 0bbc24b..cd96ab7 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -97,9 +97,9 @@ JackDriver::detach() void -JackDriver::jack_port_registration_cb(jack_port_id_t port_id, int registered, void* jack_driver) +JackDriver::jack_port_registration_cb(jack_port_id_t /*port_id*/, int /*registered*/, void* /*jack_driver*/) { - /* shrug. */ + /* whatever. */ } diff --git a/src/Makefile.am b/src/Makefile.am index d0cef87..1e9f60d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,16 +1,22 @@ -AM_CXXFLAGS = -I$(top_srcdir) +AM_CXXFLAGS = -I$(top_srcdir) @RAPTOR_CFLAGS@ @RASQAL_CFLAGS@ @GLIBMM_CFLAGS@ @JACK_CFLAGS@ -libraul_la_CFLAGS = @RAPTOR_CFLAGS@ -libraul_la_LIBADD = @RAPTOR_LIBS@ +libraul_la_LIBADD = @RAPTOR_LIBS@ @RASQAL_LIBS@ @GLIBMM_LIBS@ @JACK_LIBS@ lib_LTLIBRARIES = libraul.la libraul_la_SOURCES = \ Thread.cpp \ Path.cpp \ - RDFWriter.cpp \ - JackDriver.cpp \ - RDFQuery.cpp \ Namespaces.cpp +if WITH_RAPTOR +libraul_la_SOURCES += RDFWriter.cpp +endif +if WITH_RASQAL +libraul_la_SOURCES += RDFQuery.cpp +endif + +if WITH_JACK +libraul_la_SOURCES += JackDriver.cpp +endif diff --git a/Namespaces.cpp b/src/Namespaces.cpp index 545e1db..d45d259 100644 --- a/Namespaces.cpp +++ b/src/Namespaces.cpp @@ -14,10 +14,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "Namespaces.h" - -namespace Ingen { -namespace Client { +#include "raul/Namespaces.h" /** Create a prefixed qname from @a uri, if possible. @@ -38,6 +35,3 @@ Namespaces::qualify(std::string uri) return uri; } - -} // namespace Client -} // namespace Ingen diff --git a/RDFQuery.cpp b/src/RDFQuery.cpp index 196868b..f92ca89 100644 --- a/RDFQuery.cpp +++ b/src/RDFQuery.cpp @@ -17,13 +17,7 @@ #include <iostream> #include <cassert> #include <rasqal.h> -#include "RDFQuery.h" - -#include <iostream> -using std::cerr; using std::endl; - -namespace Ingen { -namespace Client { +#include "raul/RDFQuery.h" RDFQuery::Results @@ -75,6 +69,3 @@ RDFQuery::run(const Glib::ustring base_uri_str) const return result; } - -} // namespace Client -} // namespace Ingen diff --git a/tests/Makefile.am b/tests/Makefile.am index 6cb5a59..20209d3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,11 +1,13 @@ if BUILD_TESTS -AM_CXXFLAGS = -I.. -lpthread +AM_CXXFLAGS = -I.. -lpthread @RASQAL_CFLAGS@ +ALL_LIBS = @RASQAL_LIBS@ ../src/libraul.la + bin_PROGRAMS = path_test thread_test queue_test -thread_test_LDADD = ../src/libraul.la -path_test_LDADD = ../src/libraul.la -queue_test_LDADD = ../src/libraul.la +thread_test_LDADD = $(ALL_LIBS) +path_test_LDADD = $(ALL_LIBS) +queue_test_LDADD = $(ALL_LIBS) path_test_SOURCES = path_test.cpp thread_test_SOURCES = thread_test.cpp |