Browse Source

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>
Juan Quintela 8 years ago
parent
commit
8ec734d027
2 changed files with 1 additions and 12 deletions
  1. 1 1
      hw/audio/fmopl.c
  2. 0 11
      hw/audio/fmopl.h

+ 1 - 1
hw/audio/fmopl.c

@@ -988,7 +988,7 @@ void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length)
 {
 {
     int i;
     int i;
 	int data;
 	int data;
-	OPLSAMPLE *buf = buffer;
+	int16_t *buf = buffer;
 	uint32_t amsCnt  = OPL->amsCnt;
 	uint32_t amsCnt  = OPL->amsCnt;
 	uint32_t  vibCnt  = OPL->vibCnt;
 	uint32_t  vibCnt  = OPL->vibCnt;
 	uint8_t rhythm = OPL->rhythm&0x20;
 	uint8_t rhythm = OPL->rhythm&0x20;

+ 0 - 11
hw/audio/fmopl.h

@@ -3,17 +3,6 @@
 
 
 #include <stdint.h>
 #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_TIMERHANDLER)(int channel,double interval_Sec);
 typedef void (*OPL_IRQHANDLER)(int param,int irq);
 typedef void (*OPL_IRQHANDLER)(int param,int irq);
 typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);
 typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);