From b2355cac9fd4ce6bec6d8058bd5dd4718d47d3ca Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 3 Jan 2010 22:41:35 +0000
Subject: - Remove unsafe default constructor of Audio::Timestamp. - Add an
 assert which prevents the _frameRate from being 0 in the Audio::Timestamp
 constructor.

svn-id: r46958
---
 engines/sci/sfx/iterator/core.cpp    | 2 +-
 engines/sci/sfx/iterator/songlib.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/sfx/iterator/core.cpp b/engines/sci/sfx/iterator/core.cpp
index fcd83ef800..bc90a555a6 100644
--- a/engines/sci/sfx/iterator/core.cpp
+++ b/engines/sci/sfx/iterator/core.cpp
@@ -140,7 +140,7 @@ public:
 };
 
 SfxPlayer::SfxPlayer(SciVersion soundVersion)
-	: _soundVersion(soundVersion) {
+	: _soundVersion(soundVersion), _wakeupTime(0, SFX_TICKS_PER_SEC), _currentTime(0, 1)  {
 	_polyphony = 0;
 
 	_mididrv = 0;
diff --git a/engines/sci/sfx/iterator/songlib.cpp b/engines/sci/sfx/iterator/songlib.cpp
index 657e52017d..b5ce9c34ac 100644
--- a/engines/sci/sfx/iterator/songlib.cpp
+++ b/engines/sci/sfx/iterator/songlib.cpp
@@ -33,7 +33,7 @@ namespace Sci {
 
 #define debug_stream stderr
 
-Song::Song() {
+Song::Song() : _wakeupTime(0, SFX_TICKS_PER_SEC) {
 	_handle = 0;
 	_resourceNum = 0;
 	_priority = 0;
@@ -53,7 +53,7 @@ Song::Song() {
 	_nextStopping = NULL;
 }
 
-Song::Song(SongHandle handle, SongIterator *it, int priority) {
+Song::Song(SongHandle handle, SongIterator *it, int priority) : _wakeupTime(0, SFX_TICKS_PER_SEC) {
 	_handle = handle;
 	_resourceNum = 0;
 	_priority = priority;
-- 
cgit v1.2.3