From 05f54b7fe0a0fbdfc731404b77b149f10ad5679b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 30 Nov 2015 01:03:14 +0100
Subject: LAB: Make _music a member of LabEngine instead of a global

---
 engines/lab/readdiff.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/lab/readdiff.cpp')

diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index ca7d3905ce..88b4c1805d 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -393,7 +393,7 @@ void stopDiff() {
 void stopDiffEnd() {
 	if (IsPlaying) {
 		while (IsPlaying) {
-			g_music->updateMusic();
+			g_lab->g_music->updateMusic();
 			g_lab->diffNextFrame();
 		}
 	}
@@ -431,14 +431,14 @@ void readSound(bool waitTillFinished, Common::File *file) {
 		return;
 
 	while (soundTag != 65535) {
-		g_music->updateMusic();
+		g_lab->g_music->updateMusic();
 		soundTag = file->readUint32LE();
 		soundSize = file->readUint32LE() - 8;
 
 		if ((soundTag == 30) || (soundTag == 31)) {
 			if (waitTillFinished) {
-				while (g_music->isSoundEffectActive()) {
-					g_music->updateMusic();
+				while (g_lab->g_music->isSoundEffectActive()) {
+					g_lab->g_music->updateMusic();
 					g_lab->waitTOF();
 				}
 			}
@@ -449,11 +449,11 @@ void readSound(bool waitTillFinished, Common::File *file) {
 			file->skip(2);
 			byte *soundData = (byte *)malloc(soundSize);
 			file->read(soundData, soundSize);
-			g_music->playSoundEffect(sampleRate, soundSize, soundData);
+			g_lab->g_music->playSoundEffect(sampleRate, soundSize, soundData);
 		} else if (soundTag == 65535L) {
 			if (waitTillFinished) {
-				while (g_music->isSoundEffectActive()) {
-					g_music->updateMusic();
+				while (g_lab->g_music->isSoundEffectActive()) {
+					g_lab->g_music->updateMusic();
 					g_lab->waitTOF();
 				}
 			}
-- 
cgit v1.2.3