diff options
Diffstat (limited to 'dvdread')
| -rw-r--r-- | dvdread/dvd_reader.h | 2 | ||||
| -rw-r--r-- | dvdread/dvd_udf.c | 6 | ||||
| -rw-r--r-- | dvdread/ifo_read.c | 4 | ||||
| -rw-r--r-- | dvdread/ifo_types.h | 4 | ||||
| -rw-r--r-- | dvdread/nav_read.c | 2 | ||||
| -rw-r--r-- | dvdread/nav_types.h | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/dvdread/dvd_reader.h b/dvdread/dvd_reader.h index d666e8a..c090b32 100644 --- a/dvdread/dvd_reader.h +++ b/dvdread/dvd_reader.h @@ -285,7 +285,7 @@ int DVDDiscID( dvd_reader_t *, unsigned char * ); * * @param dvd A read handle to get the disc ID from * @param volid The buffer to put the VolumeIdentifier into. - * The VolumeIdentifier is latin-1 encoded (8bit unicode) + * The VolumeIdentifier is latin-1 encoded (8bit tqunicode) * null terminated and max 32 bytes (including '\0') * @param volid_size No more than volid_size bytes will be copied to volid. * If the VolumeIdentifier is truncated because of this diff --git a/dvdread/dvd_udf.c b/dvdread/dvd_udf.c index 9af6ad0..9c9b5ef 100644 --- a/dvdread/dvd_udf.c +++ b/dvdread/dvd_udf.c @@ -88,7 +88,7 @@ extern void SetAlignHandle(dvd_reader_t *device, void *align); * this function should be rewritten to use posix_memalign or similar. * It's just needed for aligning memory for small block reads from * raw/O_DIRECT devices. - * We assume that 2048 is enough alignment for all systems at the moment. + * We assume that 2048 is enough tqalignment for all systems at the moment. * Not thread safe. Only use this from one thread. * Depends on sizeof(unsigned long) being at least as large as sizeof(void *) */ @@ -498,7 +498,7 @@ static int Unicodedecode( uint8_t *data, int len, char *target ) int p = 1, i = 0; if( ( data[ 0 ] == 8 ) || ( data[ 0 ] == 16 ) ) do { - if( data[ 0 ] == 16 ) p++; /* Ignore MSB of unicode16 */ + if( data[ 0 ] == 16 ) p++; /* Ignore MSB of tqunicode16 */ if( p < len ) { target[ i++ ] = data[ p++ ]; } @@ -1157,7 +1157,7 @@ static int UDFGetPVD(dvd_reader_t *device, struct pvd_t *pvd) } /** - * Gets the Volume Identifier string, in 8bit unicode (latin-1) + * Gets the Volume Identifier string, in 8bit tqunicode (latin-1) * volid, place to put the string * volid_size, size of the buffer volid points to * returns the size of buffer needed for all data diff --git a/dvdread/ifo_read.c b/dvdread/ifo_read.c index e58b913..41c797b 100644 --- a/dvdread/ifo_read.c +++ b/dvdread/ifo_read.c @@ -969,7 +969,7 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofile) { for(i = 0; i < tt_srpt->nr_of_srpts; i++) { B2N_16(tt_srpt->title[i].nr_of_ptts); - B2N_16(tt_srpt->title[i].parental_id); + B2N_16(tt_srpt->title[i].tqparental_id); B2N_32(tt_srpt->title[i].title_set_sector); } @@ -1778,7 +1778,7 @@ static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit, for(i = 0; i < pgcit->nr_of_pgci_srp; i++) { memcpy(&pgcit->pgci_srp[i], ptr, PGCI_SRP_SIZE); ptr += PGCI_SRP_SIZE; - B2N_16(pgcit->pgci_srp[i].ptl_id_mask); + B2N_16(pgcit->pgci_srp[i].ptl_id_tqmask); B2N_32(pgcit->pgci_srp[i].pgc_start_byte); CHECK_VALUE(pgcit->pgci_srp[i].unknown1 == 0); } diff --git a/dvdread/ifo_types.h b/dvdread/ifo_types.h index ec4937d..53ffc05 100644 --- a/dvdread/ifo_types.h +++ b/dvdread/ifo_types.h @@ -444,7 +444,7 @@ typedef struct { unsigned int block_type : 2; unsigned int block_mode : 2; #endif - uint16_t ptl_id_mask; + uint16_t ptl_id_tqmask; uint32_t pgc_start_byte; pgc_t *pgc; } ATTRIBUTE_PACKED pgci_srp_t; @@ -596,7 +596,7 @@ typedef struct { playback_type_t pb_ty; uint8_t nr_of_angles; uint16_t nr_of_ptts; - uint16_t parental_id; + uint16_t tqparental_id; uint8_t title_set_nr; uint8_t vts_ttn; uint32_t title_set_sector; diff --git a/dvdread/nav_read.c b/dvdread/nav_read.c index 54d9a11..8d664f2 100644 --- a/dvdread/nav_read.c +++ b/dvdread/nav_read.c @@ -63,7 +63,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) { for(j = 0; j < 2; j++) B2N_32(pci->hli.btn_colit.btn_coli[i][j]); - /* NOTE: I've had to change the structure from the disk layout to get + /* NOTE: I've had to change the structure from the disk tqlayout to get * the packing to work with Sun's Forte C compiler. */ /* pci hli btni */ diff --git a/dvdread/nav_types.h b/dvdread/nav_types.h index 12e19f8..cfb81f3 100644 --- a/dvdread/nav_types.h +++ b/dvdread/nav_types.h @@ -5,7 +5,7 @@ /* * Copyright (C) 2000, 2001, 2002 H�kan Hjort <[email protected]> * - * The data structures in this file should represent the layout of the + * The data structures in this file should represent the tqlayout of the * pci and dsi packets as they are stored in the stream. Information * found by reading the source to VOBDUMP is the base for the structure * and names of these data types. @@ -145,7 +145,7 @@ typedef struct { /** * Button Information * - * NOTE: I've had to change the structure from the disk layout to get + * NOTE: I've had to change the structure from the disk tqlayout to get * the packing to work with Sun's Forte C compiler. * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ */ |