diff options
| author | Sven Hesse | 2007-02-07 16:27:43 +0000 |
|---|---|---|
| committer | Sven Hesse | 2007-02-07 16:27:43 +0000 |
| commit | 023591a77ae9248a9247c22cc8f3bae32394f1ba (patch) | |
| tree | fe8cf7d04285ed32eabe56610206eba183a43207 /sound | |
| parent | a7475dd590d1f143b033cf0c330d409a898cf44b (diff) | |
| download | scummvm-rg350-023591a77ae9248a9247c22cc8f3bae32394f1ba.tar.gz scummvm-rg350-023591a77ae9248a9247c22cc8f3bae32394f1ba.tar.bz2 scummvm-rg350-023591a77ae9248a9247c22cc8f3bae32394f1ba.zip | |
The status variables are set explicitely in the constructor instead through one memset now, to avoid setting the SoundHandle to 0 as well (the first play() would then stop SoundHandle 0, which doesn't strike me as being correct)
svn-id: r25409
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/audiocd.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 3a7c08959f..7892f03202 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -64,9 +64,13 @@ static const TrackFormat TRACK_FORMATS[] = { AudioCDManager::AudioCDManager() { - memset(&_cd, 0, sizeof(_cd)); memset(_cachedTracks, 0, sizeof(_cachedTracks)); memset(_trackInfo, 0, sizeof(_trackInfo)); + _cd.playing = false; + _cd.track = 0; + _cd.start = 0; + _cd.duration = 0; + _cd.numLoops = 0; _currentCache = 0; _mixer = g_system->getMixer(); assert(_mixer); |