[Scummvm-cvs-logs] SF.net SVN: scummvm: [28627] scummvm/trunk/engines/agi

[buddha_ at users.sourceforge.net]

Revision: 28627
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28627&view=rev
Author:   buddha_
Date:     2007-08-15 09:44:13 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Removed use of decodeSound(int resnum). Not needed at the moment (Probably going to be replaced by other functionality later).

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi_v2.cpp
    scummvm/trunk/engines/agi/agi_v3.cpp
    scummvm/trunk/engines/agi/sound.cpp
    scummvm/trunk/engines/agi/sound.h

Modified: scummvm/trunk/engines/agi/agi_v2.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi_v2.cpp	2007-08-15 16:40:45 UTC (rev 28626)
+++ scummvm/trunk/engines/agi/agi_v2.cpp	2007-08-15 16:44:13 UTC (rev 28627)
@@ -256,7 +256,6 @@
 		if (data != NULL) {
 			_vm->_game.sounds[n].rdata = data;
 			_vm->_game.dirSound[n].flags |= RES_LOADED;
-			_vm->_sound->decodeSound(n);
 		} else {
 			ec = errBadResource;
 		}

Modified: scummvm/trunk/engines/agi/agi_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi_v3.cpp	2007-08-15 16:40:45 UTC (rev 28626)
+++ scummvm/trunk/engines/agi/agi_v3.cpp	2007-08-15 16:44:13 UTC (rev 28627)
@@ -347,7 +347,6 @@
 		if (data != NULL) {
 			_vm->_game.sounds[n].rdata = data;
 			_vm->_game.dirSound[n].flags |= RES_LOADED;
-			_vm->_sound->decodeSound(n);
 		} else {
 			ec = errBadResource;
 		}

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2007-08-15 16:40:45 UTC (rev 28626)
+++ scummvm/trunk/engines/agi/sound.cpp	2007-08-15 16:44:13 UTC (rev 28627)
@@ -320,31 +320,6 @@
 	}
 }
 
-void SoundMgr::decodeSound(int resnum) {
-#if 0
-	int type, size;
-	int16 *buf;
-	uint8 *src;
-	struct SoundIIgsSample *smp;
-
-	debugC(3, kDebugLevelSound, "(%d)", resnum);
-	type = READ_LE_UINT16(_vm->_game.sounds[resnum].rdata);
-
-	if (type == AGI_SOUND_SAMPLE) {
-		/* Convert sample data to 16 bit signed format
-		 */
-		smp = (struct SoundIIgsSample *)_vm->_game.sounds[resnum].rdata;
-		size = ((int)smp->sizeHi << 8) + smp->sizeLo;
-		src = (uint8 *)_vm->_game.sounds[resnum].rdata;
-		buf = (int16 *)calloc(1, 54 + (size << 1) + 100);	/* FIXME */
-		memcpy(buf, src, 54);
-		for (; size--; buf[size + 54] = ((int16)src[size + 54] - 0x80) << 4);	/* FIXME */
-		_vm->_game.sounds[resnum].rdata = (uint8 *) buf;
-		free(src);
-	}
-#endif
-}
-
 void SoundMgr::startSound(int resnum, int flag) {
 	int i, type;
 #if 0

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2007-08-15 16:40:45 UTC (rev 28626)
+++ scummvm/trunk/engines/agi/sound.h	2007-08-15 16:44:13 UTC (rev 28627)
@@ -278,8 +278,6 @@
 	void premixerCall(int16 *buf, uint len);
 
 public:
-
-	void decodeSound(int);
 	void unloadSound(int);
 	void playSound();
 	int initSound();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.