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

Changes brought about by recent vcdimager-cdio changes.

Browse Source 
- We use vcdinfo_t ** on vcdinfo_open.
 - Now make use of pkg-config for vcdimager in configure.
 - Remove reference to info_private.h.
This commit is contained in:
rocky
2003-08-10 02:27:49 +00:00
parent c3883130a0
commit c5aabbf014
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@@ -15,7 +15,7 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
dnl 02111-1307, USA. dnl 02111-1307, USA.
AC_REVISION([$Id: configure.ac,v 1.30 2003/07/28 02:25:37 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.31 2003/08/10 02:27:49 rocky Exp $])dnl
AC_INIT(lib/cdio.c) AC_INIT(lib/cdio.c)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(libcdio, 0.62) AM_INIT_AUTOMAKE(libcdio, 0.62)
@@ -275,11 +275,14 @@ AC_ARG_ENABLE(vcdinfo,
enable_vcdinfo=yes) enable_vcdinfo=yes)
fi fi
if test x$enable_vcdinfo = xyes; then if test x$enable_vcdinfo = xyes; then
AC_DEFINE([HAVE_VCDINFO],1, [Define this if you have libvcdinfo installed]) PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.17-cdio,
VCDINFO_LIB="-lvcdinfo -lvcd" [AC_DEFINE([HAVE_VCDINFO],1,
[Define this if you have libvcdinfo installed])],
[enable_vcdinfo=no])
fi fi
AC_SUBST(VCDINFO_LIB) AC_SUBST(VCDINFO_LIBS)
AC_SUBST(VCDINFO_CFLAGS)
AC_CONFIG_COMMANDS([checks], AC_CONFIG_COMMANDS([checks],
[chmod +x test/check_cue.sh; chmod +x test/check_nrg.sh [chmod +x test/check_cue.sh; chmod +x test/check_nrg.sh

6
src/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.8 2003/06/11 10:57:02 rocky Exp $ # $Id: Makefile.am,v 1.9 2003/08/10 02:27:49 rocky Exp $
# #
# Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
# #
@@ -23,7 +23,7 @@ CDDB_LIBS=@CDDB_LIBS@
if BUILD_CDINFO if BUILD_CDINFO
cd_info_SOURCES = cd-info.c cd_info_SOURCES = cd-info.c
cd_info_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIB) cd_info_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS)
if BUILD_CDINFO_LINUX if BUILD_CDINFO_LINUX
cdinfo_linux_SOURCES = cdinfo-linux.c cdinfo_linux_SOURCES = cdinfo-linux.c
cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
@@ -36,5 +36,5 @@ else
EXTRA_DIST = cdinfo-linux.c cd-info.c EXTRA_DIST = cdinfo-linux.c cd-info.c
endif endif
INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBCDIO_CFLAGS) INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS)

31
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.14 2003/06/22 22:41:29 rocky Exp $ $Id: cd-info.c,v 1.15 2003/08/10 02:27:49 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 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>
@@ -46,7 +46,6 @@
#ifdef HAVE_VCDINFO #ifdef HAVE_VCDINFO
#include <libvcd/files.h> #include <libvcd/files.h>
#include <libvcd/info.h> #include <libvcd/info.h>
#include <libvcd/info_private.h>
#endif #endif
#include <cdio/cdio.h> #include <cdio/cdio.h>
@@ -865,26 +864,26 @@ print_cddb_info() {
static void static void
print_vcd_info(void) { print_vcd_info(void) {
vcdinfo_open_return_t open_rc; vcdinfo_open_return_t open_rc;
vcdinfo_obj_t obj; vcdinfo_obj_t *obj;
open_rc = vcdinfo_open(&obj, &source_name, DRIVER_UNKNOWN, NULL); open_rc = vcdinfo_open(&obj, &source_name, DRIVER_UNKNOWN, NULL);
switch (open_rc) { switch (open_rc) {
case VCDINFO_OPEN_VCD: case VCDINFO_OPEN_VCD:
if (vcdinfo_get_format_version (&obj) == VCD_TYPE_INVALID) { if (vcdinfo_get_format_version (obj) == VCD_TYPE_INVALID) {
fprintf(stderr, "VCD format detection failed"); fprintf(stderr, "VCD format detection failed");
vcdinfo_close(&obj); vcdinfo_close(obj);
return; return;
} }
fprintf (stdout, "format: %s\n", vcdinfo_get_format_version_str(&obj)); fprintf (stdout, "format: %s\n", vcdinfo_get_format_version_str(obj));
fprintf (stdout, "album id: `%.16s'\n", vcdinfo_get_album_id(&obj)); fprintf (stdout, "album id: `%.16s'\n", vcdinfo_get_album_id(obj));
fprintf (stdout, "volume count: %d\n", vcdinfo_get_volume_count(&obj)); fprintf (stdout, "volume count: %d\n", vcdinfo_get_volume_count(obj));
fprintf (stdout, "volume number: %d\n", vcdinfo_get_volume_num(&obj)); fprintf (stdout, "volume number: %d\n", vcdinfo_get_volume_num(obj));
fprintf (stdout, "system id: `%s'\n", vcdinfo_get_system_id(&obj)); fprintf (stdout, "system id: `%s'\n", vcdinfo_get_system_id(obj));
fprintf (stdout, "volume id: `%s'\n", vcdinfo_get_volume_id(&obj)); fprintf (stdout, "volume id: `%s'\n", vcdinfo_get_volume_id(obj));
fprintf (stdout, "volumeset id: `%s'\n", vcdinfo_get_volumeset_id(&obj)); fprintf (stdout, "volumeset id: `%s'\n", vcdinfo_get_volumeset_id(obj));
fprintf (stdout, "publisher id: `%s'\n", vcdinfo_get_publisher_id(&obj)); fprintf (stdout, "publisher id: `%s'\n", vcdinfo_get_publisher_id(obj));
fprintf (stdout, "preparer id: `%s'\n", vcdinfo_get_preparer_id(&obj)); fprintf (stdout, "preparer id: `%s'\n", vcdinfo_get_preparer_id(obj));
fprintf (stdout, "application id: `%s'\n", fprintf (stdout, "application id: `%s'\n",
vcdinfo_get_application_id(&obj)); vcdinfo_get_application_id(obj));
break; break;
case VCDINFO_OPEN_ERROR: case VCDINFO_OPEN_ERROR:
@@ -896,7 +895,7 @@ print_vcd_info(void) {
" further inspection says it is not.\n"); " further inspection says it is not.\n");
break; break;
} }
vcdinfo_close(&obj); vcdinfo_close(obj);
} }
#endif #endif