Commit Graph

40 Commits

Author SHA1 Message Date
Robert Göffringmann
78533d416f Changed mutex usage.
It now unlocks the mutex while it's loading mp3/ogg/wave data in order to have the sound thread play normally.
The ps2's cd/dvd drive is too slow to transfer the entire file within a few millisecs, so it made the sound skip.

svn-id: r16831
2005-02-20 19:06:09 +00:00
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef
svn-id: r16679
2005-01-28 22:05:51 +00:00
Max Horn
05662db4dc Use loadWAVFromStream
svn-id: r16552
2005-01-13 16:28:20 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
7df70de2b1 Mark some places which probably should use loadWAVFromStream(); maybe some of the engine maintainers can look into using it
svn-id: r16503
2005-01-09 15:57:38 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Robert Göffringmann
c9fb63af0b unify pc/palm sourcecode
svn-id: r16025
2004-12-10 18:26:08 +00:00
Chris Apers
981d5fb1a2 Reading from memory card is too slow
svn-id: r16012
2004-12-10 15:11:53 +00:00
Robert Göffringmann
846f520ed6 fix potential race condition
svn-id: r16003
2004-12-09 16:33:54 +00:00
Max Horn
fbaac2e273 Use modern form of setupPremix
svn-id: r15916
2004-11-27 16:18:25 +00:00
Chris Apers
25b70535be Make PalmOS happy
svn-id: r15632
2004-10-21 12:43:49 +00:00
Max Horn
42909eb0b0 Use new setupPremix variant (incomplete)
svn-id: r15596
2004-10-17 19:40:05 +00:00
Robert Göffringmann
522da1ddbc forgot to remove these debug messages
svn-id: r15549
2004-10-14 09:18:20 +00:00
Robert Göffringmann
f5403e079f added mp3 and ogg vorbis playback for music and speech.
compression tool will follow soon.

svn-id: r15531
2004-10-12 15:50:00 +00:00
Torbjörn Andersson
6b99d5a971 Added "MUSIC" / "music" to the list of default directories.
svn-id: r14100
2004-06-28 08:45:09 +00:00
Torbjörn Andersson
1f5d4dcd23 When both music channels are used, and a third piece of music starts,
silence the channel that appears to be closest to silence already. This is
the same method I used in BS2, and it might fix a glitch I heard at the
Club Alamut.

svn-id: r13234
2004-03-13 12:04:18 +00:00
Max Horn
c6752cccf5 renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
svn-id: r13087
2004-02-28 12:58:13 +00:00
Torbjörn Andersson
9b13e872b3 I found and fixed a nasty fade-up bug in BS2. I don't know if the same
situation could happen in BS1, but it's better to be safe than sorry, so
here are the same changes, as applied to the BS1 music code.

svn-id: r12393
2004-01-14 18:39:24 +00:00
Torbjörn Andersson
2fb7d4c553 Changed the music fading so that the volume is increased when ABS(_fading)
grows larger, both when fading up and down. This fixes the problem where
the volume would "jump" when changing the fading "direction" of a stream.

svn-id: r12373
2004-01-14 08:09:03 +00:00
Torbjörn Andersson
7309705db5 cleanup
svn-id: r12322
2004-01-11 16:53:33 +00:00
Torbjörn Andersson
cf0a73f913 Introduced new namespace, Sword1, removing the "Sword" and "Bs" prefixes in
the process, except for SwordEngine.

Some minor cleanups along the wa, e.g. stdafx.h already includes <stdio.h>,
<stdlib.h> and <math.h> so there shouldn't be any need to do it elsewhere.

svn-id: r12320
2004-01-11 15:47:41 +00:00
Torbjörn Andersson
150805b18c Merged read() and readBuffer(), like in BS2.
svn-id: r12248
2004-01-08 13:05:32 +00:00
Robert Göffringmann
8030f1b148 implemented volume control panel
svn-id: r12220
2004-01-07 17:47:46 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Robert Göffringmann
e34d7b6c41 get volume from gamedetector
svn-id: r12169
2004-01-06 11:48:30 +00:00
Torbjörn Andersson
92561301ac Deal gracefully with missing music files.
svn-id: r12144
2004-01-04 16:19:15 +00:00
Max Horn
d49082065a TODO
svn-id: r12117
2004-01-03 20:42:18 +00:00
Torbjörn Andersson
e73363bd09 Delete the mutex when we're done with it.
svn-id: r12107
2004-01-03 11:12:35 +00:00
Robert Göffringmann
cf12a5846f changed music fading duration and made music system fade down the tracks on startMusic(0)
svn-id: r12071
2004-01-01 16:56:00 +00:00
Torbjörn Andersson
18f8916c3a Rewrote the music code. It now follows the same basic idea as the one in
BS2, which has worked pretty well so far. I haven't implemented pausing and
volume since the code I replaced didn't have it either, as far as I could
tell.

svn-id: r12070
2004-01-01 15:22:15 +00:00
Robert Göffringmann
436834750d cd changing code and checking for savegames on startup
svn-id: r12043
2003-12-30 22:57:52 +00:00
Robert Göffringmann
e9766658b6 this fixes the remaining glitches
svn-id: r12004
2003-12-28 23:24:03 +00:00
Robert Göffringmann
2df01e0abb fixed screen and music fading
svn-id: r11861
2003-12-22 23:21:28 +00:00
Robert Göffringmann
44f1ed75fd added code for non-looping music and implemented fading
svn-id: r11845
2003-12-22 02:47:43 +00:00
Robert Göffringmann
59654b1719 added SwordControl (the control panel). Not yet finished.
svn-id: r11775
2003-12-20 09:12:54 +00:00
Max Horn
0cddca5f43 unregister the premix proc when you go away
svn-id: r11755
2003-12-19 01:08:30 +00:00
Robert Göffringmann
a74f8eb717 endian conversion for music system
svn-id: r11746
2003-12-18 13:17:33 +00:00
Oliver Kiehl
f926ae108c enable music
svn-id: r11706
2003-12-17 09:17:59 +00:00
Travis Howell
0e8a1b7278 Look in MUSIC folder, not MUSIC1, there should be no conflicting music files.
svn-id: r11683
2003-12-16 10:41:59 +00:00
Robert Göffringmann
189e08bc79 Broken Sword 1: initial import
svn-id: r11664
2003-12-16 02:10:15 +00:00