aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-04-26 00:37:24 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-05-04 09:16:04 +0200
commit8ec734d027955d8a708a2782df6113e2372564cd (patch)
tree3a03d493838d48cecdb5d736948f2c3bc35bda86
parent7f643fb53a1b09f644f1fc552e1c8faf98986e53 (diff)
audio: Unfold OPLSAMPLE
It was used only once, and now it was always int16_t. Signed-off-by: Juan Quintela <quintela@redhat.com> Message-id: 20170425223739.6703-12-quintela@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/audio/fmopl.c2
-rw-r--r--hw/audio/fmopl.h11
2 files changed, 1 insertions, 12 deletions
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 8f935f62b6..b1cb4b46d6 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -988,7 +988,7 @@ void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length)
{
int i;
int data;
- OPLSAMPLE *buf = buffer;
+ int16_t *buf = buffer;
uint32_t amsCnt = OPL->amsCnt;
uint32_t vibCnt = OPL->vibCnt;
uint8_t rhythm = OPL->rhythm&0x20;
diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h
index 1e74019586..c23628724c 100644
--- a/hw/audio/fmopl.h
+++ b/hw/audio/fmopl.h
@@ -3,17 +3,6 @@
#include <stdint.h>
-/* --- system optimize --- */
-/* select bit size of output : 8 or 16 */
-#define OPL_OUTPUT_BIT 16
-
-#if (OPL_OUTPUT_BIT==16)
-typedef int16_t OPLSAMPLE;
-#endif
-#if (OPL_OUTPUT_BIT==8)
-typedef unsigned char OPLSAMPLE;
-#endif
-
typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec);
typedef void (*OPL_IRQHANDLER)(int param,int irq);
typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);