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:
R. Bernstein
2010-05-30 01:25:22 -04:00
parent 789a90472a e6b6353cb8
commit efdd4e8179
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
/** /**

2
lib/driver/FreeBSD/freebsd_cam.c
View File

@@ -57,7 +57,7 @@ run_mmc_cmd_freebsd_cam( void *p_user_data, unsigned int i_timeout_ms,
{ {
_img_private_t *p_env = p_user_data; _img_private_t *p_env = p_user_data;
int i_status, sense_size; int i_status, sense_size;
int direction = CAM_DEV_QFRZDIS; int direction = CAM_DEV_QFRZDIS | CAM_PASS_ERR_RECOVER;
union ccb ccb; union ccb ccb;
p_env->gen.scsi_mmc_sense_valid = 0; p_env->gen.scsi_mmc_sense_valid = 0;

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"); \