56 Commits

Author SHA1 Message Date
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
Max Horn
bf62494fd5 ripped out obsolete midi streaming code from backends (this may break Alsa/SEQ/Windows/Morphos compile, I tried my best, but you'll have to clean up after me)
svn-id: r5905
2002-12-11 16:09:58 +00:00
Travis Howell
5888d9b16d Disable/remove some warnings
Enable more debugging

svn-id: r5709
2002-11-24 13:31:38 +00:00
Jamieson Christian
e68d425cdc Broke MidiStreamer into .h and .cpp components.
svn-id: r5682
2002-11-21 19:26:44 +00:00
Jamieson Christian
5214cb3463 Added support for volume and pause control to Simon music.
Note that MidiStreamer is now used as a streaming wrapper
for ALL MidiDriver types, even those that natively support
streaming. This is because MidiStreamer supports a hybrid
of streamed and non-streamed MIDI, which is necessary to
support interactive events.

svn-id: r5596
2002-11-18 09:08:45 +00:00
Oliver Kiehl
128580df1e added structures for midi pause/volume
svn-id: r5591
2002-11-17 17:15:29 +00:00
Oliver Kiehl
127103f2d7 changed warning to error
svn-id: r5539
2002-11-13 16:37:05 +00:00
Travis Howell
7886f1fd1c Change last ugly hack to make it a little better
svn-id: r5526
2002-11-13 04:52:35 +00:00
Travis Howell
40be9c6831 An ugly hack to allow music looping in simon1talkie
Most likely better wat to do this...

svn-id: r5525
2002-11-13 04:34:45 +00:00
Travis Howell
5f8cfd62e8 Add midi streaming support from Jamieson630
svn-id: r5522
2002-11-13 00:24:48 +00:00
Max Horn
0b3e4323f0 if possible, always #include headers in the source files, not in other headers
svn-id: r5495
2002-11-10 15:24:17 +00:00
Travis Howell
68fada397e Add simon1demo
svn-id: r5300
2002-10-24 09:40:20 +00:00
Max Horn
4b8aa277f7 oops
svn-id: r5224
2002-10-21 22:19:59 +00:00
Max Horn
d58c7d43f0 fixed simon2win midi (I hope), bug #595813
svn-id: r5222
2002-10-21 22:03:59 +00:00
Max Horn
8af300fec3 The terms Word and DWord are somewhat Windows centric; in fact there are systems on which word is 32bit, as opposed to our 16 bits. Hence, use the uin16/uint32 naming scheme, which is not ambigious
svn-id: r5216
2002-10-21 13:23:25 +00:00
Max Horn
ad8347a6a5 clean up of the Simon MidiPlayer class
svn-id: r5214
2002-10-21 12:57:15 +00:00
Paweł Kołodziejski
29811c5fad simon also use class File
svn-id: r4948
2002-09-16 08:22:30 +00:00
Max Horn
ce46866403 Initial revision
svn-id: r4785
2002-08-21 16:07:07 +00:00
Max Horn
42ca9ea3a9 indent run
svn-id: r4476
2002-07-07 19:06:48 +00:00
Max Horn
2f2d4527ef cleaning up the mess drigo left... <sigh>
svn-id: r4215
2002-05-05 20:04:26 +00:00
Enrico Rolfi
bdcb76fe3b Fixed some things to support MacOS port
svn-id: r4210
2002-05-05 19:01:37 +00:00
James Brown
89d957090e Use relative include paths to easy some ports.
svn-id: r4005
2002-04-19 11:12:27 +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