Cleanup mmc5 audio

Author: negativeExponent

src/apu.h

@@ -76,6 +76,7 @@ typedef struct SquareUnit {
 	Envelope    envelope;       /* Envelope to control volume for square wave */
 	Sweep       sweep;          /* Sweep to modify frequency of square wave */
 	Timer       timer;          /* Cycle counter and period to reload */
+	int32       cvbc;
 } SquareUnit;
 
 typedef struct TriangleUnit {
@@ -163,41 +164,6 @@ static const uint8 SquareWaveTable[2][4][8] = {
 	},
 };
 
-/* TODO: merge these properly. Check should be expansion audio based, not based on mapper number */
-typedef struct __MMC5SQUARE {
-	/* regs */
-	uint8 volume;
-	uint8 duty;
-	uint8 enabled;
-	int16 freq;
-
-	uint8 env_control;
-	uint8 lengthcount;
-	uint8 decvolume;
-	uint8 deccount;
-	uint8 reloaddec; /* reload envelope */
-
-	/* timers */
-	uint8 dcount;
-	int32 vcount;
-	int32 cvbc;
-} MMC5SQUARE;
-
-typedef struct __MMC5PCM {
-	uint8 rawdata;
-	uint8 control;
-	int32 cvbc;
-} MMC5PCM;
-
-typedef struct __MMC5SOUND {
-	MMC5SQUARE square[2];
-	MMC5PCM pcm;
-	int32 fcnt;
-} MMC5SOUND;
-
-extern MMC5SOUND MMC5Sound;
-extern void (*mmc5_sfun)(MMC5SQUARE *channel);
-
 extern uint8 isMMC5Audio;
 
 #endif /* _FCEU_APU_H */