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

Merge branch 'master' of git.sv.gnu.org:/srv/git/libcdio

Browse Source
This commit is contained in:
rocky
2010-08-27 17:09:36 -04:00
parent e3226cdd2b f4462b558d
commit 621e41ed60
15 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
example/cdchange.c
View File

@@ -16,15 +16,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <cdio/cdio.h> #include <cdio/cdio.h>
/* Test media changed */ /* Test media changed */
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif

5
example/isofile.c
View File

@@ -31,10 +31,13 @@
#define LOCAL_FILENAME "copying" #define LOCAL_FILENAME "copying"
/* portable.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#include "portable.h"
#include <sys/types.h> #include <sys/types.h>
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/iso9660.h> #include <cdio/iso9660.h>
#include "portable.h"
#include <stdio.h> #include <stdio.h>

6
example/isofile2.c
View File

@@ -35,11 +35,13 @@
#define ISO9660_FILENAME "COPYING" #define ISO9660_FILENAME "COPYING"
#define LOCAL_FILENAME "copying" #define LOCAL_FILENAME "copying"
/* portable.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#include "portable.h"
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/iso9660.h> #include <cdio/iso9660.h>
#include "portable.h"
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

5
example/isofuzzy.c
View File

@@ -26,11 +26,14 @@
#define ISO9660_IMAGE_PATH "/tmp/" #define ISO9660_IMAGE_PATH "/tmp/"
#define ISO9660_IMAGE ISO9660_IMAGE_PATH "vcd_demo.bin" #define ISO9660_IMAGE ISO9660_IMAGE_PATH "vcd_demo.bin"
/* portable.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#include "portable.h"
#include <sys/types.h> #include <sys/types.h>
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/iso9660.h> #include <cdio/iso9660.h>
#include "portable.h"
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_ERRNO_H #ifdef HAVE_ERRNO_H

10
example/paranoia.c
View File

@@ -18,14 +18,16 @@
/* Simple program to show using libcdio's version of the CD-DA paranoia. /* Simple program to show using libcdio's version of the CD-DA paranoia.
library. */ library. */
#include <cdio/paranoia.h> /* config.h has to come first else _FILE_OFFSET_BITS are redefined in
#include <cdio/cd_types.h> say opensolaris. */
#include <stdio.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#include <cdio/paranoia.h>
#include <cdio/cd_types.h>
#include <stdio.h>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#endif #endif

10
example/udffile.c
View File

@@ -22,6 +22,12 @@
things on the C++ side. things on the C++ side.
*/ */
/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* This is the UDF image. */ /* This is the UDF image. */
#define UDF_IMAGE_PATH "../" #define UDF_IMAGE_PATH "../"
#define UDF_IMAGE "../test/udf102.iso" #define UDF_IMAGE "../test/udf102.iso"
@@ -34,10 +40,6 @@
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_ERRNO_H #ifdef HAVE_ERRNO_H
#include <errno.h> #include <errno.h>
#endif #endif

20
include/cdio/dvd.h
View File

