From f364782d05cf0772bf2eaa71ea418650e0d9bf27 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 08:46:32 +0100
Subject: ACCESS: Some rework in MusicManager

---
 engines/access/room.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines/access/room.cpp')

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 7ef3d6937d..8ef61a9d68 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -152,8 +152,7 @@ void Room::doRoom() {
 void Room::clearRoom() {
 	if (_vm->_midi->_music) {
 		_vm->_midi->stopSong();
-		delete _vm->_midi->_music;
-		_vm->_midi->_music = nullptr;
+		_vm->_midi->freeMusic();
 	}
 
 	_vm->_sound->freeSounds();
@@ -183,7 +182,7 @@ void Room::loadRoomData(const byte *roomData) {
 
 	_vm->_midi->freeMusic();
 	if (roomInfo._musicFile._fileNum != -1) {
-		_vm->_midi->_music = _vm->_files->loadFile(roomInfo._musicFile);
+		_vm->_midi->loadMusic(roomInfo._musicFile);
 		_vm->_midi->midiPlay();
 		_vm->_midi->_musicRepeat = true;
 	}
-- 
cgit v1.2.3