Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 298) +++ CMakeLists.txt (working copy) @@ -61,6 +61,7 @@ option ( enable-dart "compile DART support (if it is available)" on ) option ( enable-readline "compile readline lib line editing (if it is available)" on ) option ( enable-lash "compile LASH support (if it is available)" on ) +option ( enable-dbus "compile DBUS support (if it is available)" on ) # Initialize the library directory name suffix. if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) @@ -325,6 +326,13 @@ set ( LADCCA_SUPPORT ${LADCCA_FOUND} ) endif ( enable-ladcca ) +set ( DBUS_SUPPORT ) +set ( DBUS_LIBRARIES ) +if ( enable-dbus ) + pkg_check_modules ( DBUS dbus-1>=1.0.0 ) + set ( DBUS_SUPPORT ${DBUS_FOUND} ) +endif ( enable-dbus ) + # General configuration file configure_file ( ${CMAKE_SOURCE_DIR}/src/config.cmake ${CMAKE_BINARY_DIR}/config.h ) Index: cmake_admin/report.cmake =================================================================== --- cmake_admin/report.cmake (revision 298) +++ cmake_admin/report.cmake (working copy) @@ -11,6 +11,12 @@ message ( "libsndfile: no (raw audio file rendering only)" ) endif ( LIBSNDFILE_SUPPORT ) +if ( DBUS_SUPPORT ) + message ( "D-Bus: yes" ) +else ( DBUS_SUPPORT ) + message ( "D-Bus: no" ) +endif ( DBUS_SUPPORT ) + if ( PULSE_SUPPORT ) message ( "PulseAudio: yes" ) else ( PULSE_SUPPORT ) Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt (revision 298) +++ src/CMakeLists.txt (working copy) @@ -54,6 +54,11 @@ set ( fluid_coremidi_SOURCES drivers/fluid_coremidi.c ) endif ( COREMIDI_SUPPORT ) +if ( DBUS_SUPPORT ) + set ( fluid_dbus_SOURCES fluid_rtkit.c fluid_rtkit.h ) + include_directories ( ${DBUS_INCLUDEDIR} ${DBUS_INCLUDE_DIRS} ) +endif ( DBUS_SUPPORT ) + if ( JACK_SUPPORT ) set ( fluid_jack_SOURCES drivers/fluid_jack.c ) include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} ) @@ -172,6 +177,8 @@ ${PORTAUDIO_LIBRARY_DIRS} ${LIBSNDFILE_LIBDIR} ${LIBSNDFILE_LIBRARY_DIRS} + ${DBUS_LIBDIR} + ${DBUS_LIBRARY_DIRS} ) add_library ( libfluidsynth SHARED @@ -179,6 +186,7 @@ ${fluid_coreaudio_SOURCES} ${fluid_coremidi_SOURCES} ${fluid_dart_SOURCES} + ${fluid_dbus_SOURCES} ${fluid_jack_SOURCES} ${fluid_lash_SOURCES} ${fluid_ladspa_SOURCES} @@ -218,13 +226,14 @@ ${PULSE_LIBRARIES} ${PORTAUDIO_LIBRARIES} ${LIBSNDFILE_LIBRARIES} + ${DBUS_LIBRARIES} ${READLINE_LIBS} ${DART_LIBS} ${COREAUDIO_LIBS} ${COREMIDI_LIBS} ${WINDOWS_LIBS} ${MidiShare_LIBS} - ${LIBFLUID_LIBS} + ${LIBFLUID_LIBS} ) # ************ CLI program ************ Index: src/config.cmake =================================================================== --- src/config.cmake (revision 298) +++ src/config.cmake (working copy) @@ -19,6 +19,9 @@ /* Define if building for Mac OS X Darwin */ #cmakedefine DARWIN @DARWIN@ +/* Define if D-Bus support is enabled */ +#cmakedefine DBUS_SUPPORT @DBUS_SUPPORT@ + /* Define to enable FPE checks */ #cmakedefine FPE_CHECK @FPE_CHECK@