diff options
| author | Mutwin Kraus | 2002-03-14 14:16:20 +0000 |
|---|---|---|
| committer | Mutwin Kraus | 2002-03-14 14:16:20 +0000 |
| commit | d8ca3d29875813733996c079147a092fd3ead359 (patch) | |
| tree | 3efd6fb49a89b1162a645f302691b886effd13f1 /mac | |
| parent | 7db72310244e11524cad14105017fd82c46a0d94 (diff) | |
| download | scummvm-rg350-d8ca3d29875813733996c079147a092fd3ead359.tar.gz scummvm-rg350-d8ca3d29875813733996c079147a092fd3ead359.tar.bz2 scummvm-rg350-d8ca3d29875813733996c079147a092fd3ead359.zip | |
Added QuickTime Music support for the Mac Carbon Port.
svn-id: r3751
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/mac.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mac/mac.cpp b/mac/mac.cpp index 211ca09c99..7d32c4c21a 100644 --- a/mac/mac.cpp +++ b/mac/mac.cpp @@ -124,6 +124,8 @@ int sel; Scumm scumm; ScummDebugger debugger; Gui gui; +SoundEngine sound; +SOUND_DRIVER_TYPE snd_driv; WndMan wm[1]; byte veryFastMode; @@ -294,7 +296,7 @@ static pascal OSStatus EventHandler( EventHandlerCallRef inCallRef, EventRef inE void pc_loop() { int delta; - int last_time, new_time; + int last_time, new_time, old_time = TickCount(); delta = 0; do { @@ -304,6 +306,8 @@ void pc_loop() waitForTimer(&scumm, delta * 15 + last_time - new_time); last_time = TickCount(); + sound.on_timer(); + if(gui._active) { gui.loop(); delta = 3; @@ -894,6 +898,8 @@ void main(void) wm->_vgabuf = (byte*)calloc(320,200); wm->_scumm = &scumm; + sound.initialize(&scumm,&snd_driv); + scumm._gui = &gui; scumm.scummMain(2, &gameTitle); |