Changeset 224

Timestamp:

02/08/08 19:38:52 (4 years ago)

Author:

ath

Message:

New makefile infrastructure.

Location:

trunk/fm_server

Files:

• Makefile.in (modified) (4 diffs)
• config.h.in (modified) (1 diff)
• configure (modified) (38 diffs)
• configure.ac (modified) (4 diffs)
• src/Makefile.am (modified) (4 diffs)
• src/Makefile.in (modified) (16 diffs)
• src/fm_input_gst/Makefile.am (modified) (2 diffs)
• src/fm_input_gst/Makefile.in (modified) (7 diffs)
• src/fm_song_db/Makefile.am (modified) (2 diffs)
• src/fm_song_db/Makefile.in (modified) (7 diffs)
• src/main.c (modified) (3 diffs)
• test/Makefile.am (modified) (1 diff)
• test/Makefile.in (modified) (5 diffs)

trunk/fm_server/Makefile.in

@@ -118 +118 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
-FM_SERVER_CFLAGS = @FM_SERVER_CFLAGS@
-FM_SERVER_LIBS = @FM_SERVER_LIBS@
-FM_SERVER_TEST_CFLAGS = @FM_SERVER_TEST_CFLAGS@
-FM_SERVER_TEST_LIBS = @FM_SERVER_TEST_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -140 +140 @@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -170 +172 @@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
 RANLIB = @RANLIB@
 RGC_CLIENT_CFLAGS = @RGC_CLIENT_CFLAGS@
@@ -175 +179 @@
 RGC_SERVER_CFLAGS = @RGC_SERVER_CFLAGS@
 RGC_SERVER_LIBS = @RGC_SERVER_LIBS@
+SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@

trunk/fm_server/config.h.in

@@ -82 +82 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
+
+/* PulseAudio is available. */
+#undef HAVE_PULSE
 
 /* Define to 1 if you have the `sched_setscheduler' function. */

trunk/fm_server/configure

@@ -892 +892 @@
 LIBOBJS
 PKG_CONFIG
-FM_SERVER_CFLAGS
-FM_SERVER_LIBS
-FM_SERVER_TEST_CFLAGS
-FM_SERVER_TEST_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
+LIBXML_CFLAGS
+LIBXML_LIBS
+GSTREAMER_CFLAGS
+GSTREAMER_LIBS
+SAMPLERATE_CFLAGS
+SAMPLERATE_LIBS
 RGC_SERVER_CFLAGS
 RGC_SERVER_LIBS
 RGC_CLIENT_CFLAGS
 RGC_CLIENT_LIBS
+ALSA_CFLAGS
+ALSA_LIBS
+HAVE_ALSA_TRUE
+HAVE_ALSA_FALSE
 JACK_CFLAGS
 JACK_LIBS
 HAVE_JACK_TRUE
 HAVE_JACK_FALSE
-ALSA_CFLAGS
-ALSA_LIBS
-HAVE_ALSA_TRUE
-HAVE_ALSA_FALSE
+PULSE_CFLAGS
+PULSE_LIBS
+HAVE_PULSE_TRUE
+HAVE_PULSE_FALSE
 NO_PREFIX_PACKAGE_DATA_DIR
 PACKAGE_DATA_DIR
@@ -936 +944 @@
 FFLAGS
 PKG_CONFIG
-FM_SERVER_CFLAGS
-FM_SERVER_LIBS
-FM_SERVER_TEST_CFLAGS
-FM_SERVER_TEST_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
+LIBXML_CFLAGS
+LIBXML_LIBS
+GSTREAMER_CFLAGS
+GSTREAMER_LIBS
+SAMPLERATE_CFLAGS
+SAMPLERATE_LIBS
 RGC_SERVER_CFLAGS
 RGC_SERVER_LIBS
 RGC_CLIENT_CFLAGS
 RGC_CLIENT_LIBS
+ALSA_CFLAGS
+ALSA_LIBS
 JACK_CFLAGS
 JACK_LIBS
-ALSA_CFLAGS
-ALSA_LIBS'
+PULSE_CFLAGS
+PULSE_LIBS'
 
 
@@ -1565 +1579 @@
   FFLAGS      Fortran 77 compiler flags
   PKG_CONFIG  path to pkg-config utility
-  FM_SERVER_CFLAGS
-              C compiler flags for FM_SERVER, overriding pkg-config
-  FM_SERVER_LIBS
-              linker flags for FM_SERVER, overriding pkg-config
-  FM_SERVER_TEST_CFLAGS
-              C compiler flags for FM_SERVER_TEST, overriding pkg-config
-  FM_SERVER_TEST_LIBS
-              linker flags for FM_SERVER_TEST, overriding pkg-config
+  GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+  GLIB_LIBS   linker flags for GLIB, overriding pkg-config
+  LIBXML_CFLAGS
+              C compiler flags for LIBXML, overriding pkg-config
+  LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
+  GSTREAMER_CFLAGS
+              C compiler flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_LIBS
+              linker flags for GSTREAMER, overriding pkg-config
+  SAMPLERATE_CFLAGS
+              C compiler flags for SAMPLERATE, overriding pkg-config
+  SAMPLERATE_LIBS
+              linker flags for SAMPLERATE, overriding pkg-config
   RGC_SERVER_CFLAGS
               C compiler flags for RGC_SERVER, overriding pkg-config
@@ -1581 +1600 @@
   RGC_CLIENT_LIBS
               linker flags for RGC_CLIENT, overriding pkg-config
+  ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
+  ALSA_LIBS   linker flags for ALSA, overriding pkg-config
   JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
   JACK_LIBS   linker flags for JACK, overriding pkg-config
-  ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
-  ALSA_LIBS   linker flags for ALSA, overriding pkg-config
+  PULSE_CFLAGS
+              C compiler flags for PULSE, overriding pkg-config
+  PULSE_LIBS  linker flags for PULSE, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
@@ -4403 +4425 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4405 "configure"' > conftest.$ac_ext
+  echo '#line 4427 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -7435 +7457 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7437: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7459: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7441: \$? = $ac_status" >&5
+   echo "$as_me:7463: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7725 +7747 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7749: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7731: \$? = $ac_status" >&5
+   echo "$as_me:7753: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7829 +7851 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7831: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7853: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7835: \$? = $ac_status" >&5
+   echo "$as_me:7857: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10191 +10213 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10193 "configure"
+#line 10215 "configure"
 #include "confdefs.h"
 
@@ -10291 +10313 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10293 "configure"
+#line 10315 "configure"
 #include "confdefs.h"
 
@@ -12711 +12733 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12713: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12735: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12717: \$? = $ac_status" >&5
+   echo "$as_me:12739: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12815 +12837 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12817: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12839: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12821: \$? = $ac_status" >&5
+   echo "$as_me:12843: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14392 +14414 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14394: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14398: \$? = $ac_status" >&5
+   echo "$as_me:14420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14496 +14518 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14498: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14502: \$? = $ac_status" >&5
+   echo "$as_me:14524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -16696 +16718 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16698: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16720: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16702: \$? = $ac_status" >&5
+   echo "$as_me:16724: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16986 +17008 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16988: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17010: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16992: \$? = $ac_status" >&5
+   echo "$as_me:17014: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17090 +17112 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17092: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17114: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17096: \$? = $ac_status" >&5
+   echo "$as_me:17118: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -24491 +24513 @@
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for FM_SERVER" >&5
-echo $ECHO_N "checking for FM_SERVER... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for GLIB" >&5
+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$FM_SERVER_CFLAGS"; then
-        pkg_cv_FM_SERVER_CFLAGS="$FM_SERVER_CFLAGS"
+    if test -n "$GLIB_CFLAGS"; then
+        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 gobject-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 gobject-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_FM_SERVER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gthread-2.0 gobject-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -24513 +24535 @@
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$FM_SERVER_LIBS"; then
-        pkg_cv_FM_SERVER_LIBS="$FM_SERVER_LIBS"
+    if test -n "$GLIB_LIBS"; then
+        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 gobject-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 gobject-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_FM_SERVER_LIBS=`$PKG_CONFIG --libs "glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 gthread-2.0 gobject-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -24541 +24563 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
-                FM_SERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10"`
+                GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 gthread-2.0 gobject-2.0"`
         else
