44 Commits

Author SHA1 Message Date
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +00:00
Max Horn
81b6e9e1e6 Get rid of the useless & troublesome master_volume
svn-id: r16328
2004-12-25 23:43:05 +00:00
Eugene Sandulenko
ab4734dcf6 o Fix regression with Mac versions
o Normalize GIDs and GTypes
o Introduce MD5-based game detection. Now only 2 games should be ordered.
  Linux demo should go before Win32 newer demo
o Fix sound in Mac versions

svn-id: r16262
2004-12-22 19:34:41 +00:00
Eugene Sandulenko
2fb8a8e453 o Moved GAME_* to SagaEngine object
o Renamed GAME_ITE_* to GID_ITE_*
o Renamed GID_ITE and GID_IHNM to GType_ITE and GType_IHNM

svn-id: r16258
2004-12-22 13:09:47 +00:00
Andrew Kurushin
28e5422fd8 actors rearrangement bugfix
svn-id: r16094
2004-12-17 11:18:56 +00:00
Eugene Sandulenko
502b279d24 Patch #1081904 ITE: MAC demo support
o Endianness-aware resource loading
o Removed ys_dl_list in favor of our object implementation
o Cleanup in actor code
o Partial support for ITE Mac rereleased demo

svn-id: r16051
2004-12-15 00:24:12 +00:00
Max Horn
1a7ca2dc2a AudioStream::read() has been removed quite some time ago, now making sure that change is reflected everywhere
svn-id: r15911
2004-11-27 13:54:09 +00:00
Torbjörn Andersson
41d1be2ea8 After listening to some of the IHNM music from both the FM and GM music
files through the MIDI synth on my Soundblaster, I can only conclude that
they are both General MIDI, so I've changed our code to assume that in both
cases. The End Title (which we currently incorrectly play at the end of the
intro) sounds much better in Adlib this way, too.

Perhaps the original used a different GM to FM mapping than the one in our
adlib.cpp, but if so using the MT-32 to GM mapping isn't likely to improve
the situation.

We could add a way of replacing the GM to FM mapping in adlib.cpp, I guess.
Of course, that would only be worth it if the original sounds better than
our mapping.

svn-id: r15894
2004-11-26 10:04:36 +00:00
Torbjörn Andersson
a607d2248f But surely we should still call setGM(true) in the GM case, right...?
svn-id: r15854
2004-11-21 16:15:58 +00:00
Eugene Sandulenko
eb44281ecb o Removed astray debug output.
o MT-32 music is correct, though Adlib is not. There is apparently custom
 instrument remapping similiar to mt32->gm but it is different. With
 that remapping it sounds much closer to original.

svn-id: r15850
2004-11-21 00:37:18 +00:00
Torbjörn Andersson
9766d59b7e I'm told that the FM music file sounds terrible with MT-32 and that the
MT-32 is perfectly capable of playing General MIDI. My new guess is that
the FM file is for Adlib instead. It certainly sounds better - but quite
different - than playing the GM track through Adlib.

svn-id: r15846
2004-11-20 17:19:15 +00:00
Torbjörn Andersson
d173491acc Added music to the partial IHNM intro. I think I picked the correct tune,
but I can't be absolutely sure.

I'm also not sure if I'm using the correct music data. I'm fairly sure that
the MUSICGM.RES file is the appropriate choice for "General MIDI", but I
have no way of verifying that the MUSICFM.RES is really the right choice
for MT-32. (Is either of them a good choice for Adlib, or are they both
equally bad?)

svn-id: r15831
2004-11-19 07:41:59 +00:00
Eugene Sandulenko
4295a17c23 o Make GAME_GetFileContext() more object-like
o Font::loadFont() now normally survives zero-length fonts as used in demos
o Removed unused SndRes::ITEVOC_Resample()
o Fixed playing of voice #4 on old DOS targets
o Implemented playing voices in VOX (Oki ADPCM) format
o Support of Win32 and Linux demos. There was old-style Win32 demo, which
  is not supported yet, same is with DOS demo.

svn-id: r15814
2004-11-15 03:03:48 +00:00
Torbjörn Andersson
271f84cbde Whitespace fix
svn-id: r15710
2004-11-03 07:43:09 +00:00
Paweł Kołodziejski
c7e5ab1f2d removed R_ prefix with few r_ too
svn-id: r15690
2004-10-27 21:32:28 +00:00
Eugene Sandulenko
074ed07084 Properly nitialize _passThrough variable.
svn-id: r15658
2004-10-22 23:45:50 +00:00
Eugene Sandulenko
44bd54b476 Better support of MT-32.
svn-id: r15636
2004-10-21 22:40:06 +00:00
Torbjörn Andersson
4840c16c1b Oops, forgot to remove these lines. Now all three forms of music (XMIDI,
MIDI and digitized music) use the same method to decide whether or not to
loop.

