changeset 212:6b67914ae021 src

port Daniel's changes to xine-lib cvs to minimize difference

--- a/decoder.c	Mon Aug 25 14:23:13 2003 +0000
+++ b/decoder.c	Wed Aug 27 13:54:19 2003 +0000
@@ -125,7 +125,8 @@
    xBBB_BBBB, if immediate use all 7 bits for data else use
    lower four bits for the general purpose register number. */
 /* Evaluates gprm or data depending on bit, data is in byte n */
-uint16_t eval_reg_or_data_2(command_t* command, int32_t imm, int32_t start) {
+static uint16_t eval_reg_or_data_2(command_t* command, 
+				   int32_t imm, int32_t start) {
   if(imm) /* immediate */
     return vm_getbits(command, (start - 1), 7);
   else

--- a/dvd_reader.c	Mon Aug 25 14:23:13 2003 +0000
+++ b/dvd_reader.c	Wed Aug 27 13:54:19 2003 +0000
@@ -94,6 +94,10 @@
     ssize_t filesize;
 };
 
+int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
+                     size_t block_count, unsigned char *data, 
+                     int encrypted );
+
 /**
  * Set the level of caching on udf
  * level = 0 (no caching)

--- a/dvd_udf.c	Mon Aug 25 14:23:13 2003 +0000
+++ b/dvd_udf.c	Wed Aug 27 13:54:19 2003 +0000
@@ -144,9 +144,6 @@
   PartitionCache, RootICBCache, LBUDFCache, MapCache, AVDPCache, PVDCache
 } UDFCacheType;
 
-extern void *GetUDFCacheHandle(dvd_reader_t *device);
-extern void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
-
 void FreeUDFCache(void *cache)
 {
   struct udf_cache *c = (struct udf_cache *)cache;

--- a/dvd_udf.h	Mon Aug 25 14:23:13 2003 +0000
+++ b/dvd_udf.h	Wed Aug 27 13:54:19 2003 +0000
@@ -53,6 +53,9 @@
 			   char *volid, unsigned int volid_size);
 int UDFGetVolumeSetIdentifier(dvd_reader_t *device,
 			      uint8_t *volsetid, unsigned int volsetid_size);
+void *GetUDFCacheHandle(dvd_reader_t *device);
+void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
+
 #ifdef __cplusplus
 };
 #endif

--- a/remap.c	Mon Aug 25 14:23:13 2003 +0000
+++ b/remap.c	Wed Aug 27 13:54:19 2003 +0000
@@ -51,7 +51,7 @@
     struct block_s *blocks;
 };
 
-remap_t* remap_new( char *title) {
+static remap_t* remap_new( char *title) {
     remap_t *map = malloc( sizeof(remap_t));
     map->title = strdup(title);
     map->maxblocks = 0;
@@ -142,10 +142,8 @@
     }
 }
 
-int parseblock( 
-	char *buf, int *dom, int *tt, int *pg, 
-	unsigned long *start, unsigned long *end) 
-{
+static int parseblock(char *buf, int *dom, int *tt, int *pg, 
+		      unsigned long *start, unsigned long *end) {
     long tmp;
     char *tok;
     char *epos;