--- np2/sound/rhythm.h	2003/10/16 17:58:05	1.1
+++ np2/sound/rhythm.h	2005/05/13 05:47:25	1.4
@@ -1,33 +1,11 @@
 
-enum {
-	RHYTHM_MAX		= 6
-};
-
-typedef struct {
-const SINT16	*ptr;
-	UINT		remain;
-	UINT		volreg;
-	UINT		volume;
-	UINT		lr;
-} RHYTHMCH;
-
 typedef struct {
-	RHYTHMCH	r[RHYTHM_MAX];
-	UINT		vol;
-	UINT		bitmap;
+	PMIXHDR	hdr;
+	PMIXTRK	trk[6];
+	UINT	vol;
+	UINT8	trkvol[8];
 } _RHYTHM, *RHYTHM;
 
-typedef struct {
-	SINT16	*data;
-	UINT	samples;
-} RHYTHMPCM;
-
-typedef struct {
-	RHYTHMPCM	pcm[RHYTHM_MAX];
-	UINT		vol;
-	UINT		voltbl[96];
-} RHYTHMCFG;
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,13 +13,13 @@ extern "C" {
 
 void rhythm_initialize(UINT rate);
 void rhythm_deinitialize(void);
+UINT rhythm_getcaps(void);
 void rhythm_setvol(UINT vol);
 
 void rhythm_reset(RHYTHM rhy);
+void rhythm_bind(RHYTHM rhy);
 void rhythm_update(RHYTHM rhy);
-void rhythm_setreg(RHYTHM rhy, BYTE reg, BYTE val);
-
-void SOUNDCALL rhythm_getpcm(RHYTHM rhy, SINT32 *pcm, UINT count);
+void rhythm_setreg(RHYTHM rhy, UINT reg, REG8 val);
 
 #ifdef __cplusplus
 }