diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /sound/mixer.h | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 189fcb27f7..d46a933d97 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -26,7 +26,6 @@ #ifndef SOUND_MIXER_H #define SOUND_MIXER_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/mutex.h" @@ -204,7 +203,7 @@ public: /** - * Pause/unpause all sounds, including all regular and permanent + * Pause/unpause all sounds, including all regular and permanent * channels * * @param paused true to pause everything, false to unpause @@ -327,7 +326,7 @@ public: * This simply calls the mix() method. */ static void mixCallback(void *s, byte *samples, int len); - + void setReady(bool ready) { _mixerReady = ready; } }; |