Compiling without cddb

[Fabrice Ménard-2]

Hi,

A small patch in order to compile libcdio without cddb.

Best regards,

Fabrice Ménard

[Burkhard Plaum]

Hi,

> Hi,
>
> A small patch in order to compile libcdio without cddb.

where?

Burkhard

[Fabrice Ménard-2]

> Hi,
>
> > Hi,
> >
> > A small patch in order to compile libcdio without cddb.
>
> where?
>
> Burkhard
Second try.
I don't understand: the message in my sent mail folder has the patch attached.

[Eric Shattow]

Please inline the patch in your message, do not attach.

On Sun, Sep 7, 2008 at 11:26 AM, Fabrice Ménard <menard.fabrice@...>wrote:

> > Hi,
> >
> > > Hi,
> > >
> > > A small patch in order to compile libcdio without cddb.
> >
> > where?
> >
> > Burkhard
> Second try.
> I don't understand: the message in my sent mail folder has the patch
> attached.
>
>

[Fabrice Ménard-2]

> Please inline the patch in your message, do not attach.

Here it is:

--- libcdio-0.80/src/cd-info.c 2008-01-09 05:26:24.000000000 +0100
+++ libcdio-0.80.new/src/cd-info.c 2008-09-06 17:18:12.000000000 +0200
@@ -25,12 +25,12 @@
 */
 
 #include "util.h"
-#include "cddb.h"
 #include "getopt.h"
 #include <stdarg.h>
 
 #ifdef HAVE_CDDB
 #include <cddb/cddb.h>
+#include "cddb.h"
 #endif
 
 #ifdef HAVE_VCDINFO
@@ -306,6 +306,7 @@ parse_options (int argc, char *argv[])
     case 'd': opts.debug_level = atoi(optarg); break;
     case 'T': opts.no_tracks = 1; break;
     case 'A': opts.no_analysis = 1; break;
+#ifdef HAVE_CDDB
     case 'P': cddb_opts.port = atoi(optarg); break;
     case 'H': cddb_opts.http = 1; break;
     case OP_CDDB_SERVER: cddb_opts.server = strdup(optarg); break;
@@ -313,6 +314,7 @@ parse_options (int argc, char *argv[])
     case OP_CDDB_EMAIL: cddb_opts.email = strdup(optarg); break;
     case OP_CDDB_NOCACHE: cddb_opts.disable_cache = 1; break;
     case OP_CDDB_TIMEOUT: cddb_opts.timeout = atoi(optarg); break;
+#endif
     case 'v': opts.no_vcd = 1; break;
     case 'I': opts.no_ioctl = 1; break;
     case 'b': parse_source(OP_SOURCE_BIN); break;
@@ -630,9 +632,9 @@ print_analysis(int ms_offset, cdio_iso_a
   switch(CDIO_FSTYPE(fs)) {
   case CDIO_FS_AUDIO:
     if (num_audio > 0) {
+#ifdef HAVE_CDDB
       printf("Audio CD, CDDB disc ID is %08x\n",
      cddb_discid(p_cdio, i_tracks));
-#ifdef HAVE_CDDB
       if (!opts.no_cddb) print_cddb_info(p_cdio, i_tracks, i_first_track);
 #endif      
       print_cdtext_info(p_cdio, i_tracks, i_first_track);


Regards,
Fabrice Ménard

[R. Bernstein]

The cddb patch looks good and should now be in the CVS repository.

Thanks!

>> Please inline the patch in your message, do not attach.
>
> Here it is:
>
> --- libcdio-0.80/src/cd-info.c 2008-01-09 05:26:24.000000000 +0100
> +++ libcdio-0.80.new/src/cd-info.c 2008-09-06 17:18:12.000000000 +0200
> @@ -25,12 +25,12 @@
>  */
>
>  #include "util.h"
> -#include "cddb.h"
>  #include "getopt.h"
>  #include <stdarg.h>
>
>  #ifdef HAVE_CDDB
>  #include <cddb/cddb.h>
> +#include "cddb.h"
>  #endif
>
>  #ifdef HAVE_VCDINFO
> @@ -306,6 +306,7 @@ parse_options (int argc, char *argv[])
>      case 'd': opts.debug_level = atoi(optarg); break;
>      case 'T': opts.no_tracks = 1; break;
>      case 'A': opts.no_analysis = 1; break;
> +#ifdef HAVE_CDDB
>      case 'P': cddb_opts.port = atoi(optarg); break;
>      case 'H': cddb_opts.http = 1; break;
>      case OP_CDDB_SERVER: cddb_opts.server = strdup(optarg); break;
> @@ -313,6 +314,7 @@ parse_options (int argc, char *argv[])
>      case OP_CDDB_EMAIL: cddb_opts.email = strdup(optarg); break;
>      case OP_CDDB_NOCACHE: cddb_opts.disable_cache = 1; break;
>      case OP_CDDB_TIMEOUT: cddb_opts.timeout = atoi(optarg); break;
> +#endif
>      case 'v': opts.no_vcd = 1; break;
>      case 'I': opts.no_ioctl = 1; break;
>      case 'b': parse_source(OP_SOURCE_BIN); break;
> @@ -630,9 +632,9 @@ print_analysis(int ms_offset, cdio_iso_a
>    switch(CDIO_FSTYPE(fs)) {
>    case CDIO_FS_AUDIO:
>      if (num_audio > 0) {
> +#ifdef HAVE_CDDB
>        printf("Audio CD, CDDB disc ID is %08x\n",
>       cddb_discid(p_cdio, i_tracks));
> -#ifdef HAVE_CDDB
>        if (!opts.no_cddb) print_cddb_info(p_cdio, i_tracks,
> i_first_track);
>  #endif
>        print_cdtext_info(p_cdio, i_tracks, i_first_track);
>
>
> Regards,
> Fabrice Ménard
>
>
>
>
>