libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made forgotten adaption to Xorriso_standalonE

Browse Source
This commit is contained in:
Thomas Schmitt 2008-01-20 10:30:43 +00:00
parent 40642ee159
commit 5bc9d18e29
5 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libisoburn/trunk/ng_src/burn_wrap.c
View File

@ -25,11 +25,21 @@
#include <fcntl.h> #include <fcntl.h>
#ifndef Xorriso_standalonE
#include <libburn/libburn.h> #include <libburn/libburn.h>
/* >>> NG */ /* >>> NG */
#include <libisofs/nglibisofs.h> #include <libisofs/nglibisofs.h>
#else /* ! Xorriso_standalonE */
#include "../libisofs/libisofs.h"
#include "../libburn/libburn.h"
#endif /* Xorriso_standalonE */
#include "libisoburn.h" #include "libisoburn.h"
#include "isoburn.h" #include "isoburn.h"
@ -270,6 +280,7 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d,
return(1); return(1);
#endif #endif
*nwa= *lba= 0;
ret= isoburn_find_emulator(&o, d, 0); ret= isoburn_find_emulator(&o, d, 0);
if(ret<0) if(ret<0)
return(0); return(0);
@ -278,6 +289,8 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d,
*nwa= o->nwa; *nwa= o->nwa;
return(1); return(1);
} }
if(burn_drive_get_drive_role(d) != 1)
return(1);
return(burn_disc_track_lba_nwa(d, opts, trackno, lba, nwa)); return(burn_disc_track_lba_nwa(d, opts, trackno, lba, nwa));
} }

12
libisoburn/trunk/ng_src/data_source.c
View File

@ -7,13 +7,23 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef Xorriso_standalonE
#include <libburn/libburn.h> #include <libburn/libburn.h>
/* >>> NG */ /* >>> NG */
#include <libisofs/nglibisofs.h> #include <libisofs/nglibisofs.h>
#include "isoburn.h" #else /* ! Xorriso_standalonE */
#include "../libisofs/libisofs.h"
#include "../libburn/libburn.h"
#endif /* Xorriso_standalonE */
#include "isoburn.h"
static int static int
ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer) ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)

10
libisoburn/trunk/ng_src/isoburn.c
View File

@ -19,11 +19,21 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#ifndef Xorriso_standalonE
#include <libburn/libburn.h> #include <libburn/libburn.h>
/* >>> NG */ /* >>> NG */
#include <libisofs/nglibisofs.h> #include <libisofs/nglibisofs.h>
#else /* ! Xorriso_standalonE */
#include "../libisofs/libisofs.h"
#include "../libburn/libburn.h"
#endif /* Xorriso_standalonE */
#include "libisoburn.h" #include "libisoburn.h"
#include "isoburn.h" #include "isoburn.h"

16
libisoburn/trunk/ng_src/isofs_wrap.c
View File

@ -12,13 +12,22 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h>
#ifndef Xorriso_standalonE
#include <libburn/libburn.h> #include <libburn/libburn.h>
/* >>> NG */ /* >>> NG */
#include <libisofs/nglibisofs.h> #include <libisofs/nglibisofs.h>
#else /* ! Xorriso_standalonE */
#include "../libisofs/libisofs.h"
#include "../libburn/libburn.h"
#endif /* Xorriso_standalonE */
#include "isoburn.h" #include "isoburn.h"
#include "libisoburn.h" #include "libisoburn.h"
@ -247,14 +256,15 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
struct burn_drive *drive; struct burn_drive *drive;
struct ecma119_pri_vol_desc *pvm; struct ecma119_pri_vol_desc *pvm;
assert(o); if(o==NULL)
return -1;
drive= o->drive; drive= o->drive;
/* we can assume 0 as start block for image */ /* we can assume 0 as start block for image */
/* TODO what about ms? where we validate valid iso image in ms disc? */ /* TODO what about ms? where we validate valid iso image in ms disc? */
ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head, ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head,
sizeof(o->target_iso_head), &data_count, 1); sizeof(o->target_iso_head), &data_count, 2);
/* an error means an empty disc */ /* an error means an empty disc */
if (ret <= 0) { if (ret <= 0) {

2
libisoburn/trunk/test/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.01.19.162244" #define Xorriso_timestamP "2008.01.20.102946"