libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-06 18:00:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LAB: Rewrite readSound() to use Common::File

Browse Source
This commit is contained in:
Filippos Karapetis 2015-10-13 07:40:24 +03:00 committed by Willem Jan Palenstijn
parent 1bdf07c7ac
commit a6805e884d
3 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/lab/diff.h
View File

@ -32,6 +32,7 @@
#define LAB_DIFF_H
#include "lab/stddefines.h"
#include "common/file.h"
namespace Lab {
@ -74,7 +75,7 @@ void blackAllScreen();
void whiteScreen();
bool readDiff(bool playonce);
void diffNextFrame();
void readSound(bool waitTillFinished);
void readSound(bool waitTillFinished, Common::File *file);
void stopDiff();
void stopDiffEnd();
void stopSound();

7
engines/lab/graphics.cpp
View File

@ -97,12 +97,15 @@ bool readPict(const char *filename, bool PlayOnce) {
/* Reads in a music file. Ignores any graphics. */
/*****************************************************************************/
bool readMusic(const char *filename, bool waitTillFinished) {
byte **file = g_music->newOpen(filename);
Common::File *file = g_resource->openDataFile(filename, MKTAG('D', 'I', 'F', 'F'));
g_music->updateMusic();
if (!g_music->_doNotFilestopSoundEffect)
g_music->stopSoundEffect();
if (!file)
return false;
DoBlack = false;
readSound(waitTillFinished);
readSound(waitTillFinished, file);
return true;
}

67
engines/lab/readdiff.cpp
View File

@ -434,48 +434,25 @@ bool readDiff(bool playonce) {
}
void readSound(bool waitTillFinished) {
uint32 header_ = 0, size_;
uint16 samplespeed_;
char temp_[5];
byte *storagefordifffile_, **difffile_ = &storagefordifffile_;
byte *mstart = *startoffile; /* Make a copy of the pointer to the start of the file */
*difffile_ = mstart; /* Now can modify the file without modifying the original */
if (mstart == NULL)
void readSound(bool waitTillFinished, Common::File *file) {
uint32 magicBytes = file->readUint32LE();
if (magicBytes != 1219009121L)
return;
readBlock(temp_, 4L, difffile_);
temp_[4] = '\0';
readBlock(&header_, 4L, difffile_);
swapULong(&header_);
uint32 soundTag = file->readUint32LE();
uint32 soundSize = file->readUint32LE();
processed += 8L;
if (!((strcmp(temp_, "DIFF") == 0) && (header_ == 1219009121L)))
return;
readBlock(&header_, 4L, difffile_);
swapULong(&header_);
readBlock(&size_, 4L, difffile_);
swapULong(&size_);
if (header_ == 0)
(*difffile_) += size_;
if (soundTag == 0)
file->skip(soundSize); // skip the header
else
return;
while (header_ != 65535) {
while (soundTag != 65535) {
g_music->updateMusic();
readBlock(&header_, 4L, difffile_);
swapULong(&header_);
soundTag = file->readUint32LE();
soundSize = file->readUint32LE() - 8;
readBlock(&size_, 4L, difffile_);
swapULong(&size_);
if ((header_ == 30) || (header_ == 31)) {
if ((soundTag == 30) || (soundTag == 31)) {
if (waitTillFinished) {
while (g_music->isSoundEffectActive()) {
g_music->updateMusic();
@ -483,20 +460,14 @@ void readSound(bool waitTillFinished) {
}
}
size_ -= 8L;
file->skip(4);
(*difffile_) += 4;
readBlock(&samplespeed_, 2L, difffile_);
swapUShortPtr(&samplespeed_, 1);
(*difffile_) += 2;
byte *music = *difffile_;
uint32 musicsize = size_;
(*difffile_) += size_;
g_music->playSoundEffect(samplespeed_, musicsize, music);
} else if (header_ == 65535L) {
uint16 sampleRate = file->readUint16LE();
file->skip(2);
byte *soundData = (byte *)malloc(soundSize);
file->read(soundData, soundSize);
g_music->playSoundEffect(sampleRate, soundSize, soundData);
} else if (soundTag == 65535L) {
if (waitTillFinished) {
while (g_music->isSoundEffectActive()) {
g_music->updateMusic();
@ -504,7 +475,7 @@ void readSound(bool waitTillFinished) {
}
}
} else
(*difffile_) += size_;
file->skip(soundSize);
}
}