Replace the mp3_frame_header paramter (pointer to bytes) with a 32 bit integer id3_signature.

--HG--
extra : transplant_source : %9D%80%60W%B8%5E%13%F9%F1%1F%B6%3F%CE%98%F5B%16A%ACd

2 files changed, 13 insertions, 13 deletions

diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index 5c13a306e..750489536 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -229,7 +229,7 @@ static int id3v2_parse_genre(char* dest, char *src, int len) {
   return 1;
 }
 
-static int id3v2_parse_header(input_plugin_t *input, uint8_t *mp3_frame_header,
+static int id3v2_parse_header(input_plugin_t *input, uint32_t id3_signature,
                               id3v2_header_t *tag_header) {
   uint8_t buf[6];
 
@@ -339,12 +339,12 @@ static int id3v22_interp_frame(input_plugin_t *input,
 
 int id3v22_parse_tag(input_plugin_t *input,
                      xine_stream_t *stream,
-                     uint8_t *mp3_frame_header) {
+                     uint32_t id3_signature) {
   id3v2_header_t tag_header;
   id3v22_frame_header_t tag_frame_header;
   int pos = 0;
 
-  if (id3v2_parse_header(input, mp3_frame_header, &tag_header)) {
+  if (id3v2_parse_header(input, id3_signature, &tag_header)) {
 
     if (tag_header.flags & ID3V22_ZERO_FLAG) {
       /* invalid flags */
@@ -532,13 +532,13 @@ static int id3v23_interp_frame(input_plugin_t *input,
 
 int id3v23_parse_tag(input_plugin_t *input,
                      xine_stream_t *stream,
-                     uint8_t *mp3_frame_header) {
+                     uint32_t id3_signature) {
   id3v2_header_t tag_header;
   id3v23_frame_header_t tag_frame_header;
   id3v23_frame_ext_header_t tag_frame_ext_header;
   int pos = 0;
 
-  if (id3v2_parse_header(input, mp3_frame_header, &tag_header)) {
+  if (id3v2_parse_header(input, id3_signature, &tag_header)) {
 
     if (tag_header.flags & ID3V23_ZERO_FLAG) {
       /* invalid flags */
@@ -783,13 +783,13 @@ static int id3v24_interp_frame(input_plugin_t *input,
 
 int id3v24_parse_tag(input_plugin_t *input,
                      xine_stream_t *stream,
-                     uint8_t *mp3_frame_header) {
+                     uint32_t id3_signature) {
   id3v2_header_t tag_header;
   id3v24_frame_header_t tag_frame_header;
   id3v24_frame_ext_header_t tag_frame_ext_header;
   int pos = 0;
 
-  if (id3v2_parse_header(input, mp3_frame_header, &tag_header)) {
+  if (id3v2_parse_header(input, id3_signature, &tag_header)) {
 
     if (tag_header.flags & ID3V24_ZERO_FLAG) {
       /* invalid flags */
@@ -851,7 +851,7 @@ int id3v24_parse_tag(input_plugin_t *input,
 
 int id3v2_parse_tag(input_plugin_t *input,
 		    xine_stream_t *stream,
-		    uint8_t *mp3_frame_header) {
+		    uint32_t id3_signature) {
   _x_assert(mp3_frame_header[0] == 'I' && mp3_frame_header[1] == 'D' && mp3_frame_header[2] == '3');
 
   int result = 0;
diff --git a/src/demuxers/id3.h b/src/demuxers/id3.h
index 35f011f30..fb8b00057 100644
--- a/src/demuxers/id3.h
+++ b/src/demuxers/id3.h
@@ -153,26 +153,26 @@ int id3v1_parse_tag (input_plugin_t *input, xine_stream_t *stream);
 
 int id3v22_parse_tag(input_plugin_t *input,
                      xine_stream_t *stream,
-                     uint8_t *mp3_frame_header);
+                     uint32_t id3_signature);
 
 int id3v23_parse_tag(input_plugin_t *input,
                      xine_stream_t *stream,
-                     uint8_t *mp3_frame_header);
+                     uint32_t id3_signature);
 
 int id3v24_parse_tag(input_plugin_t *input,
                      xine_stream_t *stream,
-                     uint8_t *mp3_frame_header);
+                     uint32_t id3_signature);
 
 /* Generic function that switch between the three above */
 int id3v2_parse_tag(input_plugin_t *input,
 		    xine_stream_t *stream,
-		    uint8_t *mp3_frame_header);
+		    uint32_t id3_signature);
 
 /**
  * @brief Checks if the given buffer is an ID3 tag preamble
  * @param ptr Pointer to the first 10 bytes of the ID3 tag
  */
-static inline int id3v2_istag(uint8_t *ptr) {
+static inline int id3v2_istag(uint32_t id3_signature) {
   return
     (ptr[0] == 'I') &&
     (ptr[1] == 'D') &&