78 Commits

Author SHA1 Message Date
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef
svn-id: r16679
2005-01-28 22:05:51 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Eugene Sandulenko
03df05bd96 Better support of MT-32.
svn-id: r15659
2004-10-23 00:02:38 +00:00
Torbjörn Andersson
df9e6ef758 Fingolfin's suggested fix for bug #1004919.
svn-id: r14959
2004-09-08 09:24:18 +00:00
Max Horn
cc3a255c54 cleanup
svn-id: r14878
2004-09-04 00:04:36 +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
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Jamieson Christian
c38ca923d8 Fix for Bug [821514] SIMON: No Adlib volume for percussion
Transmit volume with each percussion event. (Necessary
because music and SFX tracks may share the percussion
channel.) This is the same approach used in iMuse.

svn-id: r10753
2003-10-12 14:31:21 +00:00
Max Horn
a4b72c9d6e Simon namespace
svn-id: r10574
2003-10-03 19:42:27 +00:00
Torbjörn Andersson
570e60a487 Whitespace changes
svn-id: r10390
2003-09-24 06:33:59 +00:00
Jamieson Christian
5a1b0ac24a More music volume management fixes
svn-id: r9636
2003-08-11 05:25:33 +00:00
Jamieson Christian
45f3db95fd Fix for Bug [777589] SIMON1: Sound volume strangeness
Fixed redundant, cumulative adjustments of _masterVolume
on the individual channel volumes. This fixes problems
with individual instruments changing volume by too much,
or dropping out altogether, when changing the master
music volume.

svn-id: r9635
2003-08-11 04:33:17 +00:00
Jamieson Christian
154e872d5a Added generic send() option to MidiChannel.
This circumvents problems doing generic send()
calls to MidiDrivers that support more than
16 MIDI channels (i.e. Adlib). Because of the
way it interacts with MidiDriver, Simon could
have run into a problem if it tried to
allocate more than 15 Adlib music channels
(though this would only happen in very, VERY
rare circumstances).

Also fixed a problem with the channel
numbering scheme used by MidiDriver_Adlib,
in particular the percussion channel number.

svn-id: r9604
2003-08-08 11:54:24 +00:00
Jamieson Christian
0ca58111c6 More Simon shutdown cleanup
svn-id: r9602
2003-08-08 09:48:42 +00:00
Jamieson Christian
456124d109 Fixed hang from double-lock of mutex
svn-id: r9600
2003-08-08 09:36:37 +00:00
Max Horn
0df319e952 #include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)
svn-id: r9359
2003-08-01 12:21:04 +00:00
Jamieson Christian
17a888b65a Fix for Bug [775534] 0.5.0 RC SIMON1DOS Random sfx notes during music
Corrected a problem with resource size computation for GMF sound
effect resources. Since GMF resources have no size info, we were
computing sizes with the assumption that each GMF appears in its
own file, so the file size becomes the resource size. This is true
for simon1dos music files but not for SFX files. This fix uses the
resource offset pointers at the beginning of SFX files to properly
compute the size of SFX resources.

svn-id: r9155
2003-07-24 04:19:42 +00:00
Jamieson Christian
eedeffac6a Fixed behavior of "m" key under simon1dos.
The "m" key was turning off both music
AND MIDI sound effects. It now turns off
only the music.

svn-id: r9014
2003-07-14 12:15:17 +00:00
Jamieson Christian
74d3d914a9 Feature [770161] SIMON: Remap instruments to GM
Apparently Simon 1 (all versions) uses MT32 instruments,
so now we map them to GM *unless* the --native-mt32
option was specified.

svn-id: r9001
2003-07-14 08:29:17 +00:00
Jamieson Christian
0eb2d798d4 Fixed undefined file read operation
svn-id: r7971
2003-05-25 21:32:11 +00:00
Max Horn
9151ff2636 fixed format string
svn-id: r7931
2003-05-25 10:14:21 +00:00
Jamieson Christian
6cb01ce15c Added music support for simon1demo
svn-id: r7927
2003-05-25 03:19:21 +00:00
Jamieson Christian
bc5511c514 Fixed hanging notes when switching tracks
svn-id: r7878
2003-05-24 04:39:47 +00:00
Jamieson Christian
807f3e1e86 Fixed MIDI channel conflict between music and MIDI sound effects in simon1dos.
Also added notes about the GMF header for posterity's sake.

