diff -ru mythplugins/mythmusic/mythmusic/flacdecoder.cpp mythplugins-fix/mythmusic/mythmusic/flacdecoder.cpp
old
|
new
|
|
102 | 102 | for (channel = 0; channel < chan; channel++) |
103 | 103 | { |
104 | 104 | sample = (FLAC__int8)buffer[channel][cursamp]; |
| 105 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
105 | 106 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
| 107 | #else |
| 108 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 109 | #endif |
106 | 110 | output_bytes += 1; |
107 | 111 | } |
108 | 112 | } |
… |
… |
|
114 | 118 | for (channel = 0; channel < chan; channel++) |
115 | 119 | { |
116 | 120 | sample = (FLAC__int16)buffer[channel][cursamp]; |
| 121 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
117 | 122 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
118 | 123 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 124 | #else |
| 125 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 126 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
| 127 | #endif |
119 | 128 | output_bytes += 2; |
120 | 129 | } |
121 | 130 | } |
diff -ru mythplugins/mythmusic/mythmusic/flacdecoder.h mythplugins-fix/mythmusic/mythmusic/flacdecoder.h
old
|
new
|
|
4 | 4 | #define HAVE_INTTYPES_H |
5 | 5 | #include <FLAC/all.h> |
6 | 6 | |
| 7 | extern "C" { |
| 8 | #include <endian.h> |
| 9 | } |
| 10 | |
7 | 11 | #include "decoder.h" |
8 | 12 | |
9 | 13 | class Metadata; |
diff -ru mythplugins/mythmusic/mythmusic/maddecoder.cpp mythplugins-fix/mythmusic/mythmusic/maddecoder.cpp
old
|
new
|
|
488 | 488 | flush(); |
489 | 489 | } |
490 | 490 | sample = fix_sample(16, *left++); |
| 491 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
491 | 492 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
492 | 493 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 494 | #else |
| 495 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 496 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
| 497 | #endif |
493 | 498 | output_bytes += 2; |
494 | 499 | |
495 | 500 | if (channels == 2) |
496 | 501 | { |
497 | 502 | sample = fix_sample(16, *right++); |
| 503 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
498 | 504 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
499 | 505 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 506 | #else |
| 507 | *(output_buf + output_at++) = ((sample >> 8) & 0xff); |
| 508 | *(output_buf + output_at++) = ((sample >> 0) & 0xff); |
| 509 | #endif |
500 | 510 | output_bytes += 2; |
501 | 511 | } |
502 | 512 | } |
diff -ru mythplugins/mythmusic/mythmusic/maddecoder.h mythplugins-fix/mythmusic/mythmusic/maddecoder.h
old
|
new
|
|
5 | 5 | |
6 | 6 | extern "C" { |
7 | 7 | #include <mad.h> |
| 8 | #include <endian.h> |
8 | 9 | } |
9 | 10 | |
10 | 11 | class Metadata; |
diff -ru mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp mythplugins-fix/mythmusic/mythmusic/vorbisdecoder.cpp
old
|
new
|
|
240 | 240 | seekTime = -1.0; |
241 | 241 | } |
242 | 242 | |
| 243 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
243 | 244 | len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 0, 2, 1, |
244 | 245 | §ion); |
| 246 | #else |
| 247 | len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 1, 2, 1, |
| 248 | §ion); |
| 249 | #endif |
245 | 250 | |
246 | 251 | if (len > 0) { |
247 | 252 | bitrate = ov_bitrate_instant(&oggfile) / 1000; |
diff -ru mythplugins/mythmusic/mythmusic/vorbisdecoder.h mythplugins-fix/mythmusic/mythmusic/vorbisdecoder.h
old
|
new
|
|
4 | 4 | #include "decoder.h" |
5 | 5 | |
6 | 6 | #include <vorbis/vorbisfile.h> |
| 7 | extern "C" { |
| 8 | #include <endian.h> |
| 9 | } |
7 | 10 | |
8 | 11 | class Metadata; |
9 | 12 | |