thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1188 commits 35 branches 0 tags 1.4 GiB
Commit graph

37 commits

Author SHA1 Message Date
Max Horn
1c4167f080 pulled out arisme's recent changes to pauseMode, they are not correct as they break pause mode for all systems that use real MIDI drivers (see bug #584684). If you need a mute music mode, then add an according function to iMUSE/mixer but don't abuse pause mode, please 
svn-id: r4615
 2002-07-22 12:44:57 +00:00
James Brown
8de1ace6c7 Apply patch from Torbj�rn Andersson to make MP3_CDMUSIC mixer use 
music_volume instead of sfx_volume.

svn-id: r4611
 2002-07-21 06:55:33 +00:00
Nicolas Bacca
74041e2120 Fixed Monkey Island 2 freeze when sound is paused 
svn-id: r4608
 2002-07-20 07:57:22 +00:00
Max Horn
5317b473b2 added cubic spline interpolation (only to mix_unsigned_mono_8 because that's what I used to test); next step will be to put this into a seperate function which all the 9 mixers (8 normal ones and one for MP3) will then use, but I gotta sleep now :-) 
svn-id: r4585
 2002-07-17 23:50:38 +00:00
Max Horn
2b97c496c2 indent run 
svn-id: r4475
 2002-07-07 18:04:03 +00:00
James Brown
9ac3f92be1 Hacks to make SMUSH mixer a bit more tollerable. 
svn-id: r4429
 2002-06-26 10:20:56 +00:00
Lionel Ulmer
f8190443ca As long as I am fixing regression bug introduced by my streaming 
patch, fix also the 'FLAG_FILE' stuff.

Endy, you should be able to revert your patch to Simon as it should
not be needed anymore now :-)

svn-id: r4412
 2002-06-06 21:50:20 +00:00
Lionel Ulmer
6abeab5b5a This should fix the regression introduced by my streaming changes (bug 
#564756). Thanks Oliver Kiehl for the find :-)

svn-id: r4411
 2002-06-06 21:42:11 +00:00
Lionel Ulmer
a639c1be6f Added the mutex support to ease the streaming (ie to prevent all race 
conditions between an 'append' and a playing by the sound
thread). Porters should add the relevant stuff to their OSystem
interfaces.

But finally, the bug reported by Valgrind was much more trivial than
that and is also fixed in this commit :-)

svn-id: r4398
 2002-06-03 21:20:11 +00:00
Lionel Ulmer
8b7207666e Fix the streaming used in the movies in TheDig (warning, did not test 
Full Throttle).

This should be less buggy (ie crash less often, maybe not better
quality) than the previous code.

NOTE: the '1024 *' is here for testing purposes and will need to be
      severely reduced :-/

svn-id: r4396
 2002-06-02 20:30:21 +00:00
Paweł Kołodziejski
c9f67e27b3 Fix for mixer 16 bits samples. Samples are clear now. 
bbrox: This patch works fine for me, previous not. (MSVC6 + SP5)

svn-id: r4368
 2002-05-22 05:55:10 +00:00
Lionel Ulmer
f6b934e068 Add volume control like it is done for MP3 to the 16 bit 'mixers' (ie 
using a 32 level only volume range).

svn-id: r4365
 2002-05-20 20:35:25 +00:00
Paweł Kołodziejski
4aabb0378c The Dig: stereo samples and mixer 
svn-id: r4359
 2002-05-19 20:38:53 +00:00
Paweł Kołodziejski
c9a53bcf76 The Dig: 16 bit samples and mixer 
svn-id: r4358
 2002-05-19 15:20:18 +00:00
Lionel Ulmer
3b4c6ceb0f Added infrastructure to support more than 8 bit signed / unsigned RAW 
mixers. Porters, beware, the default configuration is now 16 bit
stereo instead of 16 mono as before (I changed X11 and SDL but no
others).

I did not add support for any other format yet, I will let Endy do it
when he needs it :-)

svn-id: r4348
 2002-05-18 14:53:19 +00:00
James Brown
0d60185a88 Add new mixer 'append' function to allow pseudo-streaming for SMUSH 
svn-id: r4291
 2002-05-12 16:53:13 +00:00
