claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Some weird problem when --no-cddb and libcddb was not around. I'd

Browse Source 
rather switch than fight it.
This commit is contained in:
rocky
2004-07-25 11:32:33 +00:00
parent 62b7ad9eaf
commit bc90454ca4
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.75 2004/07/25 03:05:18 rocky Exp $ $Id: cd-info.c,v 1.76 2004/07/25 11:32:33 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -79,8 +79,8 @@ struct arguments
int no_ioctl; int no_ioctl;
int no_analysis; int no_analysis;
char *access_mode; /* Access method driver should use for control */ char *access_mode; /* Access method driver should use for control */
int no_cddb; /* If set the below are meaningless. */
#ifdef HAVE_CDDB #ifdef HAVE_CDDB
int no_cddb; /* If set the below are meaningless. */
char *cddb_email; /* email to report to CDDB server. */ char *cddb_email; /* email to report to CDDB server. */
char *cddb_server; /* CDDB server to contact */ char *cddb_server; /* CDDB server to contact */
int cddb_port; /* port number to contact CDDB server. */ int cddb_port; /* port number to contact CDDB server. */
@@ -164,9 +164,6 @@ parse_options (int argc, const char *argv[])
{"cddb-timeout", '\0', POPT_ARG_INT, &opts.cddb_timeout, 0, {"cddb-timeout", '\0', POPT_ARG_INT, &opts.cddb_timeout, 0,
"CDDB timeout value in seconds (default 10 seconds)"}, "CDDB timeout value in seconds (default 10 seconds)"},
#else
{"no-cddb", '\0', POPT_ARG_NONE, &opts.no_cddb, 1,
"Don't look up audio CDDB information - for this build, this is always set"},
#endif #endif
{"no-device-info", '\0', POPT_ARG_NONE, &opts.no_device, 0, {"no-device-info", '\0', POPT_ARG_NONE, &opts.no_device, 0,
@@ -827,8 +824,6 @@ init(void)
opts.cddb_server = NULL; opts.cddb_server = NULL;
opts.cddb_timeout = -1; opts.cddb_timeout = -1;
opts.cddb_disable_cache = false; opts.cddb_disable_cache = false;
#else
opts.no_cddb = 1;
#endif #endif
#ifdef HAVE_VCDINFO #ifdef HAVE_VCDINFO
opts.no_vcd = 0; opts.no_vcd = 0;