SWORD25: Further work on sound.

Have difficulties with understanding how mainmenu sound is stopped.
Currently it is not. Must be some trickery with object creation.

svn-id: r53367

1 files changed, 0 insertions, 39 deletions

diff --git a/engines/sword25/sfx/soundengine_script.cpp b/engines/sword25/sfx/soundengine_script.cpp
index fad9742c16..808fced94a 100644
--- a/engines/sword25/sfx/soundengine_script.cpp
+++ b/engines/sword25/sfx/soundengine_script.cpp
@@ -44,7 +44,6 @@
 #include "sword25/sfx/soundengine.h"
 
 namespace Sword25 {
-// -----------------------------------------------------------------------------
 
 static int Init(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
@@ -62,8 +61,6 @@ static int Init(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static int Update(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -75,8 +72,6 @@ static int Update(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int SetVolume(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -89,8 +84,6 @@ static int SetVolume(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int GetVolume(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -102,8 +95,6 @@ static int GetVolume(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static int PauseAll(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -115,8 +106,6 @@ static int PauseAll(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int ResumeAll(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -128,8 +117,6 @@ static int ResumeAll(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int PauseLayer(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -141,8 +128,6 @@ static int PauseLayer(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int ResumeLayer(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -154,8 +139,6 @@ static int ResumeLayer(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static void ProcessPlayParams(lua_State *L, Common::String &FileName, SoundEngine::SOUND_TYPES &Type, float &Volume, float &Pan, bool &Loop, int &LoopStart, int &LoopEnd, uint &Layer) {
 	FileName = luaL_checkstring(L, 1);
 
@@ -222,8 +205,6 @@ static int PlaySoundEx(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static int SetSoundVolume(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -235,8 +216,6 @@ static int SetSoundVolume(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int SetSoundPanning(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -248,8 +227,6 @@ static int SetSoundPanning(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int PauseSound(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -261,8 +238,6 @@ static int PauseSound(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int ResumeSound(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -274,8 +249,6 @@ static int ResumeSound(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int StopSound(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -287,8 +260,6 @@ static int StopSound(lua_State *L) {
 	return 0;
 }
 
-// -----------------------------------------------------------------------------
-
 static int IsSoundPaused(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -300,8 +271,6 @@ static int IsSoundPaused(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static int IsSoundPlaying(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -313,8 +282,6 @@ static int IsSoundPlaying(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static int GetSoundVolume(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -326,8 +293,6 @@ static int GetSoundVolume(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static int GetSoundPanning(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
@@ -339,8 +304,6 @@ static int GetSoundPanning(lua_State *L) {
 	return 1;
 }
 
-// -----------------------------------------------------------------------------
-
 static const char *SFX_LIBRARY_NAME = "Sfx";
 
 static const luaL_reg SFX_FUNCTIONS[] = {
@@ -373,8 +336,6 @@ static const lua_constant_reg SFX_CONSTANTS[] = {
 	{0, 0}
 };
 
-// -----------------------------------------------------------------------------
-
 bool SoundEngine::_RegisterScriptBindings() {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);