Ticket #1024: endianfix-0.19-fixes.diff

mythmusic/mythmusic/flacdecoder.cpp

@@ -102 +102 @@
             for (channel = 0; channel < chan; channel++)
             {
                sample = (FLAC__int8)buffer[channel][cursamp];
+#if __BYTE_ORDER == __LITTLE_ENDIAN
                *(output_buf + output_at++) = ((sample >> 0) & 0xff);
+#else
+               *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+#endif
                output_bytes += 1;
             }
         }   
@@ -114 +118 @@
             for (channel = 0; channel < chan; channel++)
             { 
                sample = (FLAC__int16)buffer[channel][cursamp];             
+#if __BYTE_ORDER == __LITTLE_ENDIAN
                *(output_buf + output_at++) = ((sample >> 0) & 0xff);
                *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+#else
+               *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+               *(output_buf + output_at++) = ((sample >> 0) & 0xff);
+#endif
                output_bytes += 2;
             }
         }

mythmusic/mythmusic/flacdecoder.h

@@ -4 +4 @@
 #define HAVE_INTTYPES_H
 #include <FLAC/all.h>
 
+extern "C" {
+#include <endian.h>
+}
+
 #include "decoder.h"
 
 class Metadata;

mythmusic/mythmusic/maddecoder.cpp

@@ -488 +488 @@
             flush();
         }
         sample = fix_sample(16, *left++);
+#if __BYTE_ORDER == __LITTLE_ENDIAN
         *(output_buf + output_at++) = ((sample >> 0) & 0xff);
         *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+#else
+        *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+        *(output_buf + output_at++) = ((sample >> 0) & 0xff);
+#endif
         output_bytes += 2;
 
         if (channels == 2)
         {
             sample = fix_sample(16, *right++);
+#if __BYTE_ORDER == __LITTLE_ENDIAN
             *(output_buf + output_at++) = ((sample >> 0) & 0xff);
             *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+#else
+            *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+            *(output_buf + output_at++) = ((sample >> 0) & 0xff);
+#endif
             output_bytes += 2;
         }
     }

mythmusic/mythmusic/maddecoder.h

@@ -5 +5 @@
 
 extern "C" {
 #include <mad.h>
+#include <endian.h>
 }
 
 class Metadata;

mythmusic/mythmusic/vorbisdecoder.cpp

@@ -240 +240 @@
             seekTime = -1.0;
         }
 
+#if __BYTE_ORDER == __LITTLE_ENDIAN
         len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 0, 2, 1,
                       &section);
+#else
+        len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 1, 2, 1,
+                      &section);
+#endif
 
         if (len > 0) {
             bitrate = ov_bitrate_instant(&oggfile) / 1000;

mythmusic/mythmusic/vorbisdecoder.h

@@ -4 +4 @@
 #include "decoder.h"
 
 #include <vorbis/vorbisfile.h>
+extern "C" {
+#include <endian.h>
+}
 
 class Metadata;