libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-02 07:28:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,618 Commits 5 Branches 5 Tags 1.8 GiB
36828287ad
Commit Graph

150 Commits

Author SHA1 Message Date
Max Horn
4ad5a183ce renamed SoundMixer::hasActiveChannel->hasActiveSFXChannel, and fixed the regression in it caused by removing _beginSlots (I hope); added isActiveChannel method used by scumm/sound.cpp (this allowed me to move the Channel class from mixer.h into mixer.cpp); replaced Channel::soundFinished method by isActive 
svn-id: r8597
 2003-06-22 01:55:53 +00:00
Max Horn
573a1e3e99 remove the realDestroy methods and instead use destructors; renamed insertAt to insertChannel and simplified/unified its usage; delete the mutex when exiting; cleanup 
svn-id: r8596
 2003-06-22 01:34:28 +00:00
Max Horn
bd4370c251 lots of mixer cleanup / refactoring / reengineering 
svn-id: r8594
 2003-06-21 23:29:34 +00:00
Max Horn
7c332d7fdb modified & cleaned up the playStream/append code a bit; but this API really could stand some refinement 
svn-id: r8592
 2003-06-21 21:17:08 +00:00
Max Horn
11b2961fdb cleanup 
svn-id: r8584
 2003-06-21 19:52:12 +00:00
Marcus Comstedt
2aed2d9284 Use stdafx.h instead of manually including system headers. 
svn-id: r8541
 2003-06-18 21:10:05 +00:00
Max Horn
fcc46ac891 more cleanup 
svn-id: r8497
 2003-06-15 01:56:47 +00:00
Jonathan Gray
cf54a63639 HAVE_CONFIG_H 
svn-id: r7632
 2003-05-18 13:39:02 +00:00
Max Horn
80e3c23482 cleanup; add stopID method to stop a currently playing sound via its ID 
svn-id: r6835
 2003-03-18 21:46:44 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers 
svn-id: r6726
 2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
a8c3057875 and more cleanup .... 
svn-id: r6719
 2003-03-06 18:30:44 +00:00
Max Horn
ce6913cf36 fix -pedantic warnings 
svn-id: r6108
 2002-12-25 00:36:04 +00:00
Oliver Kiehl
fb8f8c6105 added looping support to playRaw 
svn-id: r5501
 2002-11-10 16:23:02 +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
Max Horn
6631df898c compilation fix 
svn-id: r5158
 2002-10-16 00:24:45 +00:00
Paweł Kołodziejski
09225027f1 changes to imuse 
svn-id: r5157
 2002-10-15 21:55:04 +00:00
Paweł Kołodziejski
dc87eff416 changes to soundmixer - added timeout param to stream 
svn-id: r5149
 2002-10-15 07:01:34 +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
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
fb91bdd21d fixed stream in mixer, not completed yet - bad wrap around. 
svn-id: r4940
 2002-09-14 12:12:25 +00:00
Max Horn
523d8e64c0 rewrote config class; cleanup; code restructuring 
svn-id: r4903
 2002-09-08 01:08:12 +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
9f993a1d29 synced with scummvm 
svn-id: r4821
 2002-08-24 15:31:37 +00:00
Max Horn
8786311655 move _volume_table creation into constructor, and discard it in destructor 
svn-id: r4764
 2002-08-18 21:42:22 +00:00
Max Horn
edae5b06db MAJOR change to the way how Engine objects are instantiated 
svn-id: r4758
 2002-08-18 17:48:18 +00:00
Max Horn
89cf95ce34 pedantic #define rename :-) 
svn-id: r4755
 2002-08-18 16:10:38 +00:00
Max Horn
c56c8ea5e6 patch 587769 by Fridvin Logi (supposedly helps with Nexus in The Dig) 
svn-id: r4678
 2002-07-29 16:18:32 +00:00
Paweł Kołodziejski
0b3c263857 moved file bundle stuff into class Bundle 
svn-id: r4671
 2002-07-28 15:35:26 +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
Max Horn
2b97c496c2 indent run 
svn-id: r4475
 2002-07-07 18:04:03 +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
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
Max Horn
4ac64b941d added append() stubs for Channel_MP3/Channel_MP3_CDMUSIC 
svn-id: r4296
 2002-05-12 17:57:37 +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
Nicolas Bacca
3849080ed7 Pause and start of volume support 
svn-id: r4165
 2002-05-01 22:22:22 +00:00
James Brown
5f9bd8343c Small inSANE patch for the dig, and start of Dig Audio support. 
It seems to crash using AUTOFREE for some reason. Can someone Valgrind/Purify this for me?

svn-id: r4129
 2002-04-29 08:28:27 +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
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
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
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
ef5c23c608 Proper commit now for MP3 sound support.... 
svn-id: r3962
 2002-04-16 18:33:04 +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