disabled CMI smush audio, cleanup codec 47, correct path param

svn-id: r6252

3 files changed, 4 insertions, 20 deletions

diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 7eb7a3bfde..47e28db05c 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1288,7 +1288,7 @@ void Scumm_v8::o8_startVideo()
 	
 	//ScummRenderer * sr = new ScummRenderer(this, 1000/14);
 	//SmushPlayer * sp = new SmushPlayer(sr);
-	//sp->play((char*)_scriptPointer, dirName);
+	//sp->play((char*)_scriptPointer, getGameDataPath());
 	
 	_scriptPointer += len + 1;
 }
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index da253f5d18..6bfd28d7ff 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -25,24 +25,6 @@
 #include "blitter.h"
 
 bool DumpDecoder::decode(Blitter & dst, Chunk & src) {
-	int32 i = 0;
-	/*int32 seq =*/ src.getWord();
-	int32 codec = src.getByte();
-	/*int32 flags =*/ src.getByte();
-	int32 unknown[22];
-	for(i = 0; i < 0; i++) {
-		unknown[i] = src.getByte();
-	}
-	if(codec == 5 || codec == 1) {
-		do {
-			int32 code = src.getByte();
-			int32 length = (code >> 1) + 1;
-			if (code & 1)
-				dst.put(src.getChar(), length);
-			else
-				dst.blit(src, length);
-		} while (!src.eof());
-	}
 
 	return true;
 }
diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp
index 960282e28b..616b712520 100644
--- a/scumm/smush/player.cpp
+++ b/scumm/smush/player.cpp
@@ -23,6 +23,7 @@
 #include "common/file.h"
 #include "common/util.h"
 #include "common/engine.h" // for debug, warning, error
+#include "scumm/scumm.h"
 
 #include "player.h"
 
@@ -564,7 +565,8 @@ void SmushPlayer::handleFrame(Chunk & b) {
 				handleDeltaPalette(*sub);
 				break;
 			case TYPE_IACT:
-				handleImuseAction(*sub);
+				if (g_scumm->_gameId != GID_CMI)
+					handleImuseAction(*sub);
 				break;
 			case TYPE_STOR:
 				handleStore(*sub);