Search
lxdream.org :: lxdream/src/gdrom/nrg.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/gdrom/nrg.c
changeset 468:3a49695e081a
prev464:8e099fad42a6
next514:97f7e4bb2b54
author nkeynes
date Sun Oct 28 07:23:46 2007 +0000 (13 years ago)
permissions -rw-r--r--
last change Fix CDI with multiple tracks/session
Fix file being closed too early
file annotate diff log raw
1.1 --- a/src/gdrom/nrg.c Sat Oct 27 05:44:54 2007 +0000
1.2 +++ b/src/gdrom/nrg.c Sun Oct 28 07:23:46 2007 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /**
1.5 - * $Id: nrg.c,v 1.6 2007-10-27 05:44:54 nkeynes Exp $
1.6 + * $Id: nrg.c,v 1.7 2007-10-28 07:23:46 nkeynes Exp $
1.7 *
1.8 * Nero (NRG) CD file format. File information stolen shamelessly from
1.9 * libcdio.
1.10 @@ -180,7 +180,6 @@
1.11
1.12 disc = gdrom_image_new(filename, f);
1.13 if( disc == NULL ) {
1.14 - fclose(f);
1.15 ERROR("Unable to allocate memory!");
1.16 return NULL;
1.17 }
1.18 @@ -249,7 +248,7 @@
1.19 image->track[track_id].lba = ntohl(etnf->lba) + (i+1)*GDROM_PREGAP;
1.20 image->track[track_id].mode = nrg_track_mode( ntohl(etnf->mode) );
1.21 if( image->track[track_id].mode == -1 ) {
1.22 - disc->close(disc);
1.23 + gdrom_image_destroy_no_close(disc);
1.24 return NULL;
1.25 }
1.26 if( image->track[track_id].mode == GDROM_CDDA )
.