[Scummvm-cvs-logs] SF.net SVN: scummvm: [25409] scummvm/trunk/sound/audiocd.cpp

[drmccoy at users.sourceforge.net]

Revision: 25409
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25409&view=rev
Author:   drmccoy
Date:     2007-02-07 08:27:43 -0800 (Wed, 07 Feb 2007)

Log Message:
-----------
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)

Modified Paths:
--------------
    scummvm/trunk/sound/audiocd.cpp

Modified: scummvm/trunk/sound/audiocd.cpp
===================================================================
--- scummvm/trunk/sound/audiocd.cpp	2007-02-07 15:57:55 UTC (rev 25408)
+++ scummvm/trunk/sound/audiocd.cpp	2007-02-07 16:27:43 UTC (rev 25409)
@@ -64,9 +64,13 @@
 
 
 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.