Commit graph

123 commits

Author SHA1 Message Date
Paweł Kołodziejski
2533b23a60 added mixer features: volume and pan control per channel
svn-id: r9944
2003-08-31 20:26:21 +00:00
Torbjörn Andersson
e60ee06e2d When a fading music channel is freed to make room for new music, or when a
music channel has faded out, destroy the channel immediately. Don't wait
for the mixer to finish it off.

This seems to fix a problem where the mixer would eventually run out of
slots if you left the Quit dialog showing for too long.

Unfortunately I don't know if it fixes the "out of slots" errors I
encountered once during normal play. Oh well, time will tell...

svn-id: r9942
2003-08-31 17:28:36 +00:00
Torbjörn Andersson
3b62d9b4da No longer assume that all sound effects are 22 kHz. Some are 11 kHz.
svn-id: r9939
2003-08-31 10:45:14 +00:00
Torbjörn Andersson
155f4591c9 Cleaned up StreamCompMusic(), including some untested endian-fixes.
This should also fix the bug where music sometimes didn't start playing.

svn-id: r9938
2003-08-31 10:38:32 +00:00
Jonathan Gray
4ea7eeb563 fix compilation
svn-id: r9934
2003-08-31 00:00:09 +00:00
Torbjörn Andersson
c54baa429b BS2 crashed because it passed a buffer of uneven length to the mixer. This
is the only place I can think of where this could have happened, so I've
added a paranoid check to ensure the buffer length is even.

Let's see how that works out...

svn-id: r9933
2003-08-30 22:17:59 +00:00
Paweł Kołodziejski
7b3aae7c03 fixed not cleared sound handle for music
svn-id: r9931
2003-08-30 21:09:13 +00:00
Paweł Kołodziejski
b321a7a468 ah
svn-id: r9928
2003-08-30 20:27:48 +00:00
Paweł Kołodziejski
c684a076ee revert id handle stuff
svn-id: r9927
2003-08-30 20:25:07 +00:00
Paweł Kołodziejski
a2dad74da1 added sfx support, increased speech support, and music code(streaming works fine but you don't hear anything) newStream, and appendStream doesn't work but playRaw works for music
svn-id: r9923
2003-08-30 18:06:08 +00:00
Torbjörn Andersson
aab8d69078 Fixed format string error.
svn-id: r9884
2003-08-28 06:13:59 +00:00
Jonathan Gray
8b91af78db use file class for speech so people with clusters in different directories get to hear sound as well
svn-id: r9875
2003-08-27 06:32:42 +00:00
Joost Peters
6969357505 errr. this shouldn't have been committed
svn-id: r9872
2003-08-27 00:48:55 +00:00
Joost Peters
3443c5c3d0 Basic speech code, the change in speech.cpp is needed for me, but I am afraid it might break "speech.clu opening" for someone else..I'm confused as to how this all works. heh.
Anyway, if you hear no voices: this is probably where to look.

svn-id: r9871
2003-08-27 00:36:01 +00:00
Jonathan Gray
5d1863070b return read error in PlayCompSpeech for now so we get subtitles
svn-id: r9841
2003-08-24 02:43:44 +00:00
Torbjörn Andersson
a78508af33 On second thought, WAVE_FORMAT_PCM probably means uncompressed WAV-data
after all, or at least not ADPCM-compressed. Updated the comments, but I
still don't know how to play it.

svn-id: r9433
2003-08-03 15:45:09 +00:00
Jonathan Gray
a932a74dcb patch #781530 Initial work on StreamCompMusic() by erik
svn-id: r9394
2003-08-02 02:31:36 +00:00
Oliver Kiehl
0f85cc3061 rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)

svn-id: r9301
2003-07-30 19:25:31 +00:00
Jonathan Gray
f1a6025aa2 turn d_sound.cpp into class BS2Sound
svn-id: r9280
2003-07-29 12:34:46 +00:00
Max Horn
462898465a StopSpeech -> StopSpeechBS2 (avoid conflict wiht SpeechSynthesis framework on OS X)
svn-id: r9248
2003-07-28 14:50:54 +00:00
Jonathan Gray
c1cbd4605e fix some VC7 warnings
svn-id: r9240
2003-07-28 11:21:25 +00:00
Travis Howell
ccc40eecc9 Compiles on mingw now
svn-id: r9222
2003-07-28 03:12:49 +00:00
Jonathan Gray
dc6aa9912c bs2 driver
svn-id: r9212
2003-07-28 01:47:41 +00:00