Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-04-10 19:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for VS2015 and newer by MetalliC

Browse source
This commit is contained in:
Bart Trzynadlowski 2017-09-18 04:24:23 +00:00
parent f2030ac125
commit e12a945ddd
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Src/Sound/MPEG/audio.cpp
View file

@ -190,7 +190,7 @@ void initialise_decoder(void)
*/ */
void initialise_globals(void) void initialise_globals(void)
{ {
append=data=nch=0; append=::data=nch=0;
f_bdirty=TRUE; f_bdirty=TRUE;
bclean_bytes=0; bclean_bytes=0;

12
Src/Sound/MPEG/huffman.cpp
View file

@ -47,12 +47,12 @@ static inline unsigned int viewbits(int n)
{ {
unsigned int pos,ret_value; unsigned int pos,ret_value;
pos = data >> 3; pos = ::data >> 3;
ret_value = buffer[pos] << 24 | ret_value = buffer[pos] << 24 |
buffer[pos+1] << 16 | buffer[pos+1] << 16 |
buffer[pos+2] << 8 | buffer[pos+2] << 8 |
buffer[pos+3]; buffer[pos+3];
ret_value <<= data & 7; ret_value <<= ::data & 7;
ret_value >>= 32 - n; ret_value >>= 32 - n;
return ret_value; return ret_value;
@ -60,8 +60,8 @@ unsigned int pos,ret_value;
static inline void sackbits(int n) static inline void sackbits(int n)
{ {
data += n; ::data += n;
data &= 8*BUFFER_SIZE-1; ::data &= 8*BUFFER_SIZE-1;
} }
/* huffman_decode() is supposed to be faster now /* huffman_decode() is supposed to be faster now
@ -228,8 +228,8 @@ int big_value = info->big_values[gr][ch] << 1;
/* set position to start of the next gr/ch /* set position to start of the next gr/ch
*/ */
if (cnt != info->part2_3_length[gr][ch] - ssize ) { if (cnt != info->part2_3_length[gr][ch] - ssize ) {
data-=cnt-(info->part2_3_length[gr][ch] - ssize); ::data-=cnt-(info->part2_3_length[gr][ch] - ssize);
data&= 8*BUFFER_SIZE - 1; ::data&= 8*BUFFER_SIZE - 1;
} }
if (l<576) non_zero[ch]=l; if (l<576) non_zero[ch]=l;
else non_zero[ch]=576; else non_zero[ch]=576;

2
Src/Sound/MPEG/layer2.cpp
View file

@ -74,7 +74,7 @@ int hsize,fs,mean_frame_size;
/* layers 1 and 2 do not have a 'bit reservoir' /* layers 1 and 2 do not have a 'bit reservoir'
*/ */
append=data=0; append=::data=0;
fillbfr(mean_frame_size + header->padding_bit - hsize); fillbfr(mean_frame_size + header->padding_bit - hsize);