diff options
| author | Max Horn | 2003-06-22 13:48:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-22 13:48:47 +0000 |
| commit | d2b61e9bef797bde839c665ce4867d939e52f37c (patch) | |
| tree | a3bf9081429aa6bd9e2d117a6c7a7b8d82760820 /sound | |
| parent | 2a31d107c90190dfc21d2b0d7f2e727d739bb034 (diff) | |
| download | scummvm-rg350-d2b61e9bef797bde839c665ce4867d939e52f37c.tar.gz scummvm-rg350-d2b61e9bef797bde839c665ce4867d939e52f37c.tar.bz2 scummvm-rg350-d2b61e9bef797bde839c665ce4867d939e52f37c.zip | |
properly init member vars instead of using memset
svn-id: r8608
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 9f862ce65c..9bdf893ace 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -155,12 +155,24 @@ public: SoundMixer::SoundMixer() { - memset(this,0,sizeof(SoundMixer)); // palmos + _syst = 0; + _mutex = 0; + + _premixParam = 0; + _premixProc = 0; + + for (int i = 0; i != NUM_CHANNELS; i++) + _handles[i] = NULL; + + _outputRate = 0; _volumeTable = (int16 *)calloc(256 * sizeof(int16), 1); - for (int i = 0; i != NUM_CHANNELS; i++) { + _musicVolume = 0; + + _paused = false; + + for (int i = 0; i != NUM_CHANNELS; i++) _channels[i] = NULL; - } } SoundMixer::~SoundMixer() { |