Max Horn
4e76591ba6 my version of MAD (0.14.2b) has no MAD_ERROR_NONE; where did that come from? 
svn-id: r4191
 2002-05-04 00:10:01 +00:00
Lionel Ulmer
fe54e1caec Remove floating point in the MP3 volume control (baaaaaaaad on PDAs 
like the iPAQ where no FPU is present). Instead replace it by a '32
level' volume control.

svn-id: r4184
 2002-05-03 19:47:51 +00:00
Nicolas Bacca
3849080ed7 Pause and start of volume support 
svn-id: r4165
 2002-05-01 22:22:22 +00:00
James Brown
b955d7e511 Fix sound crash in some games. Thanks Michael Karcher. 
svn-id: r4155
 2002-05-01 09:56:14 +00:00
Lionel Ulmer
c134803976 MI1 CD audio should work better now. Still a bit flaky but should be 
better than before :-)

svn-id: r4128
 2002-04-28 14:01:40 +00:00
Lionel Ulmer
35d305ce64 MP3 CD tracks should now be working properly. 
Ludde, maybe you should check if Simon is still working OK as now the
change of the sound playing handle is 'asynchronous' (ie if you call
'stop' on a sound, the handle will NOT be put to NULL right away, but
at the next 'mix' thread call). Maybe we should completely remove this
handle stuff and always use instead the index returned by the
'play_XXX' functions.

svn-id: r4101
 2002-04-27 07:42:14 +00:00
James Brown
6ac9551e81 Remove getpid() debug calls from mixer.cpp - not all platforms support this 
function.

svn-id: r4100
 2002-04-27 04:33:24 +00:00
Lionel Ulmer
9868f6590d Fixed race conditions in the sound code (where a sound could be 
'freed' while it was mixed at the same time in the sound thread).

Now Monkey1 seems to play well with Valgrind without any memory
warning.

svn-id: r4096
 2002-04-26 20:53:48 +00:00
Lionel Ulmer
f24777a998 Remove useless debug code. 
svn-id: r4094
 2002-04-26 17:22:58 +00:00
Lionel Ulmer
8fccbb0612 Fixed one memory overwrite problem in MP3-CD support. First pass at 
some code clean-up. More ahead (once I understand better the code :-) ).

svn-id: r4093
 2002-04-26 17:11:05 +00:00
James Brown
a2217e35ff Fix MP3 compilation. 
svn-id: r4050
 2002-04-22 11:36:41 +00:00
James Brown
d447f05709 Add voice channel tracking to stop script race in BumpusVille VR. 
svn-id: r4048
 2002-04-22 08:16:16 +00:00
James Brown
9809c86373 Add boilerplate license to some files, to satisfy Debian types :) 
fmopl.c/fmopl.h are infringing on the GPL at the moment. We either need to
replace these, or get permission to relicense them, before 0.2.0

svn-id: r4036
 2002-04-21 17:46:42 +00:00
James Brown
32d213bc12 Remove left over debug line. BBrox is anally retentive. 
svn-id: r4011
 2002-04-19 15:15:47 +00:00
James Brown
82192a3172 Fix PocketSCUMM. Palette is wrong tho. BBrox is a genius. 
svn-id: r4009
 2002-04-19 15:02:16 +00:00
Nicolas Bacca
bb06400d00 Return of the MP3 CD patch ... use CBR 22 kHz 
svn-id: r3981
 2002-04-17 20:23:45 +00:00
Lionel Ulmer
0d580b358e Small fix to get sounds to actually finish :-) 
svn-id: r3963
 2002-04-16 19:49:15 +00:00
Lionel Ulmer
ef5c23c608 Proper commit now for MP3 sound support.... 
svn-id: r3962
 2002-04-16 18:33:04 +00:00
James Brown
ff1d72962b Add hack for loom staff verbs. 
Readd CD Audio

svn-id: r3956
 2002-04-16 12:18:50 +00:00
Ludvig Strigeus
71eac5acd3 endian fixes, 
don't use adlib driver if sound initialization fails,
simon1 savedialog works

svn-id: r3955
 2002-04-16 12:07:19 +00:00
Ludvig Strigeus
ac62a7cb2e wrote new mixer class, 
cleaned up sound header files,
integrated mixer into scummvm & simon

svn-id: r3937
 2002-04-14 18:13:08 +00:00