[Scummvm-cvs-logs] scummvm master -> 6a7834a05ed880cba32f0adb87950179c4ec404c

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a7834a05e ACCESS: Rename loadSoundTable


Commit: 6a7834a05ed880cba32f0adb87950179c4ec404c
    https://github.com/scummvm/scummvm/commit/6a7834a05ed880cba32f0adb87950179c4ec404c
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-12-27T16:55:07+01:00

Commit Message:
ACCESS: Rename loadSoundTable

Changed paths:
    engines/access/amazon/amazon_logic.cpp
    engines/access/amazon/amazon_scripts.cpp
    engines/access/sound.cpp
    engines/access/sound.h



diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c045377..82f0edf 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -317,8 +317,8 @@ void Opening::doTitle() {
 	_vm->_events->hideCursor();
 
 	if (!_vm->isDemo()) {
-		_vm->_sound->queueSound(0, 98, 30);
-		_vm->_sound->queueSound(1, 98, 8);
+		_vm->_sound->loadSoundTable(0, 98, 30);
+		_vm->_sound->loadSoundTable(1, 98, 8);
 
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 3);
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0b2ddbc..92acb36 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -95,7 +95,7 @@ void AmazonScripts::mWhile1() {
 	_vm->_oldRects.clear();
 	_sequence = 2200;
 
-	_vm->_sound->queueSound(0, 14, 15);
+	_vm->_sound->loadSoundTable(0, 14, 15);
 
 	do {
 		cLoop();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index fc574dc..53b611b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -56,8 +56,8 @@ void SoundManager::clearSounds() {
 	}
 }
 
-void SoundManager::queueSound(int idx, int fileNum, int subfile) {
-	debugC(1, kDebugSound, "queueSound(%d, %d, %d)", idx, fileNum, subfile);
+void SoundManager::loadSoundTable(int idx, int fileNum, int subfile) {
+	debugC(1, kDebugSound, "loadSoundTable(%d, %d, %d)", idx, fileNum, subfile);
 
 	Resource *soundResource;
 
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 384e9ac..7109438 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -60,7 +60,7 @@ public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
 
-	void queueSound(int idx, int fileNum, int subfile);
+	void loadSoundTable(int idx, int fileNum, int subfile);
 
 	void playSound(int soundIndex);
 	void checkSoundQueue();