summaryrefslogtreecommitdiff
path: root/mixer.h
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-02-05 09:56:04 +0000
committertron <tron@openttd.org>2006-02-05 09:56:04 +0000
commit867e1acf084c5b789d8db964fe27b3ce396f213f (patch)
tree17869439f86c9f22a75f3a301f462dbf4d4ec8ae /mixer.h
parentcf414c1864c8b0ceeb0368903eb1ed7393df36c1 (diff)
downloadopenttd-867e1acf084c5b789d8db964fe27b3ce396f213f.tar.xz
(svn r3552) Remove the global variable _mixer
Diffstat (limited to 'mixer.h')
-rw-r--r--mixer.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/mixer.h b/mixer.h
index 6228349ed..d50dc4739 100644
--- a/mixer.h
+++ b/mixer.h
@@ -3,7 +3,6 @@
#ifndef MIXER_H
#define MIXER_H
-typedef struct Mixer Mixer;
typedef struct MixerChannel MixerChannel;
enum {
@@ -13,12 +12,10 @@ enum {
// MX_UNSIGNED = 8,
};
-VARDEF Mixer *_mixer;
-
bool MxInitialize(uint rate);
-void MxMixSamples(Mixer *mx, void *buffer, uint samples);
+void MxMixSamples(void* buffer, uint samples);
-MixerChannel *MxAllocateChannel(Mixer *mx);
+MixerChannel* MxAllocateChannel(void);
void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, uint size, uint rate, uint flags);
void MxSetChannelVolume(MixerChannel *mc, uint left, uint right);
void MxActivateChannel(MixerChannel*);