@@ -58,16 +58,16 @@
#define CDIO_DVD_BOOK_DVD_PR_DL 0xe /**< DVD+R DL */ #define CDIO_DVD_BOOK_DVD_PR_DL 0xe /**< DVD+R DL */
typedef struct cdio_dvd_layer { typedef struct cdio_dvd_layer {
uint8_t book_version : 4; unsigned int book_version : 4;
uint8_t book_type : 4; unsigned int book_type : 4;
uint8_t min_rate : 4; unsigned int min_rate : 4;
uint8_t disc_size : 4; unsigned int disc_size : 4;
uint8_t layer_type : 4; unsigned int layer_type : 4;
uint8_t track_path : 1; unsigned int track_path : 1;
uint8_t nlayers : 2; unsigned int nlayers : 2;
uint8_t track_density : 4; unsigned int track_density : 4;
uint8_t linear_density: 4; unsigned int linear_density : 4;
uint8_t bca : 1; unsigned int bca : 1;
uint32_t start_sector; uint32_t start_sector;
uint32_t end_sector; uint32_t end_sector;
uint32_t end_sector_l0; uint32_t end_sector_l0;

2
include/cdio/mmc.h
View File

@@ -121,7 +121,7 @@ extern "C" {
CDIO_MMC_SENSE_KEY_VENDOR_SPECIFIC = 9, CDIO_MMC_SENSE_KEY_VENDOR_SPECIFIC = 9,
CDIO_MMC_SENSE_KEY_COPY_ABORTED = 10, CDIO_MMC_SENSE_KEY_COPY_ABORTED = 10,
CDIO_MMC_SENSE_KEY_ABORTED_COMMAND = 11, CDIO_MMC_SENSE_KEY_ABORTED_COMMAND = 11,
CDIO_MMC_SENSE_KEY_OBSOLTE = 12, CDIO_MMC_SENSE_KEY_OBSOLETE = 12,
} cdio_mmc_sense_key_t; } cdio_mmc_sense_key_t;
/** /**

8
lib/cdda_interface/common_interface.c
View File

@@ -1,7 +1,5 @@
/* /*
$Id: common_interface.c,v 1.17 2008/04/16 17:00:40 karl Exp $ Copyright (C) 2004, 2005, 2007, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998, 2002 Monty monty@xiph.org Copyright (C) 1998, 2002 Monty monty@xiph.org
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@@ -25,8 +23,10 @@
* *
******************************************************************/ ******************************************************************/
#include <math.h> /* common_interface.h has to come first else _FILE_OFFSET_BITS are
redefined in say opensolaris. */
#include "common_interface.h" #include "common_interface.h"
#include <math.h>
#include "utils.h" #include "utils.h"
#include "smallft.h" #include "smallft.h"

4
lib/cdda_interface/common_interface.h
View File

@@ -1,7 +1,5 @@
/* /*
$Id: common_interface.h,v 1.7 2008/04/16 17:00:40 karl Exp $ Copyright (C) 2004, 2005, 2008, 2009, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify

8
lib/udf/udf.c
View File

@@ -1,7 +1,5 @@
/* /*
$Id: udf.c,v 1.13 2008/04/24 07:28:00 rocky Exp $ Copyright (C) 2005, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -18,8 +16,10 @@
*/ */
/* Access routines */ /* Access routines */
#include <cdio/bytesex.h> /* udf_private.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#include "udf_private.h" #include "udf_private.h"
#include <cdio/bytesex.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>

4
lib/udf/udf_file.c
View File

@@ -18,8 +18,10 @@
*/ */
/* Access routines */ /* Access routines */
#include <cdio/bytesex.h> /* udf_private.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#include "udf_private.h" #include "udf_private.h"
#include <cdio/bytesex.h>
#include "udf_fs.h" #include "udf_fs.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H

4
src/cd-paranoia/Makefile.am
View File

@@ -47,10 +47,10 @@ cd-paranoia.$(OBJEXT): usage.h
if HAVE_PERL if HAVE_PERL
usage.h: usage.txt $(srcdir)/pod2c.pl usage.h: usage.txt $(srcdir)/pod2c.pl
$(PERL) $(srcdir)/pod2c.pl $< >$@ $(PERL) $(srcdir)/pod2c.pl usage.txt >$@
else else
usage.h: usage-copy.h usage.h: usage-copy.h
cp $< $@ cp usage-copy.h $@
endif endif
endif endif

9
src/cd-paranoia/report.c
View File

@@ -1,7 +1,5 @@
/* /*
$Id: report.c,v 1.3 2008/04/11 15:44:00 karl Exp $ Copyright (C) 2004, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@@ -24,8 +22,11 @@
* *
******************************************************************/ ******************************************************************/
#include <stdio.h>
/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
say opensolaris. */
#include "config.h" #include "config.h"
#include <stdio.h>
#include <cdio/cdda.h> #include <cdio/cdda.h>
#include "report.h" #include "report.h"

4
src/cdda-player.c
View File

@@ -1,7 +1,7 @@
/* /*
$Id: cdda-player.c,v 1.50 2008/06/19 15:44:14 flameeyes Exp $ $Id: cdda-player.c,v 1.50 2008/06/19 15:44:14 flameeyes Exp $
Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein <rocky@gnu.org>
Adapted from Gerd Knorr's player.c program <kraxel@bytesex.org> Adapted from Gerd Knorr's player.c program <kraxel@bytesex.org>
Copyright (C) 1997, 1998 Copyright (C) 1997, 1998
@@ -851,7 +851,7 @@ get_track_info(track_t i_track)
} }
#define display_line(LINE_NO, COL_NO, format_str, field) \ #define display_line(LINE_NO, COL_NO, format_str, field) \
if (field && field[0]) { \ if (field != NULL && field[0]) { \
mvprintw(LINE_NO, COL_NO, (char *) format_str " [%s]", \ mvprintw(LINE_NO, COL_NO, (char *) format_str " [%s]", \
field, \ field, \
b_cdtext_ ## field ? "CD-Text": "CDDB"); \ b_cdtext_ ## field ? "CD-Text": "CDDB"); \