libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 10:19:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,228 Commits 5 Branches 5 Tags 1.8 GiB
96a8d0ec1c
Commit Graph

266 Commits

Author SHA1 Message Date
Jonathan Gray
6cb61537f4 enable midi for non puttdemo humongous games. need to properly return the result of whether music is running though... 
svn-id: r7673
 2003-05-19 08:04:47 +00:00
Jamieson Christian
e088227e3b Removed annoying debug output 
svn-id: r7671
 2003-05-19 05:14:18 +00:00
Jamieson Christian
417dc08484 Proof of concept for XMIDI parser in Humongous games. 
You must still uncomment the VAR_SOUNDPARAM setting for this to work...?

svn-id: r7670
 2003-05-19 05:04:38 +00:00
Max Horn
b43ea06a80 fixed illegal var access in V7/V8 games 
svn-id: r7475
 2003-05-12 19:53:18 +00:00
Max Horn
98881c3a6a init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning 
svn-id: r7393
 2003-05-08 15:48:50 +00:00
Max Horn
b3eb397ad2 reordered iMuseDigital stuff to be next to each other 
svn-id: r7289
 2003-05-03 20:45:31 +00:00
Max Horn
00d796e451 slightly better hack because it will work with loaded games, too, and doesn't use any evil static vars 
svn-id: r7282
 2003-05-03 12:41:35 +00:00
Max Horn
24b3b32b16 fix for my hack :-) 
svn-id: r7281
 2003-05-03 12:28:37 +00:00
Max Horn
029b99691a hack that avoids buglet where music doesn't stop in MonkeyVGA/EGA 
svn-id: r7280
 2003-05-03 11:42:25 +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
Max Horn
2b74abd2c9 PalmOS changes 
svn-id: r7224
 2003-04-30 13:23:31 +00:00
Jonathan Gray
d60bc44587 add preliminary bits for making xmi music in humongous games work, just need someone to do something with the pointer now :) 
svn-id: r7072
 2003-04-22 11:34:46 +00:00
Max Horn
a33e4dddac ignore sound resource in OLD_BUNDLE games for now 
svn-id: r6992
 2003-04-12 19:42:12 +00:00
Jonathan Gray
9bfcce6e79 remove incorrect cast 
svn-id: r6925
 2003-04-06 23:22:54 +00:00
Nicolas Bacca
fb20404df0 Watch this cast 
svn-id: r6912
 2003-04-05 11:24:58 +00:00
Nicolas Bacca
103937ea63 Add delay in ms for tremor vorbis implementation and possible autodetection 
svn-id: r6911
 2003-04-05 09:55:12 +00:00
Max Horn
c409895483 make the volume controls in the global options dialog work 
svn-id: r6863
 2003-03-25 15:55:27 +00:00
Max Horn
be47bc121e cleanup 
svn-id: r6847
 2003-03-23 13:14:54 +00:00
Max Horn
1baa7e30d0 cleanup 
svn-id: r6836
 2003-03-18 22:07:49 +00:00
Max Horn
0602882b18 cleanup 
svn-id: r6832
 2003-03-18 16:13:52 +00:00
Max Horn
8073abd096 clean up / some more sanity checks 
svn-id: r6760
 2003-03-08 00:05:27 +00:00
Max Horn
7ec34ab1a9 refactored some stuff (and made readMAXS virtual, with V2/V3 code having own implementations); cleaned up V6 array shuffle code; made more Scumm member vars/methods protected 
svn-id: r6751
 2003-03-07 21:38:46 +00:00
Paweł Kołodziejski
39510ce4cc changed voice buffer allocation to needed size 
svn-id: r6737
 2003-03-07 07:49:10 +00:00
Paweł Kołodziejski
26144eda33 decreased sound buffer for imuse digital, bundle music, and cmi smush audio 
svn-id: r6735
 2003-03-07 06:41:44 +00:00
Max Horn
dd24a5d797 overlooked one 
svn-id: r6730
 2003-03-07 01:36:42 +00:00
