diff options
author | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
commit | 66bbf336c6af7353ef0aeed58002c46543b30635 (patch) | |
tree | ad4a63860df2626b22f77e7dac712e958bea54cb /mixer.h | |
parent | ccc0a3f4dbf58c005b22341ac8874252924690cd (diff) | |
download | openttd-66bbf336c6af7353ef0aeed58002c46543b30635.tar.xz |
(svn r7759) -Merge: makefile rewrite. This merge features:
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
Diffstat (limited to 'mixer.h')
-rw-r--r-- | mixer.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/mixer.h b/mixer.h deleted file mode 100644 index d50dc4739..000000000 --- a/mixer.h +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ */ - -#ifndef MIXER_H -#define MIXER_H - -typedef struct MixerChannel MixerChannel; - -enum { - MX_AUTOFREE = 1, -// MX_8BIT = 2, -// MX_STEREO = 4, -// MX_UNSIGNED = 8, -}; - -bool MxInitialize(uint rate); -void MxMixSamples(void* buffer, uint samples); - -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*); - -#endif /* MIXER_H */ |