svn-id: r7877
2003-05-24 03:55:37 +00:00
Jamieson Christian
1b4b6030fe Added support for GMF loop specifier
svn-id: r7874
2003-05-24 03:10:14 +00:00
Jamieson Christian
bcdf2286f8 Fixed problem with hanging notes when switching music tracks
svn-id: r7873
2003-05-24 01:42:57 +00:00
Jamieson Christian
aacbaac131 Added support for simultaneous music and MIDI sound effects to simon1dos.
Note that 's' still toggles MIDI sound effects on and off.

svn-id: r7872
2003-05-24 01:26:05 +00:00
Jamieson Christian
e52ca34bb4 Fixed hanging notes when toggling SFX mode in Simon 1
svn-id: r7865
2003-05-23 15:27:08 +00:00
Jamieson Christian
790b2e1e9a Fixed problem with Simon music playing even when paused.
svn-id: r7864
2003-05-23 15:14:44 +00:00
Jamieson Christian
b2f4c34c01 Reset channel volumes on load
svn-id: r7813
2003-05-22 00:06:24 +00:00
Jamieson Christian
9986605c46 More Simon music fixes.
svn-id: r7767
2003-05-21 06:13:47 +00:00
Jamieson Christian
ff79f10160 Fixed Simon 1 sound effects.
More semantic fixes.

svn-id: r7765
2003-05-21 05:26:29 +00:00
Jamieson Christian
9c4a1cf657 More Simon music fixes
svn-id: r7761
2003-05-21 04:36:09 +00:00
Jamieson Christian
9780fc9c3e Fixed thread problem that causes occassional crashes
svn-id: r7757
2003-05-21 00:40:08 +00:00
Jamieson Christian
14273bad5e Fixed buffer allocation problem for GMF resources.
Thanks for wjp for tracking this one down.

svn-id: r7748
2003-05-20 17:23:15 +00:00
Jamieson Christian
c420166f46 Fix for simon2win music
svn-id: r7746
2003-05-20 17:10:15 +00:00
Jamieson Christian
e2e23affcf Fixed memory overrun problem
svn-id: r7745
2003-05-20 16:50:16 +00:00
Jamieson Christian
733326b727 Fixed file scan alignment problem
svn-id: r7742
2003-05-20 16:42:25 +00:00
Max Horn
b2c823b1e1 oops
svn-id: r7731
2003-05-20 14:53:45 +00:00
Max Horn
5e746a188b init MidiPlayer fully
svn-id: r7730
2003-05-20 14:48:24 +00:00
Max Horn
bb9c82ed83 init some member vars
svn-id: r7723
2003-05-20 13:20:18 +00:00
Jamieson Christian
29fb3e308f Fixed music looping problem in simon1win
svn-id: r7672
2003-05-19 05:40:27 +00:00
Jamieson Christian
ff41896480 Fixed Simon 1 music regression.
SMF parser now supports malformed Simon pitch bend events.
Implemented SMF parser jump method.

svn-id: r7669
2003-05-19 05:00:13 +00:00
Jamieson Christian
c81b58d38e Implemented new Simon MIDI module, switching from MidiStreamer to MidiParser. Restructuring enables XMIDI support and vc_72 implementation. Various cleanup on MidiParser's and MidiDriver's.
svn-id: r7654
2003-05-18 23:55:53 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
4fe8dcd671 and more cleanup ....
svn-id: r6720
2003-03-06 19:16:24 +00:00
Travis Howell
3a4782f166 Add olki's patch for sound effects in simon1dos
Plus hack to allow choice between midi music and sound effects via 's' key

svn-id: r6326
2003-01-03 12:06:30 +00:00
Travis Howell
303acc02bb Remove sion 1 music warning
Change warning about missing vga file to error

svn-id: r6323
2003-01-03 04:24:16 +00:00
Jamieson Christian
e4b1a7e709 MidiStreamer no longer derives from MidiDriver.
Removed MidiStreamer methods that weren't actually needed.
That's one layer of indirection removed from Simon music.

svn-id: r6050
2002-12-21 21:32:45 +00:00
Jamieson Christian
d577b2ece6 Changed handling of malformed pitchbend events.
Added related warning output for future reference.

svn-id: r5909
2002-12-12 02:39:33 +00:00