Re: [Rhythmbox-devel] AudioCD Support

[Luca Capello <luca pca it>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

on 01/13/2005 06:01 PM, Christophe Fergeau wrote:
> Ok, I tested it a bit (I needed the patch at
> http://testoo.no-ip.com/~teuf/hack/audiocd-compile.diff to successfully
> compile it, and it seems to be missing a check for musicbrainz).
trivial patch attached (against mattjones-patch-0.6). It seems working
on my box and on a new downloaded tla, but I'm not an autoconf
specialist... (the patch is made with 'diff -Naur'):
=====
ChangeLog:
  * configure.ac:
    - added checking for MusicBrainz in AudioCD section
    - enabled output message for MusicBrainz status

Signed: Luca Capello <luca pca it> Thu Jan 13 19:29:17 CET 2005
=====

> But the
> main problem is that it doesn't detect the audio cds I insert ;) It's
> compiled without hal, and actually I don't think monitoring
> mounted/unmounted volumes can work to detect audio cds...
Same problem on my Debian experimental compiled with HAL/D-BUS
(obviously, after having applied Christophe's patch).

Thx, bye,
Gismo / Luca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Debian - http://enigmail.mozdev.org

iD8DBQFB5r9mVAp7Xm10JmkRApn+AJ9L65rpjE+BDNH+MEe2KPUqXp7EJACbBzEX
1MFBtZtiHPPq3igIcSmFlxY=
=mekm
-----END PGP SIGNATURE-----

--- rhythmbox--main--0.9--patch-6/configure.ac.ORG	2005-01-13 10:08:57.000000000 +0100
+++ rhythmbox--main--0.9--patch-6/configure.ac	2005-01-13 19:07:25.000000000 +0100
@@ -312,7 +312,18 @@
   if test "x$enable_cdparanoia" = "xno"; then
     enable_audiocd=no
   else
-    RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS -lcdda_interface"
+    AC_CHECK_HEADER(musicbrainz.h.[enable_musicbrainz=yes].[enable_musicbrainz=no])
+    if test "x$enable_musicbrainz" != "xyes"; then
+      AC_CHECK_HEADER(musicbrainz/musicbrainz.h.[header_dir=yes].)
+    fi
+    if test "x$header_dir" = "xyes"; then
+      enable_musicbrainz=yes
+    fi
+    if test "x$enable_musicbrainz" = "xno"; then
+      enable_audiocd=no
+    else
+      RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS -lcdda_interface"
+    fi
   fi
 
 else
@@ -511,11 +522,11 @@
 else
 	AC_MSG_NOTICE([** Dashboard support is enabled])
 fi
-dnl if test x"$enable_musicbrainz" != "xyes"; then
-dnl 	AC_MSG_NOTICE([   MusicBrainz support is disabled])
-dnl else
-dnl 	AC_MSG_NOTICE([** MusicBrainz support is enabled])
-dnl fi
+if test x"$enable_musicbrainz" != "xyes"; then
+ 	AC_MSG_NOTICE([   MusicBrainz support is disabled])
+else
+ 	AC_MSG_NOTICE([** MusicBrainz support is enabled])
+fi
 if test x"$with_player" = xgstreamer; then
 	AC_MSG_NOTICE([** GStreamer $GST_MAJORMINOR player is enabled])
 else
@@ -536,7 +547,6 @@
 else
 	AC_MSG_NOTICE([   D-BUS control/activation disabled])
 fi
-
 if test "x$enable_audiocd" != "xyes"; then
  	AC_MSG_NOTICE([   Audio CD support is disabled])
 else