Max Horn
7222d05d68 uhh - code did modify ptr, then free() it (even before my change, which exposed the problem by always freeing, not just upon errors 
svn-id: r6729
 2003-03-07 01:35:54 +00:00
Max Horn
fd2e1c2413 fixed memory leak (1 MB each time a bundle sound was plyed... ouch) 
svn-id: r6728
 2003-03-07 01:21:55 +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
Jonathan Gray
91786c253d add bundle file names for comi demo, and only add .IMX when playing the full version 
svn-id: r6688
 2003-03-04 06:10:07 +00:00
Jonathan Gray
d31b7439e1 we were reading 8 bytes too much on DIGI sounds 
svn-id: r6648
 2003-03-01 13:32:45 +00:00
Jonathan Gray
88906b0360 hacky support for humongous talkie format 
svn-id: r6646
 2003-03-01 12:44:52 +00:00
Jonathan Gray
0e5a19e13e change rate for humongous DIGI sounds to 11025 
svn-id: r6644
 2003-02-28 11:32:43 +00:00
Max Horn
5863805e2c more stuff made 'protected' 
svn-id: r6592
 2003-02-08 00:38:17 +00:00
Jonathan Gray
b5d15825d3 revert part of the no sound device present stuff that was causing speech to finish prematurely 
svn-id: r6583
 2003-02-03 12:59:54 +00:00
James Brown
afec98c655 Stop the sound que stuff erroring(). This code was nasty, it LET itself write out of bounds -then- error()'ed. Youch. 
There is still a problem, as this warning will come up quite frequently - leading me to believe the que is not being processed
properly?

svn-id: r6564
 2003-01-29 04:00:45 +00:00
Paweł Kołodziejski
dc7a876136 added "implementation" of imGetMusicPosition 
svn-id: r6550
 2003-01-26 14:26:03 +00:00
James Brown
8d9b84b98e Patch 671701: SO_TALK_FREQUENCY 
svn-id: r6547
 2003-01-26 10:54:34 +00:00
Paweł Kołodziejski
091c7089f8 added assert for voice samples 
svn-id: r6541
 2003-01-25 20:01:23 +00:00
Paweł Kołodziejski
8e8575003b implemented properly comi sound codecs 
svn-id: r6538
 2003-01-25 18:41:32 +00:00
Paweł Kołodziejski
d942441f7f applied patch #674141: CMI: Smush sync tuning 
svn-id: r6537
 2003-01-25 12:13:41 +00:00
James Brown
5f7cd1c93d LCA'03 commit: Fix talking where no sound hardware is present 
svn-id: r6536
 2003-01-24 06:41:10 +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
Paweł Kołodziejski
050a3fcd12 fix compilation under VC6 
svn-id: r6494
 2003-01-18 14:00:59 +00:00
James Brown
35d3d26f0c Fix old-game resource error dialog 
svn-id: r6441
 2003-01-13 13:13:36 +00:00
James Brown
374e3a3f26 Fix ComI music bundle switching on disk change 
svn-id: r6434
 2003-01-12 19:15:30 +00:00
Paweł Kołodziejski
a8f4c821cf added missing SYNC opcode 
svn-id: r6380
 2003-01-10 08:25:16 +00:00
James Brown
9df455ce38 Plop in some better disk switching code for CMI - I have no idea how well this will work transitioning from a disk1 room to a disk2 
room in-game, but it works for bootparams and saved games..

svn-id: r6322
 2003-01-02 10:36:17 +00:00
Max Horn
d59dc6cf17 endian fix 
svn-id: r6318
 2003-01-01 20:59:59 +00:00
Max Horn
cdeaf66794 cleaned up soundKludge 
svn-id: r6303
 2002-12-31 21:56:58 +00:00
Paweł Kołodziejski
edacf91d7f fixed play CMI music 
svn-id: r6246
 2002-12-29 01:28:44 +00:00
Paweł Kołodziejski
8969d5e59c added missing return 
svn-id: r6243
 2002-12-28 21:55:32 +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
b794c3c375 fixed warning 
svn-id: r6238
 2002-12-28 16:38:15 +00:00
Paweł Kołodziejski
9d664c9003 added 16 bits samples to playVoice 
svn-id: r6235
 2002-12-28 15:48:37 +00:00
Paweł Kołodziejski
642cfec556 fix playVoice 
svn-id: r6234
 2002-12-28 15:42:44 +00:00
Paweł Kołodziejski
b90ef60f2a added CMI sound codec 
svn-id: r6232
 2002-12-28 15:02:23 +00:00
James Brown
540667567e Voice sample support, again missing a required codec 
svn-id: r6195
 2002-12-27 12:10:22 +00:00
James Brown
d3ade5b23e Add skeleton music support for CMI (but codec not implemented) 
svn-id: r6193
 2002-12-27 11:47:00 +00:00
Max Horn
c44512ff71 added FIXME comment 
svn-id: r6178
 2002-12-26 22:02:58 +00:00
Max Horn
ad7fefd34e map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor') 
svn-id: r6176
 2002-12-26 21:50:13 +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
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
1a97719ae5 fix warning when compiling w/o vorbis/mp3 support 
svn-id: r5603
 2002-11-19 01:52:22 +00:00
Jamieson Christian
5da9c10dab Fixes to Master/SFX/Music volumes: 
- All are in 0-255 range now. No 0-127 mismatches.
- Master volume now affects SFX and Music, consistent with LEC behavior.
- The [ and ] keys now affect Music volume, not Master. Consistent with LEC behavior.
Also changed [ and ] increment to 16, for 256/16 = 16 volume increments outside the GUI.

svn-id: r5592
 2002-11-17 17:59:00 +00:00
Max Horn
775adc7a4f more initialisation fixes 
svn-id: r5533
 2002-11-13 15:08:22 +00:00
Max Horn
973032dd90 fixed warnings 
svn-id: r5425
 2002-11-05 21:29:44 +00:00
Max Horn
4bde7140a2 fix for bug #633082; added some asserts to catch similiar problems in the future 
svn-id: r5417
 2002-11-05 13:39:09 +00:00
Jonathan Gray
6614318d2f fix the fixme.. changing one of the pcm_seek calls back to time_seek was what I meant to do... 
svn-id: r5356
 2002-10-31 00:39:48 +00:00
Jonathan Gray
605b7f1d2a force non integer math to make loom work properly with vorbis again 
svn-id: r5355
 2002-10-31 00:32:54 +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
Paweł Kołodziejski
bf3505da5c don't put samples into stream SoundMixer if sound card is disabled 
svn-id: r5338
 2002-10-27 19:32:36 +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
Max Horn
ab13e67b09 fix -Wshadow warnings 
svn-id: r5270
 2002-10-23 00:24:43 +00:00
Max Horn
5151e561d5 fixing various warnings that occur with -Wshadow;some other minor cleanup 
svn-id: r5239
 2002-10-22 11:48:24 +00:00
James Brown
34ec25201c Patch 622642 
svn-id: r5218
 2002-10-21 16:27:23 +00:00
Max Horn
8af300fec3 The terms Word and DWord are somewhat Windows centric; in fact there are systems on which word is 32bit, as opposed to our 16 bits. Hence, use the uin16/uint32 naming scheme, which is not ambigious 
svn-id: r5216
 2002-10-21 13:23:25 +00:00
Max Horn
31c773923e use File::size() method were it makes sense; one small change to simon.cpp based on comment on bug #595813 
svn-id: r5210
 2002-10-21 12:34:54 +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
James Brown
96c900f095 Make it possible to disable digitalimuse by just commenting out it's 
creation in scummvm.cpp

svn-id: r5162
 2002-10-16 09:11:08 +00:00
Paweł Kołodziejski
41b61adac0 fixes to imuse 
svn-id: r5161
 2002-10-16 07:59:11 +00:00
Paweł Kołodziejski
09225027f1 changes to imuse 
svn-id: r5157
 2002-10-15 21:55:04 +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
f9b36a3404 applied patch: #619275 
svn-id: r5099
 2002-10-06 15:31:58 +00:00
Paweł Kołodziejski
60874d4200 hack: enabled exit from loop on bad opcode. 
some FT samples (ex. 362) has bad length, 2 bytes

svn-id: r5098
 2002-10-06 10:55:04 +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
Max Horn
a9d25bb24a patch #617417: Sound fix for Sam & Max demo 
svn-id: r5085
 2002-10-03 09:16:14 +00:00
Paweł Kołodziejski
518cfaafcc fixed compilation and indent 
svn-id: r5077
 2002-10-02 17:52:20 +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
Max Horn
f3281f93c5 patch #617419: SAM: sound fix 
svn-id: r5075
 2002-10-02 17:30:26 +00:00
James Brown
b7e83decd7 Fix 'isSoundRunning' for Creative samples (eg, Full Throttle) 
svn-id: r5072
 2002-10-02 10:12:19 +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
Paweł Kołodziejski
5d6498faef changed the dig music into stream sound 
svn-id: r5054
 2002-09-30 19:31:41 +00:00
Paweł Kołodziejski
a9c1eb6075 synced with local sources (imuse) 
svn-id: r5053
 2002-09-30 19:10:35 +00:00
James Brown
4a64ba5024 Patch #616146: Hack to prevent multiple sounds on DOTT/SamNmax (not sure if it's the correct 
behavior for Sam, seems right for DOTT tho)

