thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FULLPIPE: Change the sound code to use Common::String

Browse source
This commit is contained in:
Filippos Karapetis 2017-03-22 05:22:36 +02:00
parent 2649e2b1fc
commit abe1c65d62
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/fullpipe/fullpipe.cpp
View file

@ -131,10 +131,6 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
_stream2playing = false;
memset(_sceneTracks, 0, sizeof(_sceneTracks));
memset(_trackName, 0, sizeof(_trackName));
memset(_sceneTracksCurrentTrack, 0, sizeof(_sceneTracksCurrentTrack));
_numSceneTracks = 0;
_sceneTrackHasSequence = false;
_sceneTrackIsPlaying = false;

10
engines/fullpipe/fullpipe.h
View file

@ -165,15 +165,15 @@ public:
int _currSoundListCount;
bool _soundEnabled;
bool _flgSoundList;
char _sceneTracks[10][260];
Common::String _sceneTracks[10];
int _numSceneTracks;
bool _sceneTrackHasSequence;
int _musicMinDelay;
int _musicMaxDelay;
int _musicLocal;
char _trackName[2600];
Common::String _trackName;
int _trackStartDelay;
char _sceneTracksCurrentTrack[260];
Common::String _sceneTracksCurrentTrack;
bool _sceneTrackIsPlaying;
void stopAllSounds();
@ -183,8 +183,8 @@ public:
int getSceneTrack();
void updateTrackDelay();
void startSceneTrack();
void startSoundStream1(const char *trackName);
void playOggSound(const char *trackName, Audio::SoundHandle *stream);
void startSoundStream1(Common::String trackName);
void playOggSound(Common::String trackName, Audio::SoundHandle *stream);
void stopSoundStream2();
void stopAllSoundStreams();
void stopAllSoundInstances(int id);

26
engines/fullpipe/sound.cpp
View file

@ -257,7 +257,8 @@ void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) {
GameVar *var = gvar->getSubVarByName("MUSIC");
memset(_sceneTracks, 0, sizeof(_sceneTracks));
for (int i = 0; i < 10; i++)
_sceneTracks[i].clear();
_numSceneTracks = 0;
_sceneTrackHasSequence = false;
@ -273,7 +274,7 @@ void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) {
while (sub) {
if (_musicAllowed & sub->_value.intValue) {
Common::strlcpy(_sceneTracks[_numSceneTracks], sub->_varName.c_str(), 260);
_sceneTracks[_numSceneTracks] = sub->_varName;
_numSceneTracks++;
}
@ -291,7 +292,7 @@ void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) {
if (seq) {
_sceneTrackHasSequence = true;
Common::strlcpy(_trackName, seq->_value.stringValue, 2600);
_trackName = seq->_value.stringValue;
}
if (_musicLocal)
@ -320,12 +321,12 @@ void FullpipeEngine::startSceneTrack() {
int trackNum = getSceneTrack();
if (trackNum == -1) {
strcpy(_sceneTracksCurrentTrack, "silence");
_sceneTracksCurrentTrack = "silence";
_trackStartDelay = 2880;
_sceneTrackIsPlaying = 0;
} else {
strcpy(_sceneTracksCurrentTrack, _sceneTracks[trackNum]);
_sceneTracksCurrentTrack = _sceneTracks[trackNum];
startSoundStream1(_sceneTracksCurrentTrack);
@ -363,20 +364,20 @@ int FullpipeEngine::getSceneTrack() {
return res;
}
void FullpipeEngine::startSoundStream1(const char *trackName) {
void FullpipeEngine::startSoundStream1(Common::String trackName) {
stopAllSoundStreams();
playOggSound(trackName, _soundStream1);
}
void FullpipeEngine::playOggSound(const char *trackName, Audio::SoundHandle *stream) {
void FullpipeEngine::playOggSound(Common::String trackName, Audio::SoundHandle *stream) {
#ifdef USE_VORBIS
if (_mixer->isSoundHandleActive(*stream))
return;
Common::File *track = new Common::File();
if (!track->open(trackName)) {
warning("Could not open %s", trackName);
warning("Could not open %s", trackName.c_str());
delete track;
return;
}
@ -429,7 +430,8 @@ void FullpipeEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed
GameVar *var = sceneVar->getSubVarByName(name);
memset(_sceneTracks, 0, sizeof(_sceneTracks));
for (int i = 0; i < 10; i++)
_sceneTracks[i].clear();
_numSceneTracks = 0;
_sceneTrackHasSequence = false;
@ -445,7 +447,7 @@ void FullpipeEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed
while (sub) {
if (_musicAllowed & sub->_value.intValue) {
Common::strlcpy(_sceneTracks[_numSceneTracks], sub->_varName.c_str(), 260);
_sceneTracks[_numSceneTracks] = sub->_varName;
_numSceneTracks++;
}
@ -463,12 +465,12 @@ void FullpipeEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed
if (seq) {
_sceneTrackHasSequence = true;
Common::strlcpy(_trackName, seq->_value.stringValue, 2600);
_trackName = seq->_value.stringValue;
}
if (delayed) {
if (_sceneTrackIsPlaying && _numSceneTracks == 1) {
if (strcmp(_sceneTracksCurrentTrack, _sceneTracks[0]))
if (_sceneTracksCurrentTrack != _sceneTracks[0])
stopAllSoundStreams();
}