Restructured sound code

svn-id: r31937
This commit is contained in:
Sven Hesse 2008-05-08 00:47:23 +00:00
parent 627d30d389
commit 220d6ce82f
55 changed files with 1444 additions and 739 deletions

View file

@ -23,7 +23,6 @@
*
*/
#include "common/endian.h"
#include "gob/gob.h"
@ -31,13 +30,12 @@
#include "gob/global.h"
#include "gob/util.h"
#include "gob/dataio.h"
#include "gob/cdrom.h"
#include "gob/draw.h"
#include "gob/game.h"
#include "gob/palanim.h"
#include "gob/sound.h"
#include "gob/video.h"
#include "gob/videoplayer.h"
#include "gob/sound/sound.h"
namespace Gob {
@ -51,8 +49,8 @@ void Init::cleanup(void) {
_vm->_video->freeDriver();
_vm->_global->_primarySurfDesc = 0;
_vm->_snd->speakerOff();
_vm->_snd->stopSound(0);
_vm->_sound->speakerOff();
_vm->_sound->blasterStop(0);
_vm->_dataIO->closeDataFile();
}
@ -169,8 +167,8 @@ void Init::initGame(const char *totName) {
strcpy(_vm->_game->_curTotFile, buffer);
_vm->_cdrom->testCD(1, "GOB");
_vm->_cdrom->readLIC("gob.lic");
_vm->_sound->cdTest(1, "GOB");
_vm->_sound->cdLoadLIC("gob.lic");
// Search for a Coktel logo animation or image to display
imdHandle = _vm->_dataIO->openData("coktel.imd");
@ -213,8 +211,8 @@ void Init::initGame(const char *totName) {
_vm->_game->start();
_vm->_cdrom->stopPlaying();
_vm->_cdrom->freeLICbuffer();
_vm->_sound->cdStop();
_vm->_sound->cdUnloadLIC();
delete[] _vm->_global->_inter_variables;
delete[] _vm->_global->_inter_variablesSizes;