svn-id: r5034
 2002-09-29 15:12:18 +00:00
Paweł Kołodziejski
037b08130e framework of Imuse sound for The Dig 
svn-id: r5031
 2002-09-29 07:08:31 +00:00
Max Horn
09f56dc233 some fixes for the message dialog; added some comments 
svn-id: r5021
 2002-09-26 12:29:10 +00:00
James Brown
522ee88b62 Patch 614223: _sfxMode fix 
svn-id: r5019
 2002-09-26 09:59:47 +00:00
Max Horn
a681eb029e renamec string -> _string and sentence -> _sentence in class Scumm (I originally reworked StringTab, but then noticed the save game format depends on it <sigh>) 
svn-id: r4995
 2002-09-22 01:17:53 +00:00
Max Horn
e886ba64d2 yet more warning fixes 
svn-id: r4992
 2002-09-22 00:04:04 +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
Paweł Kołodziejski
462d26937c Timer is handled in Engine now 
svn-id: r4964
 2002-09-18 10:22:36 +00:00
James Brown
74448d3f77 Fix some odd regression issue. 
Somewhere, recently, current_cd_sound has stopped being set for various things.

svn-id: r4951
 2002-09-16 12:10:19 +00:00
Paweł Kołodziejski
f7ff5c67fa improved open function in File class 
svn-id: r4945
 2002-09-15 19:28:34 +00:00
