From 220d6ce82f478966db6a4760b2288750212880b9 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 8 May 2008 00:47:23 +0000
Subject: Restructured sound code

svn-id: r31937
---
 engines/gob/scenery_v1.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'engines/gob/scenery_v1.cpp')

diff --git a/engines/gob/scenery_v1.cpp b/engines/gob/scenery_v1.cpp
index 5d3eb15a95..605b098693 100644
--- a/engines/gob/scenery_v1.cpp
+++ b/engines/gob/scenery_v1.cpp
@@ -23,13 +23,12 @@
  *
  */
 
-
 #include "common/endian.h"
 
 #include "gob/gob.h"
 #include "gob/scenery.h"
 #include "gob/util.h"
-#include "gob/cdrom.h"
+#include "gob/sound/sound.h"
 
 namespace Gob {
 
@@ -37,11 +36,11 @@ Scenery_v1::Scenery_v1(GobEngine *vm) : Scenery(vm) {
 }
 
 int16 Scenery_v1::loadAnim(char search) {
-	if (_vm->_cdrom->_cdPlaying) {
-		while (_vm->_cdrom->getTrackPos() != -1)
+	if (_vm->_sound->cdIsPlaying()) {
+		while (_vm->_sound->cdGetTrackPos() != -1)
 		    _vm->_util->longDelay(50);
 
-		_vm->_cdrom->_cdPlaying = false;
+		_vm->_sound->cdStop();
 	}
 
 	return Scenery::loadAnim(search);
-- 
cgit v1.2.3