[Scummvm-cvs-logs] CVS: scummvm-new/scumm imuse.cpp,1.4,1.5 insane.cpp,1.1.1.1,1.2 saveload.cpp,1.1.1.1,1.2 script_v2.cpp,1.1.1.1,1.2

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm-new/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv7048/scumm

Modified Files:
	imuse.cpp insane.cpp saveload.cpp script_v2.cpp 
Log Message:
synced with scummvm

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/imuse.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imuse.cpp	23 Aug 2002 20:33:07 -0000	1.4
+++ imuse.cpp	24 Aug 2002 15:31:36 -0000	1.5
@@ -3302,7 +3302,7 @@
 	adlib_write(0xBD, 0x00);
 	create_lookup_table();
 
-	_mixer->setup_premix(this, premix_proc);
+	_mixer->setupPremix(this, premix_proc);
 }
 
 void IMuseAdlib::adlib_write(byte port, byte value)

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/insane.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- insane.cpp	21 Aug 2002 16:07:30 -0000	1.1.1.1
+++ insane.cpp	24 Aug 2002 15:31:37 -0000	1.2
@@ -1467,7 +1467,7 @@
 			for (idx = 0; idx < MAX_STREAMER; idx++) {
 				if (_imusTrk[idx] != 0) {
 					if (_imusNewMixer[idx]) {
-						_scumm->_mixer->play_stream(NULL, idx, _imusBuf[idx], _imusFinalSize[idx], _imusRate[idx], _imusFlags[idx]);
+						_scumm->_mixer->playStream(NULL, idx, _imusBuf[idx], _imusFinalSize[idx], _imusRate[idx], _imusFlags[idx]);
 					} else {
 						_scumm->_mixer->append(idx, _imusBuf[idx], _imusFinalSize[idx], _imusRate[idx], _imusFlags[idx]);
 					}
@@ -1479,7 +1479,7 @@
 			for (idx = 0; idx < MAX_STREAMER; idx++) {
 				if (_psadTrk[idx] != 0) {
 					if (_strkNewMixer[idx]) {
-						_scumm->_mixer->play_stream(NULL, idx, _strkBuf[idx], _strkFinalSize[idx], _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+						_scumm->_mixer->playStream(NULL, idx, _strkBuf[idx], _strkFinalSize[idx], _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 					} else {
 						_scumm->_mixer->append(idx, _strkBuf[idx], _strkFinalSize[idx], _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 					}

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/saveload.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- saveload.cpp	21 Aug 2002 16:07:32 -0000	1.1.1.1
+++ saveload.cpp	24 Aug 2002 15:31:37 -0000	1.2
@@ -597,7 +597,7 @@
 	int var98Backup;
 
 	if (_mixer && !s->isSaving())
-		_mixer->stop_all();
+		_mixer->stopAll();
 
 	if (_current_version == VER_V9)
 		s->saveLoadEntries(this, mainEntriesV9);

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/script_v2.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- script_v2.cpp	21 Aug 2002 16:07:34 -0000	1.1.1.1
+++ script_v2.cpp	24 Aug 2002 15:31:37 -0000	1.2
@@ -24,7 +24,8 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
-#include "smush.h"
+#include "smush/player.h"
+#include "smush/scumm_renderer.h"
 
 #include "sound/mididrv.h"
 #include "scumm/imuse.h"
@@ -2699,7 +2700,6 @@
 	Actor *a;
 
 	IMuse *se = _imuse;						//yazoo: not very nice
-	SmushPlayer * sp;
 
 	getStackList(args, sizeof(args) / sizeof(args[0]));
 
@@ -2708,11 +2708,15 @@
 		case 4:
 			grabCursor(args[1], args[2], args[3], args[4]);
 			break;
-		case 6:
-			sp = new SmushPlayer(this);
-			sp->startVideo(args[1], getStringAddressVar(VAR_VIDEONAME));
-			delete sp;
-			break;
+		case 6: { 
+ 				ScummRenderer sr(this);
+ 				SmushPlayer sp(&sr);
+ 				char filename[512];
+ 				strcpy(filename, _gameDataPath);
+ 				strcat(filename, "video/");
+ 				strcat(filename, (char*)getStringAddressVar(VAR_VIDEONAME));
+ 				sp.play(filename);
+ 			}
 		case 7:
 			warning("o6_miscOps: stub7()");
 			break;