Paweł Kołodziejski
2f91c18b22 speed changes to play smush movies 
svn-id: r4941
 2002-09-15 05:38:04 +00:00
Max Horn
040b6c656a reducing some header dependencies 
svn-id: r4928
 2002-09-13 12:20:55 +00:00
Max Horn
ecdb98a0ee patch #608226 (Sam & Max sound fix) 
svn-id: r4926
 2002-09-13 11:59:43 +00:00
Travis Howell
004c6ddec9 Commited the following patches 
[ 606595 ] Fix for Sam & Max animation glitch
[ 607175 ] Possible fix for bug #590511
[ 607677 ] Partial workaround for bug #566062
[ 607713 ] patch for bug 580350 (MI2 F5 crash)

svn-id: r4924
 2002-09-11 13:28:34 +00:00
Max Horn
0320b8aa28 some Indy 3 mods (sound is still not working properly, though) 
svn-id: r4914
 2002-09-09 11:15:44 +00:00
Paweł Kołodziejski
ca03c9b5fc changed file io in sounds to class File 
svn-id: r4896
 2002-09-02 07:53:43 +00:00
Paweł Kołodziejski
3826c7c8a8 changed Bundle to File class, cleanup 
svn-id: r4874
 2002-08-31 09:50:36 +00:00
Max Horn
41c2d6fba3 sound system cleanup 
svn-id: r4867
 2002-08-29 23:45:15 +00:00