-                FM_SERVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10"`
+                GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 gthread-2.0 gobject-2.0"`
         fi
         # Put the nasty error message in config.log where it belongs
-        echo "$FM_SERVER_PKG_ERRORS" >&5
-
-        { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10) were not met:
-
-$FM_SERVER_PKG_ERRORS
+        echo "$GLIB_PKG_ERRORS" >&5
+
+        { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gthread-2.0 gobject-2.0) were not met:
+
+$GLIB_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables FM_SERVER_CFLAGS
-and FM_SERVER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GLIB_CFLAGS
+and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10) were not met:
-
-$FM_SERVER_PKG_ERRORS
+echo "$as_me: error: Package requirements (glib-2.0 gthread-2.0 gobject-2.0) were not met:
+
+$GLIB_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables FM_SERVER_CFLAGS
-and FM_SERVER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GLIB_CFLAGS
+and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&2;}
@@ -24576 +24598 @@
 path to pkg-config.
 
-Alternatively, you may set the environment variables FM_SERVER_CFLAGS
-and FM_SERVER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GLIB_CFLAGS
+and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
@@ -24586 +24608 @@
 path to pkg-config.
 
-Alternatively, you may set the environment variables FM_SERVER_CFLAGS
-and FM_SERVER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GLIB_CFLAGS
+and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
@@ -24594 +24616 @@
    { (exit 1); exit 1; }; }
 else
-        FM_SERVER_CFLAGS=$pkg_cv_FM_SERVER_CFLAGS
-        FM_SERVER_LIBS=$pkg_cv_FM_SERVER_LIBS
+        GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+        GLIB_LIBS=$pkg_cv_GLIB_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
@@ -24605 +24627 @@
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for FM_SERVER_TEST" >&5
-echo $ECHO_N "checking for FM_SERVER_TEST... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for LIBXML" >&5
+echo $ECHO_N "checking for LIBXML... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$FM_SERVER_TEST_CFLAGS"; then
-        pkg_cv_FM_SERVER_TEST_CFLAGS="$FM_SERVER_TEST_CFLAGS"
+    if test -n "$LIBXML_CFLAGS"; then
+        pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 gobject-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 gobject-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_FM_SERVER_TEST_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gthread-2.0 gobject-2.0" 2>/dev/null`
+  pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -24627 +24649 @@
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$FM_SERVER_TEST_LIBS"; then
-        pkg_cv_FM_SERVER_TEST_LIBS="$FM_SERVER_TEST_LIBS"
+    if test -n "$LIBXML_LIBS"; then
+        pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 gobject-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 gobject-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_FM_SERVER_TEST_LIBS=`$PKG_CONFIG --libs "glib-2.0 gthread-2.0 gobject-2.0" 2>/dev/null`
+  pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -24655 +24677 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
-                FM_SERVER_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 gthread-2.0 gobject-2.0"`
+                LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"`
         else
-                FM_SERVER_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 gthread-2.0 gobject-2.0"`
+                LIBXML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
         fi
         # Put the nasty error message in config.log where it belongs
-        echo "$FM_SERVER_TEST_PKG_ERRORS" >&5
-
-        { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 gthread-2.0 gobject-2.0) were not met:
-
-$FM_SERVER_TEST_PKG_ERRORS
+        echo "$LIBXML_PKG_ERRORS" >&5
+
+        { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
+
+$LIBXML_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables FM_SERVER_TEST_CFLAGS
-and FM_SERVER_TEST_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (glib-2.0 gthread-2.0 gobject-2.0) were not met:
-
-$FM_SERVER_TEST_PKG_ERRORS
+echo "$as_me: error: Package requirements (libxml-2.0) were not met:
+
+$LIBXML_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables FM_SERVER_TEST_CFLAGS
-and FM_SERVER_TEST_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&2;}
@@ -24690 +24712 @@
 path to pkg-config.
 
-Alternatively, you may set the environment variables FM_SERVER_TEST_CFLAGS
-and FM_SERVER_TEST_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
@@ -24700 +24722 @@
 path to pkg-config.
 
-Alternatively, you may set the environment variables FM_SERVER_TEST_CFLAGS
-and FM_SERVER_TEST_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
@@ -24708 +24730 @@
    { (exit 1); exit 1; }; }
 else
