Merge from 1.1.

--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c

1 files changed, 15 insertions, 15 deletions

diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index aec526eb6..ca1acd6e7 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -139,20 +139,16 @@
 
 #define CD_RAW_SECTOR_SIZE 2352
 
+static const uint8_t STR_MAGIC =
+  { 0x60, 0x01, 0x01, 0x80 };
 #define STR_MAX_CHANNELS 32
 
-#define STR_MAGIC (0x80010160)
-
 #define CDXA_TYPE_MASK     0x0E
 #define CDXA_TYPE_DATA     0x08
 #define CDXA_TYPE_AUDIO    0x04
 #define CDXA_TYPE_VIDEO    0x02
 #define CDXA_SUBMODE_EOF   0x80 /* set if EOF */
 
-#define FOURCC_TAG BE_FOURCC
-#define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F')
-#define CDXA_TAG FOURCC_TAG('C', 'D', 'X', 'A')
-
 /* FIXME */
 #define FRAME_DURATION 45000
 
@@ -198,8 +194,8 @@ static int open_str_file(demux_str_t *this) {
   }
 
   /* check for STR with a RIFF header */
-  if ((_X_BE_32(&check_bytes[0]) == RIFF_TAG) &&
-      (_X_BE_32(&check_bytes[8]) == CDXA_TAG))
+  if ( _x_is_fourcc(&check_bytes[0], "RIFF") &&
+       _x_is_fourcc(&check_bytes[8], "CDXA") )
     local_offset = 0x2C;
   else
     local_offset = 0;
@@ -216,16 +212,20 @@ static int open_str_file(demux_str_t *this) {
             check_bytes[local_offset + 0x13]);
 
     /* check for 12-byte sync marker */
-    if ((_X_BE_32(&check_bytes[local_offset + 0]) != 0x00FFFFFF) ||
-	(_X_BE_32(&check_bytes[local_offset + 4]) != 0xFFFFFFFF) ||
-	(_X_BE_32(&check_bytes[local_offset + 8]) != 0xFFFFFF00)) {
+    static const uint8_t sync_marker[12] =
+      { 0x00, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0xFF, 0xFF, 0X00
+      };
+    if ( memcmp(&check_bytes[local_offset],
+		sync_marker, sizeof(sync_marker)) != 0 ) {
       lprintf("sector %d sync error\n", sector);
       return 0;
     }
 
     /* the 32 bits starting at 0x10 and at 0x14 should be the same */
-    if (_X_BE_32(&check_bytes[local_offset + 0x10]) !=
-	_X_BE_32(&check_bytes[local_offset + 0x14])) {
+    if (memcmp(&check_bytes[local_offset + 0x10],
+	       &check_bytes[local_offset + 0x14], 4) != 0) {
       lprintf("sector %d control bits copy error\n", sector);
       return 0;
     }
@@ -244,7 +244,7 @@ static int open_str_file(demux_str_t *this) {
     case CDXA_TYPE_VIDEO:
       /* first time we have seen video/data in this channel? */
       if ((!(this->channel_type[channel] & CDXA_TYPE_DATA)) &&
-	  (_X_LE_32(&check_bytes[local_offset + 0x18]) == STR_MAGIC)) {
+	  (_x_is_fourcc(&check_bytes[local_offset + 0x18], STR_MAGIC))) {
 
 	/* mark this channel as having video data */
 	this->channel_type[channel] |= CDXA_TYPE_VIDEO;
@@ -345,7 +345,7 @@ static int demux_str_send_chunk(demux_plugin_t *this_gen) {
   case CDXA_TYPE_DATA:
     /* video chunk */
 
-    if (_X_LE_32(&sector[0x18]) != STR_MAGIC ||
+    if (!_x_is_fourcc(&sector[0x18], STR_MAGIC) ||
 	channel != this->default_video_channel) {
       return 0;
     }