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

added mixer code, handle smush sound, handle smush filenames in lua

Browse source
This commit is contained in:
Pawel Kolodziejski 2003-12-12 21:17:31 +00:00
parent 929b13790b
commit 03abd1bb4c
18 changed files with 1796 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main.cpp
View file

@ -25,7 +25,8 @@
#include "lua.h"
#include "registry.h"
#include "engine.h"
#include "mixer.h"
#include "sound.h"
#include "mixer/mixer.h"
#ifndef _MSC_VER
#include <unistd.h>
#endif
@ -52,6 +53,8 @@ static void saveRegistry() {
}
#endif
extern SoundMixer *g_mixer;
int main(int argc, char *argv[]) {
char GLDriver[1024];
int i;
@ -102,6 +105,7 @@ int main(int argc, char *argv[]) {
}
}
g_mixer = new SoundMixer();
Mixer::instance()->start();
lua_open();
@ -154,5 +158,7 @@ int main(int argc, char *argv[]) {
#endif
Engine::instance()->mainLoop();
delete g_mixer;
return 0;
}