svn-id: r15566
2004-10-16 07:46:04 +00:00
Torbjörn Andersson
ec413cc8f9 Added support for digitized music, plus some other music-related fixes.
Note that I've only tried this with the music.rsc file from the full Linux
version. It seems likely that the Mac version uses the same file format,
but I have no way of verifying this. I'm told the demos use compressed
audio, so the music files from them probably won't work yet.

svn-id: r15527
2004-10-12 11:45:53 +00:00
Torbjörn Andersson
54cec2e011 Set up file paths to handle the differences between the file layout of the
Windows and Linux versions. (TODO: Handle game detection.)

Added preliminary support for the P2_A.aif file that the Linux version
uses, where the Windows version uses p2_a.voc. Someone will have to verify
the actual format of it, and we have a silly bug in playVoice() which will
have to be fixed before things work properly.

svn-id: r15365
2004-10-01 06:45:13 +00:00
Jonathan Gray
d1d308ff74 R_GAMETYPE -> GID, remove unused supported flag and trim some unused bits of GAME
svn-id: r14793
2004-08-27 01:32:10 +00:00
Eugene Sandulenko
166b05aed4 Fix #include paths.
svn-id: r14443
2004-08-02 16:20:35 +00:00
Jonathan Gray
bc900fde60 init some member vars
svn-id: r14414
2004-08-01 07:56:08 +00:00
Jonathan Gray
182dd48bd4 merge reinherit.h into saga.h and gfx_mod.h, note the error loading animations wasn't caused by this commit :)
svn-id: r14405
2004-08-01 01:56:22 +00:00
Jonathan Gray
c7d6425a38 remove YS_IGNORE_PARAM macro and some uneeded yslib.h includes
svn-id: r14385
2004-07-31 12:37:36 +00:00
Torbjörn Andersson
28e63617e1 Set _parser to NULL after deleting it. I don't know if it's necessary, but
it'll make me sleep easier at night, and I should have remembered to do it
before anyway.

svn-id: r13912
2004-05-31 08:59:11 +00:00
Torbjörn Andersson
cddf02fc32 Make sure music is unloaded and the parser object deleted before starting a
new piece of music.

svn-id: r13909
2004-05-31 08:46:36 +00:00
Eugene Sandulenko
4ceb84c643 Extend midi music table.
Implement music looping.

svn-id: r13899
2004-05-29 21:04:44 +00:00
Torbjörn Andersson
c51d9fba08 Cleaned up the handling of external MIDI files, and added the missing ones.
This is based on experimentation and guesswork, so it might be wrong, but
it will have to do for now.

svn-id: r13839
2004-05-16 12:57:49 +00:00
Torbjörn Andersson
148872d1fd Replaced R_printf() with debug() and warning(). There are still a couple of
standard printf()s left, though.

svn-id: r13791
2004-05-05 13:05:45 +00:00
Torbjörn Andersson
4110aeb5d5 With Jamieson630's MIDI parser fix, all the ITE MIDIs should work.
svn-id: r13720
2004-05-01 16:49:23 +00:00
Paweł Kołodziejski
84eb0101a7 indent
svn-id: r13706
2004-05-01 13:04:31 +00:00
Torbjörn Andersson
ca7b89d2a5 Fixed warning
svn-id: r13702
2004-05-01 09:38:03 +00:00
Eugene Sandulenko
1353e2d2dc Move from custom unsigned types to those provided by main config.h
svn-id: r13687
2004-04-30 23:02:23 +00:00
Eugene Sandulenko
06d9f402df Indentation madness
svn-id: r13686
2004-04-30 21:41:51 +00:00
Torbjörn Andersson
7ab18634c7 Very experimental support for the separate MIDI files used by the Wyrmkeep
re-release of ITE.

Unfortunately I only know the mapping from resource number to file name for
the two tunes in the intro, and the second one causes ScummVM to crash so I
had to disable it.

svn-id: r13682
2004-04-30 07:13:26 +00:00
Jonathan Gray
90075cd190 use timer rate from driver, makes midi a bit more audible
svn-id: r13679
2004-04-29 13:45:10 +00:00
Torbjörn Andersson
f3d4bc7f8f Quick-and-dirty music fix. I can hear music in the ITE intro now. I haven't
tried IHNM yet.

svn-id: r13678
2004-04-29 12:27:17 +00:00
Jonathan Gray
cd21d5919b init some things to fix segfaults
svn-id: r13674
2004-04-29 04:50:45 +00:00
Eugene Sandulenko
4ed0d02f05 Now it produces sound, but it's clear that XMIDI parsing is wrong
svn-id: r13673
2004-04-29 04:24:55 +00:00
Eugene Sandulenko
91f5c00a12 Make MIDI driver run, though no sound yet.
svn-id: r13672
2004-04-29 04:07:14 +00:00
Eugene Sandulenko
bb8ee598c9 Music.cpp objectizing.
Initial MIDI checkin, doesn't work

svn-id: r13670
2004-04-29 03:52:59 +00:00
Eugene Sandulenko
b03304c870 Rename sysmusic.cpp to music.cpp
svn-id: r13669
2004-04-29 01:47:51 +00:00