patch-2.2.18 linux/drivers/sound/emu10k1/voicemgr.h

• Lines: 54
• Date: Tue Nov 28 17:20:58 2000
• Orig file: v2.2.17/drivers/sound/emu10k1/voicemgr.h
• Orig date: Sat Sep 9 18:42:43 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/sound/emu10k1/voicemgr.h linux/drivers/sound/emu10k1/voicemgr.h
@@ -47,7 +47,7 @@
 {
 	/* FX bus amount send */
 
-	u32 bus_routing;
+	u32 send_routing;
 
 	u32 send_a;
 	u32 send_b;
@@ -64,11 +64,6 @@
 	u32 byampl_env_decay;
 };
 
-struct voice_allocdesc
-{
-	u8 usage;			/* playback, Midi */
-	u8 flags;			/* stereo/mono rec/playback 8/16 bit*/
-};
 
 struct emu_voice
 {
@@ -77,10 +72,9 @@
 	u8 num;			/* Voice ID */
 	u8 flags;		/* Stereo/mono, 8/16 bit */
 
-	u32 start;
         u32 startloop;
         u32 endloop;
-        u32 end;
+	u32 start;
 
 	u32 initial_pitch;
 	u32 pitch_target;
@@ -88,18 +82,10 @@
 	struct voice_param params[2];
 };
 
-struct voice_cntlset
-{
-	u32 paramID;
-	u32 value;
-};
-
-int emu10k1_voice_alloc(struct emu10k1_card *, struct emu_voice *, struct voice_allocdesc *);
+int emu10k1_voice_alloc(struct emu10k1_card *, struct emu_voice *);
 void emu10k1_voice_free(struct emu_voice *);
 void emu10k1_voice_playback_setup(struct emu_voice *);
-void emu10k1_voice_start(struct emu_voice *);
+void emu10k1_voice_start(struct emu_voice *, int);
 void emu10k1_voice_stop(struct emu_voice *);
-void emu10k1_voice_setcontrol(struct emu_voice *, struct voice_cntlset *, u32);
-void emu10k1_voice_getcontrol(struct emu_voice *, u32, u32 *);
 
 #endif /* _VOICEMGR_H */