[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.69,1.70 insane.cpp,1.59,1.60 saveload.cpp,1.61,1.62 script_v2.cpp,1.87,1.88 scummvm.cpp,1.214,1.215 scummvm.dsp,1.52,1.53 sound.cpp,1.131,1.132
Pawe? Ko?odziejski
aquadran at users.sourceforge.net
Sat Aug 24 06:17:03 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv8229
Modified Files:
gui.cpp insane.cpp saveload.cpp script_v2.cpp scummvm.cpp
scummvm.dsp sound.cpp
Log Message:
comited patch #598939, thanks Xavier :)
with some changes:
- compatible with VC6,
- naming convention,
- removed channel.cpp
- correct endlines.
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- gui.cpp 14 Aug 2002 20:43:54 -0000 1.69
+++ gui.cpp 24 Aug 2002 13:16:54 -0000 1.70
@@ -621,8 +621,8 @@
_s->_imuse->set_music_volume(_s->_sound->_sound_volume_music);
_s->_imuse->set_master_volume(_s->_sound->_sound_volume_master);
- _s->_mixer->set_volume(_s->_sound->_sound_volume_sfx);
- _s->_mixer->set_music_volume(_s->_sound->_sound_volume_music);
+ _s->_mixer->setVolume(_s->_sound->_sound_volume_sfx);
+ _s->_mixer->setMusicVolume(_s->_sound->_sound_volume_music);
scummcfg->set("master_volume", _s->_sound->_sound_volume_master);
scummcfg->set("music_volume", _s->_sound->_sound_volume_music);
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- insane.cpp 18 Aug 2002 22:47:10 -0000 1.59
+++ insane.cpp 24 Aug 2002 13:16:54 -0000 1.60
@@ -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/saveload.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- saveload.cpp 23 Aug 2002 22:07:39 -0000 1.61
+++ saveload.cpp 24 Aug 2002 13:16:54 -0000 1.62
@@ -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/script_v2.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- script_v2.cpp 23 Aug 2002 22:07:39 -0000 1.87
+++ script_v2.cpp 24 Aug 2002 13:16:54 -0000 1.88
@@ -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 "sound/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,10 +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;
+ 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);
+ }
break;
case 7:
warning("o6_miscOps: stub7()");
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- scummvm.cpp 23 Aug 2002 22:40:26 -0000 1.214
+++ scummvm.cpp 24 Aug 2002 13:16:54 -0000 1.215
@@ -114,7 +114,7 @@
/* Bind the mixer to the system => mixer will be invoked
* automatically when samples need to be generated */
- if (!_mixer->bind_to_system(syst)) {
+ if (!_mixer->bindToSystem(syst)) {
warning("Sound initialization failed");
if (detector->_use_adlib) {
_use_adlib = false;
@@ -123,8 +123,8 @@
warning("Adlib music was selected, switching to midi null driver");
}
}
- _mixer->set_volume(kDefaultSFXVolume);
- _mixer->set_music_volume(kDefaultMusicVolume);
+ _mixer->setVolume(kDefaultSFXVolume);
+ _mixer->setMusicVolume(kDefaultMusicVolume);
// Init iMuse
@@ -222,10 +222,7 @@
_vars[VAR_V5_DRAWFLAGS] = 11;
_vars[VAR_59] = 3;
- // Setup light
_vars[VAR_CURRENT_LIGHTS] = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
- _flashlightXStrips = 7;
- _flashlightYStrips = 7;
}
mouse.x = 104;
Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.dsp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- scummvm.dsp 18 Aug 2002 19:04:44 -0000 1.52
+++ scummvm.dsp 24 Aug 2002 13:16:54 -0000 1.53
@@ -257,6 +257,146 @@
SOURCE=.\gui\widget.h
# End Source File
# End Group
+# Begin Group "smush"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\smush\blitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\blitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\brenderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\brenderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\channel.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\chunck.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\chunck.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\chunck_type.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec1.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec37.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec37.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec44.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec44.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec47.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\codec47.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\color.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\color.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\decoder.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\frenderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\frenderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\imuse_channel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\mixer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\player.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\player.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\rect.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\rect.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\renderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\saud_channel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\scumm_renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\smush\scumm_renderer.h
+# End Source File
+# End Group
# Begin Source File
SOURCE=.\actor.cpp
@@ -347,10 +487,6 @@
# End Source File
# Begin Source File
-SOURCE=.\insane.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\main.cpp
# End Source File
# Begin Source File
@@ -602,10 +738,6 @@
# Begin Source File
SOURCE=.\scummsys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\smush.h
# End Source File
# Begin Source File
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- sound.cpp 23 Aug 2002 20:26:25 -0000 1.131
+++ sound.cpp 24 Aug 2002 13:16:54 -0000 1.132
@@ -137,19 +137,19 @@
byte * buffer = (byte*)malloc (size);
memcpy(buffer, ptr, size);
if (chan == 1) {
- _scumm->_mixer->play_raw(NULL, buffer, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED);
+ _scumm->_mixer->playRaw(NULL, buffer, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED);
}
else if (chan == 2) {
- _scumm->_mixer->play_raw(NULL, buffer, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_STEREO);
+ _scumm->_mixer->playRaw(NULL, buffer, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_STEREO);
}
} else if (bits == 12) {
byte * buffer = NULL;
uint32 final_size = decode12BitsSample(ptr, &buffer, size);
if (chan == 1) {
- _scumm->_mixer->play_raw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS);
+ _scumm->_mixer->playRaw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS);
}
else if (chan == 2) {
- _scumm->_mixer->play_raw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
+ _scumm->_mixer->playRaw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
}
}
}
@@ -249,7 +249,7 @@
// Allocate a sound buffer, copy the data into it, and play
char *sound = (char*)malloc(size);
memcpy(sound, ptr, size);
- _scumm->_mixer->play_raw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
}
// Support for Putt-Putt sounds - very hackish, too 8-)
@@ -265,15 +265,15 @@
// Allocate a sound buffer, copy the data into it, and play
char *sound = (char*)malloc(size);
- memcpy(sound, ptr+8, size);
- _scumm->_mixer->play_raw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ memcpy(sound, ptr + 8, size);
+ _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
}
else if (ptr != NULL && READ_UINT32_UNALIGNED(ptr) == MKID('Crea')) {
int size, rate;
char * sound = read_creative_voc_file(ptr, size, rate);
if(sound != NULL) {
- _scumm->_mixer->play_raw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
}
return;
}
@@ -310,7 +310,7 @@
// Allocate a sound buffer, copy the data into it, and play
char *sound = (char*)malloc(size);
memcpy(sound, ptr + 33, size);
- _scumm->_mixer->play_raw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
}
@@ -386,7 +386,7 @@
// FIXME: Something in the header signifies looping. Need to track it down and add a
// mixer flag or something.
- _scumm->_mixer->play_raw(NULL, sound, size, 11000, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ _scumm->_mixer->playRaw(NULL, sound, size, 11000, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
}
@@ -676,8 +676,8 @@
_scumm->_imuse->set_master_volume(_sound_volume_master);
_scumm->_imuse->set_music_volume(_sound_volume_music);
- _scumm->_mixer->set_volume(_sound_volume_sfx);
- _scumm->_mixer->set_music_volume(_sound_volume_music);
+ _scumm->_mixer->setVolume(_sound_volume_sfx);
+ _scumm->_mixer->setMusicVolume(_sound_volume_music);
}
_sfxFile = openSfxFile();
}
@@ -833,12 +833,12 @@
}
void Sound::stopSfxSound() {
- _scumm->_mixer->stop_all();
+ _scumm->_mixer->stopAll();
}
bool Sound::isSfxFinished() {
- return !_scumm->_mixer->has_active_channel();
+ return !_scumm->_mixer->hasActiveChannel();
}
uint32 Sound::decode12BitsSample(byte * src, byte ** dst, uint32 size) {
@@ -985,7 +985,7 @@
byte * buffer = NULL;
uint32 final_size = decode12BitsSample(ptr, &buffer, size);
- _scumm->_mixer->play_raw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
+ _scumm->_mixer->playRaw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
}
void Sound::playBundleSound(char *sound) {
@@ -1042,7 +1042,7 @@
byte * final = (byte *)malloc(size);
memcpy(final, ptr, size);
- _scumm->_mixer->play_raw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
}
int Sound::playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned) {
@@ -1051,14 +1051,14 @@
byte flags = SoundMixer::FLAG_AUTOFREE;
if (isUnsigned)
flags |= SoundMixer::FLAG_UNSIGNED;
- return _scumm->_mixer->play_raw(NULL, sound, size, rate, flags);
+ return _scumm->_mixer->playRaw(NULL, sound, size, rate, flags);
}
int Sound::playSfxSound_MP3(void *sound, uint32 size) {
#ifdef COMPRESSED_SOUND_FILE
if (_soundsPaused)
return -1;
- return _scumm->_mixer->play_mp3(NULL, sound, size, SoundMixer::FLAG_AUTOFREE);
+ return _scumm->_mixer->playMP3(NULL, sound, size, SoundMixer::FLAG_AUTOFREE);
#endif
return -1;
}
@@ -1200,7 +1200,7 @@
if (_mp3_cd_playing == true)
_scumm->_mixer->stop(_mp3_index);
- _mp3_index = _scumm->_mixer->play_mp3_cdtrack(NULL, _mp3_tracks[index], duration);
+ _mp3_index = _scumm->_mixer->playMP3CDTrack(NULL, _mp3_tracks[index], duration);
_mp3_cd_playing = true;
return 0;
}
@@ -1229,7 +1229,7 @@
return -1;
}
- if (_scumm->_mixer->_channels[_mp3_index]->sound_finished())
+ if (_scumm->_mixer->_channels[_mp3_index]->soundFinished())
stopMP3CD();
return 0;
}
More information about the Scummvm-git-logs
mailing list