ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: remove GUSchar 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-17-quintela@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-26 00:37:29 +02:00 committed by Gerd Hoffmann
parent 0af81c56bf
commit 222e0356fa
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/audio/gusemu.h
View File

@ -30,10 +30,8 @@
#if defined _WIN32 && defined _MSC_VER /* doesn't support other win32 compilers yet, do it yourself... */ #if defined _WIN32 && defined _MSC_VER /* doesn't support other win32 compilers yet, do it yourself... */
typedef unsigned short GUSword; typedef unsigned short GUSword;
typedef unsigned int GUSdword; typedef unsigned int GUSdword;
typedef signed char GUSchar;
typedef signed short GUSsample; typedef signed short GUSsample;
#else #else
typedef int8_t GUSchar;
typedef uint16_t GUSword; typedef uint16_t GUSword;
typedef uint32_t GUSdword; typedef uint32_t GUSdword;
typedef int16_t GUSsample; typedef int16_t GUSsample;

8
hw/audio/gusemu_mixer.c
View File

@ -85,16 +85,16 @@ void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int
if (GUSvoice(wVSRControl) & 0x400) /* 16bit */ if (GUSvoice(wVSRControl) & 0x400) /* 16bit */
{ {
int offset = ((CurrPos >> 9) & 0xc0000) + (((CurrPos >> 9) & 0x1ffff) << 1); int offset = ((CurrPos >> 9) & 0xc0000) + (((CurrPos >> 9) & 0x1ffff) << 1);
GUSchar *adr; int8_t *adr;
adr = (GUSchar *) state->himemaddr + offset; adr = (int8_t *) state->himemaddr + offset;
sample1 = (*adr & 0xff) + (*(adr + 1) * 256); sample1 = (*adr & 0xff) + (*(adr + 1) * 256);
sample2 = (*(adr + 2) & 0xff) + (*(adr + 2 + 1) * 256); sample2 = (*(adr + 2) & 0xff) + (*(adr + 2 + 1) * 256);
} }
else /* 8bit */ else /* 8bit */
{ {
int offset = (CurrPos >> 9) & 0xfffff; int offset = (CurrPos >> 9) & 0xfffff;
GUSchar *adr; int8_t *adr;
adr = (GUSchar *) state->himemaddr + offset; adr = (int8_t *) state->himemaddr + offset;
sample1 = (*adr) * 256; sample1 = (*adr) * 256;
sample2 = (*(adr + 1)) * 256; sample2 = (*(adr + 1)) * 256;
} }