Paweł Kołodziejski
97c78cc376
changed getting position of bundle song to ms
...
svn-id: r11265
2003-11-12 07:05:52 +00:00
Max Horn
0bcc7ce80e
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup
...
svn-id: r11257
2003-11-11 00:40:35 +00:00
Max Horn
4ae61964f2
cleanup
...
svn-id: r10874
2003-10-17 17:05:19 +00:00
Max Horn
96a8d0ec1c
proper fix for COMI timer issue: don't let a Timer remove itself
...
svn-id: r10867
2003-10-17 16:30:24 +00:00
Max Horn
d7660a2662
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
...
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)
...
svn-id: r10549
2003-10-02 22:42:03 +00:00
Max Horn
8f26c43b49
cleanup
...
svn-id: r10260
2003-09-15 19:48:54 +00:00
Max Horn
a7676e07c3
removed the seperate 'MP3' CD methods in class Sound (besides being misnamed, merging them into their parent functions actually seems clearer to me, reading wise)
...
svn-id: r10071
2003-09-07 19:47:58 +00:00
Max Horn
1dbab0237f
cleanup/refactoring
...
svn-id: r10070
2003-09-07 19:28:45 +00:00
Max Horn
361c3b95d5
some cleanup; clarified isSoundInUse semantics and the difference between IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus
...
svn-id: r10069
2003-09-07 17:14:56 +00:00
Paweł Kołodziejski
743a3fbdaf
added sound handle stuff to mixer streams
...
svn-id: r9956
2003-09-01 13:43:22 +00:00
Max Horn
0df319e952
#include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)
...
svn-id: r9359
2003-08-01 12:21:04 +00:00
Max Horn
0b4e48b59e
revamped MP3/Vorbis CD 'emulation' code to use a PlayingSoundHandle -> this allows to finally get rid of the hackish isChannelActive/isChannelUsed methods in SoundMixer
...
svn-id: r9346
2003-07-31 20:24:10 +00:00
Max Horn
6b470390f7
cleanup
...
svn-id: r9281
2003-07-29 12:39:41 +00:00
Max Horn
9bd7cdbce0
so it's not the endFrame, but the duration (in frames), after all! grmbl, took me long enough to figure this out, now I can fix up system.h, and then decide whom I can blame for this mess (yeah I know I renamed everything to endFrame in here, but it was named incorrectly in many other places already... ah well, at least now we know :-)
...
svn-id: r9130
2003-07-22 20:27:54 +00:00
Max Horn
bb87787314
fix for bug #769744 (COMI: Trying to append to a nonexistant stream)
...
svn-id: r9025
2003-07-14 21:37:45 +00:00
Max Horn
095b68d74f
partially implemented the Audio CD query opcode in Zak256 (see bug #762589 ); cleanup
...
svn-id: r8680
2003-06-30 23:18:20 +00:00
Max Horn
67a1aa89db
Fixes as per bug #762593 (Zak256 Audio CD handling); some cleanup (e.g. renamed start/delay -> startFrame/endFrame)
...
svn-id: r8679
2003-06-30 22:25:08 +00:00
Max Horn
aa19687a4c
fixed memory leak when restarting
...
svn-id: r8661
2003-06-26 23:04:41 +00:00
Max Horn
7f3118f8d8
more const qualifiers
...
svn-id: r8649
2003-06-25 23:49:54 +00:00
Max Horn
870ce2879e
added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
...
svn-id: r8648
2003-06-25 23:25:52 +00:00
Paweł Kołodziejski
a1f760b944
this should prevent changing music in some room in the DIG
...
svn-id: r8641
2003-06-23 21:23:10 +00:00
Max Horn
fcc46ac891
more cleanup
...
svn-id: r8497
2003-06-15 01:56:47 +00:00
Max Horn
f1fc68773d
made stuff in class Sound protected where possible; moved readCreativeVocFile to imuse_digi.cpp and turned it into a static function; put the DigitalTrackInfo stuff into sound.cpp (keeping it private); removed #includes from sound.h (this cuts down interdependencies a little)
...
svn-id: r8493
2003-06-15 00:54:14 +00:00
Max Horn
86d57f3c7a
many pedantic warning fixes (and some actual potential buglets fixed, too)
...
svn-id: r7795
2003-05-21 18:09:49 +00:00
Max Horn
48293bd132
various music related changes and cleanup; also modified MonkeyVGA music sync, at least the intro is much better synced now; not sure about other parts of it / other games
...
svn-id: r7237
2003-05-01 00:04:05 +00:00
Paweł Kołodziejski
aa3766018f
updated copyrights headers
...
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
093428ae9a
and more cleanup
...
svn-id: r6718
2003-03-06 17:58:13 +00:00
Paweł Kołodziejski
dc7a876136
added "implementation" of imGetMusicPosition
...
svn-id: r6550
2003-01-26 14:26:03 +00:00
Jonathan Gray
846d73c536
patch #670660 by Daniel Schepler, properly handle disc switching wrt voice file in comi
...
svn-id: r6522
2003-01-20 05:59:25 +00:00
James Brown
ada8a85b7b
Make things compile :)
...
svn-id: r6435
2003-01-12 19:50:21 +00:00
Paweł Kołodziejski
edacf91d7f
fixed play CMI music
...
svn-id: r6246
2002-12-29 01:28:44 +00:00
Paweł Kołodziejski
3102fd42e3
added more stuff for CMI music
...
svn-id: r6241
2002-12-28 21:46:49 +00:00
Max Horn
004ea9f8eb
converted heaps of int16 to int for V8 compatibility; fixed defineArray for V8; added some work in o8_kludge2
...
svn-id: r6132
2002-12-25 14:46:39 +00:00
Max Horn
ce6913cf36
fix -pedantic warnings
...
svn-id: r6108
2002-12-25 00:36:04 +00:00
Jamieson Christian
50b69cb2db
Fixed inappropriate expiration of sound resources,
...
which fixes concurrency issues esp. in PocketPC and MorphOS.
Stubbed SysEx command 2 (start of song) to get rid of annoying warning.
Changed MT-32 instrument warnings to fit on one (80-char) line.
svn-id: r5842
2002-12-05 21:45:55 +00:00
Max Horn
d6adddb792
fix for bug #633082 ; added some asserts to catch similiar problems in the future
...
svn-id: r5420
2002-11-05 13:56:31 +00:00
James Brown
63ee97b1ee
Fix using MAD -without- Vorbis, and remove COMPRESSED_SOUND_FILE define.
...
Please keep in mind that if you put an 'else' statement in an if clause, keep in mind that if the code it's supposed to
'else' is in another define.... and that isn't set... the NEXT statement of code will be used as the 'if..else'
condition.
svn-id: r5344
2002-10-28 12:56:42 +00:00
Travis Howell
a0734ef3f9
Add monster.sog support, patch #629362
...
Enable ogg support by default in mingw builds and link in ogg lib
svn-id: r5333
2002-10-27 11:41:08 +00:00
Jonathan Gray
d93e639086
patch #628997 support for ogg vorbis instead of cd tracks by Daniel Schepler. Uncomment the relevant lines in the makefile to use
...
svn-id: r5320
2002-10-27 01:12:10 +00:00
James Brown
628eea3de4
Patch 625904: CD Looping
...
svn-id: r5199
2002-10-20 13:17:43 +00:00
James Brown
80ce915f3d
Fix Wait:forActorDraw and the 'infinite mouth movement' problem in The Dig.
...
Code assumed that the actor always starts talking in the same room it finishes talking in - this doesn't apply for several cutscene
sequences in The Dig. Also added the usual talkChannel fallback code in for The Dig.
svn-id: r5186
2002-10-18 11:45:57 +00:00
Paweł Kołodziejski
45b1a8ea45
cleanup sfx and music in imuse, changed talkdelay description(disable) in the dig
...
svn-id: r5148
2002-10-15 06:53:42 +00:00
Paweł Kołodziejski
63762d48de
synced with local sources (imuse)
...
svn-id: r5110
2002-10-08 19:35:39 +00:00
Paweł Kołodziejski
01ccb6be9a
added looping voc samples in imuse(not tested)
...
svn-id: r5087
2002-10-04 08:04:35 +00:00
Paweł Kołodziejski
aa2d21d68e
FT also use Imuse
...
svn-id: r5086
2002-10-03 23:16:10 +00:00
Paweł Kołodziejski
98d90696ad
added panning control in imuse and reverse stereo support
...
svn-id: r5076
2002-10-02 17:31:55 +00:00
Paweł Kołodziejski
ce182dbaf3
changed from byte to int16 to handle sound number greater than 255
...
svn-id: r5056
2002-09-30 22:59:42 +00:00
Travis Howell
f1a273e092
Add the following patches:
...
[ 609649 ] Sound patch for GF_OLD256 games
[ 611997 ] RFC: Timer-based CD audio sync
svn-id: r4986
2002-09-21 13:48:03 +00:00
Max Horn
ecdb98a0ee
patch #608226 (Sam & Max sound fix)
...
svn-id: r4926
2002-09-13 11:59:43 +00:00