-        FM_SERVER_TEST_CFLAGS=$pkg_cv_FM_SERVER_TEST_CFLAGS
-        FM_SERVER_TEST_LIBS=$pkg_cv_FM_SERVER_TEST_LIBS
+        LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
+        LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+        :
+fi
+
+
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GSTREAMER" >&5
+echo $ECHO_N "checking for GSTREAMER... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GSTREAMER_CFLAGS"; then
+        pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+        pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GSTREAMER_LIBS"; then
+        pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+        pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10"`
+        else
+                GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10"`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$GSTREAMER_PKG_ERRORS" >&5
+
+        { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10) were not met:
+
+$GSTREAMER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10) were not met:
+
+$GSTREAMER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+        { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+        GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
+        GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+        :
+fi
+
+
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for SAMPLERATE" >&5
+echo $ECHO_N "checking for SAMPLERATE... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$SAMPLERATE_CFLAGS"; then
+        pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate\"") >&5
+  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+        pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$SAMPLERATE_LIBS"; then
+        pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate\"") >&5
+  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+        pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "samplerate"`
+        else
+                SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate"`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$SAMPLERATE_PKG_ERRORS" >&5
+
+        { { echo "$as_me:$LINENO: error: Package requirements (samplerate) were not met:
+
+$SAMPLERATE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables SAMPLERATE_CFLAGS
+and SAMPLERATE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (samplerate) were not met:
+
+$SAMPLERATE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables SAMPLERATE_CFLAGS
+and SAMPLERATE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+        { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables SAMPLERATE_CFLAGS
+and SAMPLERATE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables SAMPLERATE_CFLAGS
+and SAMPLERATE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+        SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
+        SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
@@ -24948 +25198 @@
 
 pkg_failed=no
+{ echo "$as_me:$LINENO: checking for ALSA" >&5
+echo $ECHO_N "checking for ALSA... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$ALSA_CFLAGS"; then
+        pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
+  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+        pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$ALSA_LIBS"; then
+        pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
+  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+        pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa"`
+        else
+                ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa"`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$ALSA_PKG_ERRORS" >&5
+
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                got_alsa=no
+elif test $pkg_failed = untried; then
+        got_alsa=no
+else
+        ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
+        ALSA_LIBS=$pkg_cv_ALSA_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+        got_alsa=yes
+fi
+
+
+ if test $got_alsa = yes; then
+  HAVE_ALSA_TRUE=
+  HAVE_ALSA_FALSE='#'
+else
+  HAVE_ALSA_TRUE='#'
+  HAVE_ALSA_FALSE=
+fi
+
+if test "$got_alsa" = "yes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ALSA 1
+_ACEOF
+
+fi
+
+
+
+pkg_failed=no
 { echo "$as_me:$LINENO: checking for JACK" >&5
 echo $ECHO_N "checking for JACK... $ECHO_C" >&6; }
@@ -25038 +25378 @@
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for ALSA" >&5
-echo $ECHO_N "checking for ALSA... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for PULSE" >&5
+echo $ECHO_N "checking for PULSE... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$ALSA_CFLAGS"; then
-        pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+    if test -n "$PULSE_CFLAGS"; then
+        pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
+  pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse" 2>/dev/null`
 else
   pkg_failed=yes
@@ -25060 +25400 @@
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$ALSA_LIBS"; then
-        pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+    if test -n "$PULSE_LIBS"; then
+        pkg_cv_PULSE_LIBS="$PULSE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
+  pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse" 2>/dev/null`
 else
   pkg_failed=yes
@@ -25088 +25428 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
-                ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa"`
+                PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse"`
         else
-                ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa"`
+                PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse"`
         fi
         # Put the nasty error message in config.log where it belongs
-        echo "$ALSA_PKG_ERRORS" >&5
+        echo "$PULSE_PKG_ERRORS" >&5
 
         { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                got_alsa=no
+                got_pulse=no
 elif test $pkg_failed = untried; then
-        got_alsa=no
-else
-        ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
-        ALSA_LIBS=$pkg_cv_ALSA_LIBS
+        got_pulse=no
+else
+        PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
+        PULSE_LIBS=$pkg_cv_PULSE_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-        got_alsa=yes
-fi
-
-
- if test $got_alsa = yes; then
-  HAVE_ALSA_TRUE=
-  HAVE_ALSA_FALSE='#'
-else
-  HAVE_ALSA_TRUE='#'
-  HAVE_ALSA_FALSE=
-fi
-
-if test "$got_alsa" = "yes"; then
+        got_pulse=yes
+fi
+
+
+ if test $got_pulse = yes; then
+  HAVE_PULSE_TRUE=
+  HAVE_PULSE_FALSE='#'
+else
+  HAVE_PULSE_TRUE='#'
+  HAVE_PULSE_FALSE=
+fi
+
+if test "$got_pulse" = "yes"; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_ALSA 1
+#define HAVE_PULSE 1
 _ACEOF
 
@@ -25569 +25909 @@
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${HAVE_JACK_TRUE}" && test -z "${HAVE_JACK_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"HAVE_JACK\" was never defined.
@@ -25576 +25923 @@
    { (exit 1); exit 1; }; }
 fi
-if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
+if test -z "${HAVE_PULSE_TRUE}" && test -z "${HAVE_PULSE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_PULSE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
+echo "$as_me: error: conditional \"HAVE_PULSE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -26291 +26638 @@
 LIBOBJS!$LIBOBJS$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
-FM_SERVER_CFLAGS!$FM_SERVER_CFLAGS$ac_delim
-FM_SERVER_LIBS!$FM_SERVER_LIBS$ac_delim
-FM_SERVER_TEST_CFLAGS!$FM_SERVER_TEST_CFLAGS$ac_delim
-FM_SERVER_TEST_LIBS!$FM_SERVER_TEST_LIBS$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
+LIBXML_LIBS!$LIBXML_LIBS$ac_delim
+GSTREAMER_CFLAGS!$GSTREAMER_CFLAGS$ac_delim
+GSTREAMER_LIBS!$GSTREAMER_LIBS$ac_delim
+SAMPLERATE_CFLAGS!$SAMPLERATE_CFLAGS$ac_delim
+SAMPLERATE_LIBS!$SAMPLERATE_LIBS$ac_delim
 RGC_SERVER_CFLAGS!$RGC_SERVER_CFLAGS$ac_delim
 RGC_SERVER_LIBS!$RGC_SERVER_LIBS$ac_delim
 RGC_CLIENT_CFLAGS!$RGC_CLIENT_CFLAGS$ac_delim
 RGC_CLIENT_LIBS!$RGC_CLIENT_LIBS$ac_delim
+ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
+ALSA_LIBS!$ALSA_LIBS$ac_delim
+HAVE_ALSA_TRUE!$HAVE_ALSA_TRUE$ac_delim
+HAVE_ALSA_FALSE!$HAVE_ALSA_FALSE$ac_delim
 JACK_CFLAGS!$JACK_CFLAGS$ac_delim
 JACK_LIBS!$JACK_LIBS$ac_delim
 HAVE_JACK_TRUE!$HAVE_JACK_TRUE$ac_delim
 HAVE_JACK_FALSE!$HAVE_JACK_FALSE$ac_delim
-ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
-ALSA_LIBS!$ALSA_LIBS$ac_delim
-HAVE_ALSA_TRUE!$HAVE_ALSA_TRUE$ac_delim
-HAVE_ALSA_FALSE!$HAVE_ALSA_FALSE$ac_delim
+PULSE_CFLAGS!$PULSE_CFLAGS$ac_delim
+PULSE_LIBS!$PULSE_LIBS$ac_delim
+HAVE_PULSE_TRUE!$HAVE_PULSE_TRUE$ac_delim
+HAVE_PULSE_FALSE!$HAVE_PULSE_FALSE$ac_delim
 NO_PREFIX_PACKAGE_DATA_DIR!$NO_PREFIX_PACKAGE_DATA_DIR$ac_delim
 PACKAGE_DATA_DIR!$PACKAGE_DATA_DIR$ac_delim
@@ -26320 +26675 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     break
   elif $ac_last_try; then
@@ -27037 +27392 @@
 echo ""
 echo ""
+echo "Optional components:"
+if test "$got_jack" = "yes"; then
+echo "        JACK output plugin:       yes"
+else
+echo "        JACK output plugin:       no"
+fi
+if test "$got_alsa" = "yes"; then
+echo "        ALSA output plugin:       yes"
+else
+echo "        ALSA output plugin:       no"
+fi
+if test "$got_pulse" = "yes"; then
+echo "        PulseAudio output plugin: yes"
+else
+echo "        PulseAudio output plugin: no"
+fi
+echo ""
 echo "Build options:"
-if test "$got_jack" = "yes"; then
-echo "        JACK output: yes"
-else
-echo "        JACK output: no"
-fi
-if test "$got_alsa" = "yes"; then
-echo "        ALSA output: yes"
-else
-echo "        ALSA output: no"
-fi
+echo "        CFLAGS: ${CFLAGS}"
 echo ""
 echo "Installation options:"
 echo "        fm_server will be installed to ${prefix}"
-echo "        CFLAGS: ${CFLAGS}"
 echo ""
 

trunk/fm_server/configure.ac

@@ -50 +50 @@
 
 # Check for dependencies
-PKG_CHECK_MODULES(FM_SERVER, glib-2.0 gthread-2.0 gobject-2.0 samplerate gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10)
-AC_SUBST(FM_SERVER_LIBS)
-AC_SUBST(FM_SERVER_CFLAGS)
-
-PKG_CHECK_MODULES(FM_SERVER_TEST, glib-2.0 gthread-2.0 gobject-2.0)
-AC_SUBST(FM_SERVER_TEST_CFLAGS)
-AC_SUBST(FM_SERVER_TEST_LIBS)
+PKG_CHECK_MODULES(GLIB, glib-2.0 gthread-2.0 gobject-2.0)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
+
+PKG_CHECK_MODULES(LIBXML, libxml-2.0)
+AC_SUBST(LIBXML_LIBS)
+AC_SUBST(LIBXML_CFLAGS)
+
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10)
+AC_SUBST(GSTREAMER_LIBS)
+AC_SUBST(GSTREAMER_CFLAGS)
+
+PKG_CHECK_MODULES(SAMPLERATE, samplerate)
+AC_SUBST(SAMPLERATE_LIBS)
+AC_SUBST(SAMPLERATE_CFLAGS)
 
 PKG_CHECK_MODULES(RGC_SERVER, rgc_server)
@@ -65 +73 @@
 AC_SUBST(RGC_CLIENT_LIBS)
 AC_SUBST(RGC_CLIENT_CFLAGS)
+
+
+PKG_CHECK_MODULES(ALSA, alsa, got_alsa=yes, got_alsa=no)
+AC_SUBST(ALSA_LIBS)
+AC_SUBST(ALSA_CFLAGS)
+AM_CONDITIONAL(HAVE_ALSA, test $got_alsa = yes)
+if test "$got_alsa" = "yes"; then
+        AC_DEFINE_UNQUOTED(HAVE_ALSA, 1, [ ALSA is available. ])
+fi
 
 
@@ -76 +93 @@
 
 
-PKG_CHECK_MODULES(ALSA, alsa, got_alsa=yes, got_alsa=no)
-AC_SUBST(ALSA_LIBS)
-AC_SUBST(ALSA_CFLAGS)
-AM_CONDITIONAL(HAVE_ALSA, test $got_alsa = yes)
-if test "$got_alsa" = "yes"; then
-        AC_DEFINE_UNQUOTED(HAVE_ALSA, 1, [ ALSA is available. ])
+PKG_CHECK_MODULES(PULSE, libpulse, got_pulse=yes, got_pulse=no)
+AC_SUBST(PULSE_LIBS)
+AC_SUBST(PULSE_CFLAGS)
+AM_CONDITIONAL(HAVE_PULSE, test $got_pulse = yes)
+if test "$got_pulse" = "yes"; then
+        AC_DEFINE_UNQUOTED(HAVE_PULSE, 1, [ PulseAudio is available. ])
 fi
 
@@ -194 +211 @@
 echo ""
 echo ""
+echo "Optional components:"
+if test "$got_jack" = "yes"; then
+echo "        JACK output plugin:       yes"
+else
+echo "        JACK output plugin:       no"
+fi
+if test "$got_alsa" = "yes"; then
+echo "        ALSA output plugin:       yes"
+else
+echo "        ALSA output plugin:       no"
+fi
+if test "$got_pulse" = "yes"; then
+echo "        PulseAudio output plugin: yes"
+else
+echo "        PulseAudio output plugin: no"
+fi
+echo ""
 echo "Build options:"
-if test "$got_jack" = "yes"; then
-echo "        JACK output: yes"
-else
-echo "        JACK output: no"
-fi
-if test "$got_alsa" = "yes"; then
-echo "        ALSA output: yes"
-else
-echo "        ALSA output: no"
-fi
+echo "        CFLAGS: ${CFLAGS}"
 echo ""
 echo "Installation options:"
 echo "        fm_server will be installed to ${prefix}"
-echo "        CFLAGS: ${CFLAGS}"
-echo ""
-
+echo ""
+

trunk/fm_server/src/Makefile.am

@@ -2 +2 @@
 
 
-AM_CPPFLAGS = $(FM_SERVER_CFLAGS) \
+AM_CPPFLAGS = $(GLIB_CFLAGS) \
         $(RGC_SERVER_CFLAGS)
 
@@ -33 +33 @@
         fm_input_test.c\
         fm_input_test.h\
-        fm_input_cdj.c\
-        fm_input_cdj.h\
         fm_marshal.c\
         fm_marshal.h\
         fm_effect_gain.c\
         fm_effect_gain.h\
-        fm_effect_rate.c\
-        fm_effect_rate.h\
         fm_mixer.c\
         fm_mixer.h\
@@ -57 +53 @@
 
 fm_server_LDADD = \
-        $(FM_SERVER_LIBS) \
+        $(GLIB_LIBS) \
         $(RGC_SERVER_LIBS) \
         fm_input_gst/libfm_input_gst.la \
@@ -63 +59 @@
 
 
+noinst_LTLIBRARIES =
+
+
+## Plugins listed here...
+
+noinst_LTLIBRARIES += libfm_effect_rate.la
+
+libfm_effect_rate_la_SOURCES = fm_effect_rate.c fm_effect_rate.h
+libfm_effect_rate_la_CFLAGS = $(SAMPLERATE_CFLAGS)
+libfm_effect_rate_la_LIBADD = $(SAMPLERATE_LIBS)
+
+fm_server_LDADD += libfm_effect_rate.la
+
+
+noinst_LTLIBRARIES += libfm_input_cdj.la
+
+libfm_input_cdj_la_SOURCES = fm_input_cdj.c fm_input_cdj.h
+libfm_input_cdj_la_CFLAGS = $(GSTREAMER_CFLAGS) $(LIBXML_CFLAGS)
+libfm_input_cdj_la_LIBADD = $(GSTREAMER_LIBS) $(LIBXML_CFLAGS)
+
+fm_server_LDADD += libfm_input_cdj.la
+
+
 if HAVE_ALSA
-fm_server_SOURCES += \
-        fm_output_alsa.c \
-        fm_output_alsa.h
+noinst_LTLIBRARIES += libfm_server_alsa.la
 
-fm_server_INCLUDES += $(ALSA_CFLAGS)
+libfm_server_alsa_la_SOURCES = fm_output_alsa.c fm_output_alsa.h
+libfm_server_alsa_la_CFLAGS = $(ALSA_CFLAGS)
+libfm_server_alsa_la_LIBADD = $(ALSA_LIBS)
 
-fm_server_LDADD += $(ALSA_LIBS) 
+fm_server_LDADD += libfm_server_alsa.la
 endif
 
 
 if HAVE_JACK
-fm_server_SOURCES += \
-        fm_output_jack.c \
-        fm_output_jack.h
+noinst_LTLIBRARIES += libfm_server_jack.la
 
-fm_server_INCLUDES += $(JACK_CFLAGS)
+libfm_server_jack_la_SOURCES = fm_output_jack.c fm_output_jack.h
+libfm_server_jack_la_CFLAGS = $(JACK_CFLAGS)
+libfm_server_jack_la_LIBADD = $(JACK_LIBS)
 
-fm_server_LDADD += $(JACK_LIBS)
+fm_server_LDADD += libfm_server_jack.la
 endif
+
+
+if HAVE_PULSE
+noinst_LTLIBRARIES += libfm_server_pulse.la
+
+libfm_server_pulse_la_SOURCES = fm_output_pulse.c fm_output_pulse.h
+libfm_server_pulse_la_CFLAGS = $(PULSE_CFLAGS)
+libfm_server_pulse_la_LIBADD = $(PULSE_LIBS)
+
+fm_server_LDADD += libfm_server_pulse.la
+endif

trunk/fm_server/src/Makefile.in

@@ -14 +14 @@
 
 @SET_MAKE@
+
 
 VPATH = @srcdir@
@@ -34 +35 @@
 host_triplet = @host@
 bin_PROGRAMS = fm_server$(EXEEXT)
-@HAVE_ALSA_TRUE@am__append_1 = \
-@HAVE_ALSA_TRUE@        fm_output_alsa.c \
-@HAVE_ALSA_TRUE@        fm_output_alsa.h
-
-@HAVE_ALSA_TRUE@am__append_2 = $(ALSA_CFLAGS)
-@HAVE_ALSA_TRUE@am__append_3 = $(ALSA_LIBS)     
-@HAVE_JACK_TRUE@am__append_4 = \
-@HAVE_JACK_TRUE@        fm_output_jack.c \
-@HAVE_JACK_TRUE@        fm_output_jack.h
-
-@HAVE_JACK_TRUE@am__append_5 = $(JACK_CFLAGS)
-@HAVE_JACK_TRUE@am__append_6 = $(JACK_LIBS)
+@HAVE_ALSA_TRUE@am__append_1 = libfm_server_alsa.la
+@HAVE_ALSA_TRUE@am__append_2 = libfm_server_alsa.la
+@HAVE_JACK_TRUE@am__append_3 = libfm_server_jack.la
+@HAVE_JACK_TRUE@am__append_4 = libfm_server_jack.la
+@HAVE_PULSE_TRUE@am__append_5 = libfm_server_pulse.la
+@HAVE_PULSE_TRUE@am__append_6 = libfm_server_pulse.la
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -60 +55 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libfm_effect_rate_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libfm_effect_rate_la_OBJECTS =  \
+        libfm_effect_rate_la-fm_effect_rate.lo
+libfm_effect_rate_la_OBJECTS = $(am_libfm_effect_rate_la_OBJECTS)
+libfm_effect_rate_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(libfm_effect_rate_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+libfm_input_cdj_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+        $(am__DEPENDENCIES_1)
+am_libfm_input_cdj_la_OBJECTS = libfm_input_cdj_la-fm_input_cdj.lo
+libfm_input_cdj_la_OBJECTS = $(am_libfm_input_cdj_la_OBJECTS)
+libfm_input_cdj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(libfm_input_cdj_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+@HAVE_ALSA_TRUE@libfm_server_alsa_la_DEPENDENCIES =  \
+@HAVE_ALSA_TRUE@        $(am__DEPENDENCIES_1)
+am__libfm_server_alsa_la_SOURCES_DIST = fm_output_alsa.c \
+        fm_output_alsa.h
+@HAVE_ALSA_TRUE@am_libfm_server_alsa_la_OBJECTS =  \
+@HAVE_ALSA_TRUE@        libfm_server_alsa_la-fm_output_alsa.lo
+libfm_server_alsa_la_OBJECTS = $(am_libfm_server_alsa_la_OBJECTS)
+libfm_server_alsa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(libfm_server_alsa_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+@HAVE_ALSA_TRUE@am_libfm_server_alsa_la_rpath =
+@HAVE_JACK_TRUE@libfm_server_jack_la_DEPENDENCIES =  \
+@HAVE_JACK_TRUE@        $(am__DEPENDENCIES_1)
+am__libfm_server_jack_la_SOURCES_DIST = fm_output_jack.c \
+        fm_output_jack.h
+@HAVE_JACK_TRUE@am_libfm_server_jack_la_OBJECTS =  \
+@HAVE_JACK_TRUE@        libfm_server_jack_la-fm_output_jack.lo
+libfm_server_jack_la_OBJECTS = $(am_libfm_server_jack_la_OBJECTS)
+libfm_server_jack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(libfm_server_jack_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+@HAVE_JACK_TRUE@am_libfm_server_jack_la_rpath =
+@HAVE_PULSE_TRUE@libfm_server_pulse_la_DEPENDENCIES =  \
+@HAVE_PULSE_TRUE@       $(am__DEPENDENCIES_1)
+am__libfm_server_pulse_la_SOURCES_DIST = fm_output_pulse.c \
+        fm_output_pulse.h
+@HAVE_PULSE_TRUE@am_libfm_server_pulse_la_OBJECTS =  \
+@HAVE_PULSE_TRUE@       libfm_server_pulse_la-fm_output_pulse.lo
+libfm_server_pulse_la_OBJECTS = $(am_libfm_server_pulse_la_OBJECTS)
+libfm_server_pulse_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(libfm_server_pulse_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+        $(LDFLAGS) -o $@
+@HAVE_PULSE_TRUE@am_libfm_server_pulse_la_rpath =
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__fm_server_SOURCES_DIST = main.c common.h types.h fm_utils.c \
-        fm_utils.h src_type_conv.c src_type_conv.h fm_input.c \
-        fm_input.h fm_output.c fm_output.h fm_effect.c fm_effect.h \
-        fm_element.c fm_element.h fm_sync.c fm_sync.h fm_pipeline.c \
-        fm_pipeline.h fm_input_test.c fm_input_test.h fm_input_cdj.c \
-        fm_input_cdj.h fm_marshal.c fm_marshal.h fm_effect_gain.c \
-        fm_effect_gain.h fm_effect_rate.c fm_effect_rate.h fm_mixer.c \
-        fm_mixer.h fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
-        fm_effect_pan.c fm_effect_pan.h fm_level_meter.c \
-        fm_level_meter.h fm_output_alsa.c fm_output_alsa.h \
-        fm_output_jack.c fm_output_jack.h
-@HAVE_ALSA_TRUE@am__objects_1 = fm_output_alsa.$(OBJEXT)
-@HAVE_JACK_TRUE@am__objects_2 = fm_output_jack.$(OBJEXT)
 am_fm_server_OBJECTS = main.$(OBJEXT) fm_utils.$(OBJEXT) \
         src_type_conv.$(OBJEXT) fm_input.$(OBJEXT) fm_output.$(OBJEXT) \
         fm_effect.$(OBJEXT) fm_element.$(OBJEXT) fm_sync.$(OBJEXT) \
         fm_pipeline.$(OBJEXT) fm_input_test.$(OBJEXT) \
-        fm_input_cdj.$(OBJEXT) fm_marshal.$(OBJEXT) \
-        fm_effect_gain.$(OBJEXT) fm_effect_rate.$(OBJEXT) \
+        fm_marshal.$(OBJEXT) fm_effect_gain.$(OBJEXT) \
         fm_mixer.$(OBJEXT) fm_djmixer.$(OBJEXT) fm_buffer.$(OBJEXT) \
-        fm_effect_pan.$(OBJEXT) fm_level_meter.$(OBJEXT) \
-        $(am__objects_1) $(am__objects_2)
+        fm_effect_pan.$(OBJEXT) fm_level_meter.$(OBJEXT)
 fm_server_OBJECTS = $(am_fm_server_OBJECTS)
-am__DEPENDENCIES_1 =
-@HAVE_ALSA_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@HAVE_JACK_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 fm_server_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
         fm_input_gst/libfm_input_gst.la fm_song_db/libfm_song_db.la \
-        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
+        libfm_effect_rate.la libfm_input_cdj.la $(am__append_2) \
+        $(am__append_4) $(am__append_6)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -104 +136 @@
         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
         $(LDFLAGS) -o $@
-SOURCES = $(fm_server_SOURCES)
-DIST_SOURCES = $(am__fm_server_SOURCES_DIST)
+SOURCES = $(libfm_effect_rate_la_SOURCES) \
+        $(libfm_input_cdj_la_SOURCES) $(libfm_server_alsa_la_SOURCES) \
+        $(libfm_server_jack_la_SOURCES) \
+        $(libfm_server_pulse_la_SOURCES) $(fm_server_SOURCES)
+DIST_SOURCES = $(libfm_effect_rate_la_SOURCES) \
+        $(libfm_input_cdj_la_SOURCES) \
+        $(am__libfm_server_alsa_la_SOURCES_DIST) \
+        $(am__libfm_server_jack_la_SOURCES_DIST) \
+        $(am__libfm_server_pulse_la_SOURCES_DIST) $(fm_server_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
         html-recursive info-recursive install-data-recursive \
@@ -150 +189 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
-FM_SERVER_CFLAGS = @FM_SERVER_CFLAGS@
-FM_SERVER_LIBS = @FM_SERVER_LIBS@
-FM_SERVER_TEST_CFLAGS = @FM_SERVER_TEST_CFLAGS@
-FM_SERVER_TEST_LIBS = @FM_SERVER_TEST_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -172 +211 @@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -202 +243 @@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
 RANLIB = @RANLIB@
 RGC_CLIENT_CFLAGS = @RGC_CLIENT_CFLAGS@
@@ -207 +250 @@
 RGC_SERVER_CFLAGS = @RGC_SERVER_CFLAGS@
 RGC_SERVER_LIBS = @RGC_SERVER_LIBS@
+SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -267 +312 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = fm_input_gst fm_song_db
-AM_CPPFLAGS = $(FM_SERVER_CFLAGS) \
+AM_CPPFLAGS = $(GLIB_CFLAGS) \
         $(RGC_SERVER_CFLAGS)
 
-fm_server_SOURCES = main.c common.h types.h fm_utils.c fm_utils.h \
-        src_type_conv.c src_type_conv.h fm_input.c fm_input.h \
-        fm_output.c fm_output.h fm_effect.c fm_effect.h fm_element.c \
-        fm_element.h fm_sync.c fm_sync.h fm_pipeline.c fm_pipeline.h \
-        fm_input_test.c fm_input_test.h fm_input_cdj.c fm_input_cdj.h \
-        fm_marshal.c fm_marshal.h fm_effect_gain.c fm_effect_gain.h \
-        fm_effect_rate.c fm_effect_rate.h fm_mixer.c fm_mixer.h \
-        fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
-        fm_effect_pan.c fm_effect_pan.h fm_level_meter.c \
-        fm_level_meter.h $(am__append_1) $(am__append_4)
-fm_server_INCLUDES = $(am__append_2) $(am__append_5)
-fm_server_LDADD = $(FM_SERVER_LIBS) $(RGC_SERVER_LIBS) \
+fm_server_SOURCES = \
+        main.c\
+        common.h\
+        types.h\
+        fm_utils.c\
+        fm_utils.h\
+        src_type_conv.c\
+        src_type_conv.h\
+        fm_input.c\
+        fm_input.h\
+        fm_output.c\
+        fm_output.h\
+        fm_effect.c\
+        fm_effect.h\
+        fm_element.c\
+        fm_element.h\
+        fm_sync.c\
+        fm_sync.h\
+        fm_pipeline.c\
+        fm_pipeline.h\
+        fm_input_test.c\
+        fm_input_test.h\
+        fm_marshal.c\
+        fm_marshal.h\
+        fm_effect_gain.c\
+        fm_effect_gain.h\
+        fm_mixer.c\
+        fm_mixer.h\
+        fm_djmixer.c\
+        fm_djmixer.h\
+        fm_buffer.c\
+        fm_buffer.h\
+        fm_effect_pan.c\
+        fm_effect_pan.h\
+        fm_level_meter.c\
+        fm_level_meter.h
+
+fm_server_INCLUDES = 
+fm_server_LDADD = $(GLIB_LIBS) $(RGC_SERVER_LIBS) \
         fm_input_gst/libfm_input_gst.la fm_song_db/libfm_song_db.la \
-        $(am__append_3) $(am__append_6)
+        libfm_effect_rate.la libfm_input_cdj.la $(am__append_2) \
+        $(am__append_4) $(am__append_6)
+noinst_LTLIBRARIES = libfm_effect_rate.la libfm_input_cdj.la \
+        $(am__append_1) $(am__append_3) $(am__append_5)
+libfm_effect_rate_la_SOURCES = fm_effect_rate.c fm_effect_rate.h
+libfm_effect_rate_la_CFLAGS = $(SAMPLERATE_CFLAGS)
+libfm_effect_rate_la_LIBADD = $(SAMPLERATE_LIBS)
+libfm_input_cdj_la_SOURCES = fm_input_cdj.c fm_input_cdj.h
+libfm_input_cdj_la_CFLAGS = $(GSTREAMER_CFLAGS) $(LIBXML_CFLAGS)
+libfm_input_cdj_la_LIBADD = $(GSTREAMER_LIBS) $(LIBXML_CFLAGS)
+@HAVE_ALSA_TRUE@libfm_server_alsa_la_SOURCES = fm_output_alsa.c fm_output_alsa.h
+@HAVE_ALSA_TRUE@libfm_server_alsa_la_CFLAGS = $(ALSA_CFLAGS)
+@HAVE_ALSA_TRUE@libfm_server_alsa_la_LIBADD = $(ALSA_LIBS)
+@HAVE_JACK_TRUE@libfm_server_jack_la_SOURCES = fm_output_jack.c fm_output_jack.h
+@HAVE_JACK_TRUE@libfm_server_jack_la_CFLAGS = $(JACK_CFLAGS)
+@HAVE_JACK_TRUE@libfm_server_jack_la_LIBADD = $(JACK_LIBS)
+@HAVE_PULSE_TRUE@libfm_server_pulse_la_SOURCES = fm_output_pulse.c fm_output_pulse.h
+@HAVE_PULSE_TRUE@libfm_server_pulse_la_CFLAGS = $(PULSE_CFLAGS)
+@HAVE_PULSE_TRUE@libfm_server_pulse_la_LIBADD = $(PULSE_LIBS)
 all: all-recursive
 
@@ -317 +407 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+          test "$$dir" != "$$p" || dir=.; \
+          echo "rm -f \"$${dir}/so_locations\""; \
+          rm -f "$${dir}/so_locations"; \
+        done
+libfm_effect_rate.la: $(libfm_effect_rate_la_OBJECTS) $(libfm_effect_rate_la_DEPENDENCIES) 
+        $(libfm_effect_rate_la_LINK)  $(libfm_effect_rate_la_OBJECTS) $(libfm_effect_rate_la_LIBADD) $(LIBS)
+libfm_input_cdj.la: $(libfm_input_cdj_la_OBJECTS) $(libfm_input_cdj_la_DEPENDENCIES) 
+        $(libfm_input_cdj_la_LINK)  $(libfm_input_cdj_la_OBJECTS) $(libfm_input_cdj_la_LIBADD) $(LIBS)
+libfm_server_alsa.la: $(libfm_server_alsa_la_OBJECTS) $(libfm_server_alsa_la_DEPENDENCIES) 
+        $(libfm_server_alsa_la_LINK) $(am_libfm_server_alsa_la_rpath) $(libfm_server_alsa_la_OBJECTS) $(libfm_server_alsa_la_LIBADD) $(LIBS)
+libfm_server_jack.la: $(libfm_server_jack_la_OBJECTS) $(libfm_server_jack_la_DEPENDENCIES) 
+        $(libfm_server_jack_la_LINK) $(am_libfm_server_jack_la_rpath) $(libfm_server_jack_la_OBJECTS) $(libfm_server_jack_la_LIBADD) $(LIBS)
+libfm_server_pulse.la: $(libfm_server_pulse_la_OBJECTS) $(libfm_server_pulse_la_DEPENDENCIES) 
+        $(libfm_server_pulse_la_LINK) $(am_libfm_server_pulse_la_rpath) $(libfm_server_pulse_la_OBJECTS) $(libfm_server_pulse_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
@@ -360 +469 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_effect_gain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_effect_pan.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_effect_rate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_element.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_input.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_input_cdj.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_input_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_level_meter.Po@am__quote@
@@ -369 +476 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_mixer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output_alsa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output_jack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_pipeline.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_sync.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfm_effect_rate_la-fm_effect_rate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfm_input_cdj_la-fm_input_cdj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfm_server_alsa_la-fm_output_alsa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfm_server_jack_la-fm_output_jack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfm_server_pulse_la-fm_output_pulse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/src_type_conv.Po@am__quote@
@@ -397 +507 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
+
+libfm_effect_rate_la-fm_effect_rate.lo: fm_effect_rate.c
+@am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_effect_rate_la_CFLAGS) $(CFLAGS) -MT libfm_effect_rate_la-fm_effect_rate.lo -MD -MP -MF $(DEPDIR)/libfm_effect_rate_la-fm_effect_rate.Tpo -c -o libfm_effect_rate_la-fm_effect_rate.lo `test -f 'fm_effect_rate.c' || echo '$(srcdir)/'`fm_effect_rate.c
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libfm_effect_rate_la-fm_effect_rate.Tpo $(DEPDIR)/libfm_effect_rate_la-fm_effect_rate.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='fm_effect_rate.c' object='libfm_effect_rate_la-fm_effect_rate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_effect_rate_la_CFLAGS) $(CFLAGS) -c -o libfm_effect_rate_la-fm_effect_rate.lo `test -f 'fm_effect_rate.c' || echo '$(srcdir)/'`fm_effect_rate.c
+
+libfm_input_cdj_la-fm_input_cdj.lo: fm_input_cdj.c
+@am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_input_cdj_la_CFLAGS) $(CFLAGS) -MT libfm_input_cdj_la-fm_input_cdj.lo -MD -MP -MF $(DEPDIR)/libfm_input_cdj_la-fm_input_cdj.Tpo -c -o libfm_input_cdj_la-fm_input_cdj.lo `test -f 'fm_input_cdj.c' || echo '$(srcdir)/'`fm_input_cdj.c
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libfm_input_cdj_la-fm_input_cdj.Tpo $(DEPDIR)/libfm_input_cdj_la-fm_input_cdj.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='fm_input_cdj.c' object='libfm_input_cdj_la-fm_input_cdj.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_input_cdj_la_CFLAGS) $(CFLAGS) -c -o libfm_input_cdj_la-fm_input_cdj.lo `test -f 'fm_input_cdj.c' || echo '$(srcdir)/'`fm_input_cdj.c
+
+libfm_server_alsa_la-fm_output_alsa.lo: fm_output_alsa.c
+@am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_server_alsa_la_CFLAGS) $(CFLAGS) -MT libfm_server_alsa_la-fm_output_alsa.lo -MD -MP -MF $(DEPDIR)/libfm_server_alsa_la-fm_output_alsa.Tpo -c -o libfm_server_alsa_la-fm_output_alsa.lo `test -f 'fm_output_alsa.c' || echo '$(srcdir)/'`fm_output_alsa.c
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libfm_server_alsa_la-fm_output_alsa.Tpo $(DEPDIR)/libfm_server_alsa_la-fm_output_alsa.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='fm_output_alsa.c' object='libfm_server_alsa_la-fm_output_alsa.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_server_alsa_la_CFLAGS) $(CFLAGS) -c -o libfm_server_alsa_la-fm_output_alsa.lo `test -f 'fm_output_alsa.c' || echo '$(srcdir)/'`fm_output_alsa.c
+
+libfm_server_jack_la-fm_output_jack.lo: fm_output_jack.c
+@am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_server_jack_la_CFLAGS) $(CFLAGS) -MT libfm_server_jack_la-fm_output_jack.lo -MD -MP -MF $(DEPDIR)/libfm_server_jack_la-fm_output_jack.Tpo -c -o libfm_server_jack_la-fm_output_jack.lo `test -f 'fm_output_jack.c' || echo '$(srcdir)/'`fm_output_jack.c
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libfm_server_jack_la-fm_output_jack.Tpo $(DEPDIR)/libfm_server_jack_la-fm_output_jack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='fm_output_jack.c' object='libfm_server_jack_la-fm_output_jack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_server_jack_la_CFLAGS) $(CFLAGS) -c -o libfm_server_jack_la-fm_output_jack.lo `test -f 'fm_output_jack.c' || echo '$(srcdir)/'`fm_output_jack.c
+
+libfm_server_pulse_la-fm_output_pulse.lo: fm_output_pulse.c
+@am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_server_pulse_la_CFLAGS) $(CFLAGS) -MT libfm_server_pulse_la-fm_output_pulse.lo -MD -MP -MF $(DEPDIR)/libfm_server_pulse_la-fm_output_pulse.Tpo -c -o libfm_server_pulse_la-fm_output_pulse.lo `test -f 'fm_output_pulse.c' || echo '$(srcdir)/'`fm_output_pulse.c
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libfm_server_pulse_la-fm_output_pulse.Tpo $(DEPDIR)/libfm_server_pulse_la-fm_output_pulse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='fm_output_pulse.c' object='libfm_server_pulse_la-fm_output_pulse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_server_pulse_la_CFLAGS) $(CFLAGS) -c -o libfm_server_pulse_la-fm_output_pulse.lo `test -f 'fm_output_pulse.c' || echo '$(srcdir)/'`fm_output_pulse.c
 
 mostlyclean-libtool:
@@ -580 +725 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
@@ -612 +757 @@
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+        clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
@@ -673 +819 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
         all all-am check check-am clean clean-binPROGRAMS \
-        clean-generic clean-libtool ctags ctags-recursive distclean \
-        distclean-compile distclean-generic distclean-libtool \
-        distclean-tags distdir dvi dvi-am html html-am info info-am \
-        install install-am install-binPROGRAMS install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs installdirs-am maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags tags-recursive uninstall uninstall-am \
+        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
+        ctags-recursive distclean distclean-compile distclean-generic \
+        distclean-libtool distclean-tags distdir dvi dvi-am html \
+        html-am info info-am install install-am install-binPROGRAMS \
+        install-data install-data-am install-dvi install-dvi-am \
+        install-exec install-exec-am install-html install-html-am \
+        install-info install-info-am install-man install-pdf \
+        install-pdf-am install-ps install-ps-am install-strip \
+        installcheck installcheck-am installdirs installdirs-am \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
         uninstall-binPROGRAMS
 

trunk/fm_server/src/fm_input_gst/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = $(FM_SERVER_CFLAGS) \
+AM_CPPFLAGS = \
+        $(GLIB_CFLAGS) \
+        $(GSTREAMER_CFLAGS) \
         $(RGC_SERVER_CFLAGS)
 
@@ -17 +19 @@
 
 
-libfm_input_gst_la_LIBADD = $(FM_SERVER_LIBS) \
+libfm_input_gst_la_LIBADD = \
+        $(GLIB_LIBS) \
+        $(GSTREAMER_LIBS) \
         $(RGC_SERVER_LIBS)

trunk/fm_server/src/fm_input_gst/Makefile.in

@@ -50 +50 @@
 am__DEPENDENCIES_1 =
 libfm_input_gst_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-        $(am__DEPENDENCIES_1)
+        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libfm_input_gst_la_OBJECTS = jack_ringbuffer.lo fm_input_gst.lo \
         gstfmsink.lo fm_input_gst_common.lo
@@ -102 +102 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
-FM_SERVER_CFLAGS = @FM_SERVER_CFLAGS@
-FM_SERVER_LIBS = @FM_SERVER_LIBS@
-FM_SERVER_TEST_CFLAGS = @FM_SERVER_TEST_CFLAGS@
-FM_SERVER_TEST_LIBS = @FM_SERVER_TEST_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -124 +124 @@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -154 +156 @@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
 RANLIB = @RANLIB@
 RGC_CLIENT_CFLAGS = @RGC_CLIENT_CFLAGS@
@@ -159 +163 @@
 RGC_SERVER_CFLAGS = @RGC_SERVER_CFLAGS@
 RGC_SERVER_LIBS = @RGC_SERVER_LIBS@
+SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -218 +224 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = $(FM_SERVER_CFLAGS) \
+AM_CPPFLAGS = \
+        $(GLIB_CFLAGS) \
+        $(GSTREAMER_CFLAGS) \
         $(RGC_SERVER_CFLAGS)
 
@@ -232 +240 @@
         fm_input_gst_common.c 
 
-libfm_input_gst_la_LIBADD = $(FM_SERVER_LIBS) \
+libfm_input_gst_la_LIBADD = \
+        $(GLIB_LIBS) \
+        $(GSTREAMER_LIBS) \
         $(RGC_SERVER_LIBS)
 

trunk/fm_server/src/fm_song_db/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = $(FM_SERVER_CFLAGS) \
+AM_CPPFLAGS = \
+        $(GLIB_CFLAGS) \
+        $(LIBXML_CFLAGS) \
         $(RGC_SERVER_CFLAGS)
 
@@ -13 +15 @@
 
 
-libfm_song_db_la_LIBADD = $(FM_SERVER_LIBS) \
+libfm_song_db_la_LIBADD = \
+        $(GLIB_LIBS) \
+        $(LIBXML_LIBS) \
         $(RGC_SERVER_LIBS)

trunk/fm_server/src/fm_song_db/Makefile.in

@@ -50 +50 @@
 am__DEPENDENCIES_1 =
 libfm_song_db_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-        $(am__DEPENDENCIES_1)
+        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libfm_song_db_la_OBJECTS = fm_song_db.lo fm_xml_db.lo
 libfm_song_db_la_OBJECTS = $(am_libfm_song_db_la_OBJECTS)
@@ -101 +101 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
-FM_SERVER_CFLAGS = @FM_SERVER_CFLAGS@
-FM_SERVER_LIBS = @FM_SERVER_LIBS@
-FM_SERVER_TEST_CFLAGS = @FM_SERVER_TEST_CFLAGS@
-FM_SERVER_TEST_LIBS = @FM_SERVER_TEST_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -123 +123 @@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -153 +155 @@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
 RANLIB = @RANLIB@
 RGC_CLIENT_CFLAGS = @RGC_CLIENT_CFLAGS@
@@ -158 +162 @@
 RGC_SERVER_CFLAGS = @RGC_SERVER_CFLAGS@
 RGC_SERVER_LIBS = @RGC_SERVER_LIBS@
+SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -217 +223 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = $(FM_SERVER_CFLAGS) \
+AM_CPPFLAGS = \
+        $(GLIB_CFLAGS) \
+        $(LIBXML_CFLAGS) \
         $(RGC_SERVER_CFLAGS)
 
@@ -227 +235 @@
         fm_xml_db.h
 
-libfm_song_db_la_LIBADD = $(FM_SERVER_LIBS) \
+libfm_song_db_la_LIBADD = \
+        $(GLIB_LIBS) \
+        $(LIBXML_LIBS) \
         $(RGC_SERVER_LIBS)
 

trunk/fm_server/src/main.c

@@ -25 +25 @@
 #include <config.h>
 
-#include <glib.h>
+#include <stdio.h>
 #include <unistd.h>     // for sleep()
-#include <gst/gst.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
 #include <string.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+
+#include <glib.h>
+#include <glib-object.h>
 #include <rgc_server.h>
-#ifdef HAVE_ALSA
-#include <alsa/asoundlib.h>
-#endif
-#ifdef HAVE_JACK
-#undef uintmax_t
-#include <jack/jack.h>
-#endif
 
-
-#include "common.h"
-#include "fm_utils.h"
-#include "fm_buffer.h"
-#include "fm_element.h"
-#include "fm_input.h"
-#include "fm_input_test.h"
-/*#include "fm_input_beatgen.h"*/
-#include "fm_input_gst/jack_ringbuffer.h"
-#include "fm_input_gst/fm_input_gst_common.h"
-#include "fm_input_gst/fm_input_gst.h"
-#include "fm_effect.h"
-#include "fm_effect_gain.h"
-#include "fm_effect_pan.h"
-#include "fm_effect_rate.h"
-#include "fm_output.h"
-#include "fm_mixer.h"
-#include "fm_level_meter.h"
-#include "fm_djmixer.h"
-#include "fm_sync.h"
-#include "fm_pipeline.h"
-#include "fm_song_db/fm_xml_db.h"
-#include "fm_song_db/fm_song_db.h"
-#include "fm_input_cdj.h"
-#ifdef HAVE_ALSA
-#include "fm_output_alsa.h"
-#endif
-#ifdef HAVE_JACK
-#include "fm_output_jack.h"
-#endif
 
 
@@ -80 +43 @@
 gboolean global_debug;
 gboolean write_to_disk;
-FmSongDB *global_song_db;
+/*FmSongDB *global_song_db;*/
+void *global_song_db;
 
 void test_case (void);
+
+/* sorry for these, they will go away when we'll move to a real plugin system */
+void fm_element_class_register (void);
+void fm_input_class_register (void);
+void fm_effect_class_register (void);
+void fm_output_class_register (void);
+void fm_pipeline_class_register (void);
+void fm_input_test_class_register (void);
+void fm_effect_gain_class_register (void);
+void fm_effect_rate_class_register (void);
+void fm_effect_pan_class_register (void);
+void fm_input_gst_class_register (void);
+void fm_input_cdj_class_register (void);
+void fm_mixer_class_register (void);
+void fm_djmixer_class_register (void);
+void fm_level_meter_class_register (void);
+void fm_output_alsa_class_register (void);
+void fm_output_jack_class_register (void);
+//void fm_output_pulse_class_register (void);
+void fm_song_db_class_register (void);
+
+void *fm_song_db_new (void);
+void *gst_init (int*, char***);
 
 void
@@ -151 +138 @@
         fm_output_jack_class_register ();
 #endif
+#if HAVE_PULSE
+/*      fm_output_jack_class_register ();*/
+#endif
 
         GMainLoop *main_loop;

trunk/fm_server/test/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = $(FM_SERVER_TEST_CFLAGS) \
+AM_CPPFLAGS = $(GLIB_CFLAGS) \
         $(RGC_CLIENT_CFLAGS)
 
 
-LDADD = $(FM_SERVER_TEST_LIBS) \
+LDADD = $(GLIB_LIBS) \
         $(RGC_CLIENT_LIBS)
 

trunk/fm_server/test/Makefile.in

@@ -117 +117 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
-FM_SERVER_CFLAGS = @FM_SERVER_CFLAGS@
-FM_SERVER_LIBS = @FM_SERVER_LIBS@
-FM_SERVER_TEST_CFLAGS = @FM_SERVER_TEST_CFLAGS@
-FM_SERVER_TEST_LIBS = @FM_SERVER_TEST_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -139 +139 @@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -169 +171 @@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
 RANLIB = @RANLIB@
 RGC_CLIENT_CFLAGS = @RGC_CLIENT_CFLAGS@
@@ -174 +178 @@
 RGC_SERVER_CFLAGS = @RGC_SERVER_CFLAGS@
 RGC_SERVER_LIBS = @RGC_SERVER_LIBS@
+SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -233 +239 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = $(FM_SERVER_TEST_CFLAGS) \
+AM_CPPFLAGS = $(GLIB_CFLAGS) \
         $(RGC_CLIENT_CFLAGS)
 
-LDADD = $(FM_SERVER_TEST_LIBS) \
+LDADD = $(GLIB_LIBS) \
         $(RGC_CLIENT_LIBS)