aboutsummaryrefslogtreecommitdiff
path: root/saga/music.cpp
AgeCommit message (Collapse)Author
2005-04-03Committed patch #1168149 (Shared GM/MT-32 mapping) by eriktorbjorn as-is. ↵Jerome Fisher
This does the following: - Replaces multiple identical MT-32-to-General MIDI mapping tables with a common one in MidiDriver. - Changes Sky's GmChannel class to allow NULL instrument and velocity mapping tables, giving a 1-to-1 mapping without creating a dummy table. svn-id: r17361
2005-04-03- fixed tile doors drawingAndrew Kurushin
- right mouse action fixed svn-id: r17347
2005-03-12PlayingSoundHandle -> SoundHandle; also, turned the handle activity check ↵Max Horn
into a mixer method svn-id: r17106
2005-03-09changing AudioDataType -> SoundType, so now the constant names match the ↵Max Horn
name of the data type / the SoundMixer method names svn-id: r17052
2005-01-17If the game tries to start a piece of music that happens to be playingTorbjörn Andersson
already, let it continue playing rather than restarting it. (I've been meaning to make this change for some time, but now it appeared on the TODO list as well. :-) svn-id: r16583
2005-01-11- remove game.h & image.hAndrew Kurushin
- all display information of current game goes to SagaEngine - remove GameFontIds - hide SagaEngine _gameId,_gameType & etc with methods getGameId(), getGameType() svn-id: r16545
2005-01-01oops, correct copyright stringMax Horn
svn-id: r16399
2005-01-01Updated copyrightMax Horn
svn-id: r16398
2004-12-27Added 'sound types' to the mixer - for now, only plain (for the premixer), ↵Max Horn
SFX and music; volume is now controlled based on the sound type svn-id: r16330
2004-12-25Get rid of the useless & troublesome master_volumeMax Horn
svn-id: r16328
2004-12-22o Fix regression with Mac versionsEugene Sandulenko
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-22o Moved GAME_* to SagaEngine objectEugene Sandulenko
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-17actors rearrangement bugfixAndrew Kurushin
svn-id: r16094
2004-12-15Patch #1081904 ITE: MAC demo supportEugene Sandulenko
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-11-27AudioStream::read() has been removed quite some time ago, now making sure ↵Max Horn
that change is reflected everywhere svn-id: r15911
2004-11-26After listening to some of the IHNM music from both the FM and GM musicTorbjörn Andersson
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-21But surely we should still call setGM(true) in the GM case, right...?Torbjörn Andersson
svn-id: r15854
2004-11-21o Removed astray debug output.Eugene Sandulenko
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-20I'm told that the FM music file sounds terrible with MT-32 and that theTorbjörn Andersson
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-19Added music to the partial IHNM intro. I think I picked the correct tune,Torbjörn Andersson
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-15o Make GAME_GetFileContext() more object-likeEugene Sandulenko
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-03Whitespace fixTorbjörn Andersson
svn-id: r15710
2004-10-27removed R_ prefix with few r_ tooPaweł Kołodziejski
svn-id: r15690
2004-10-22Properly nitialize _passThrough variable.Eugene Sandulenko
svn-id: r15658
2004-10-21Better support of MT-32.Eugene Sandulenko
svn-id: r15636
2004-10-16Oops, forgot to remove these lines. Now all three forms of music (XMIDI,Torbjörn Andersson
MIDI and digitized music) use the same method to decide whether or not to loop. svn-id: r15566
2004-10-12Added support for digitized music, plus some other music-related fixes.Torbjörn Andersson
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-01Set up file paths to handle the differences between the file layout of theTorbjörn Andersson
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-08-27R_GAMETYPE -> GID, remove unused supported flag and trim some unused bits of ↵Jonathan Gray
GAME svn-id: r14793
2004-08-02Fix #include paths.Eugene Sandulenko
svn-id: r14443
2004-08-01init some member varsJonathan Gray
svn-id: r14414
2004-08-01merge reinherit.h into saga.h and gfx_mod.h, note the error loading ↵Jonathan Gray
animations wasn't caused by this commit :) svn-id: r14405
2004-07-31remove YS_IGNORE_PARAM macro and some uneeded yslib.h includesJonathan Gray
svn-id: r14385
2004-05-31Set _parser to NULL after deleting it. I don't know if it's necessary, butTorbjörn Andersson
it'll make me sleep easier at night, and I should have remembered to do it before anyway. svn-id: r13912
2004-05-31Make sure music is unloaded and the parser object deleted before starting aTorbjörn Andersson
new piece of music. svn-id: r13909
2004-05-29Extend midi music table.Eugene Sandulenko
Implement music looping. svn-id: r13899
2004-05-16Cleaned up the handling of external MIDI files, and added the missing ones.Torbjörn Andersson
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-05Replaced R_printf() with debug() and warning(). There are still a couple ofTorbjörn Andersson
standard printf()s left, though. svn-id: r13791
2004-05-01With Jamieson630's MIDI parser fix, all the ITE MIDIs should work.Torbjörn Andersson
svn-id: r13720
2004-05-01indentPaweł Kołodziejski
svn-id: r13706
2004-05-01Fixed warningTorbjörn Andersson
svn-id: r13702
2004-04-30Move from custom unsigned types to those provided by main config.hEugene Sandulenko
svn-id: r13687
2004-04-30Indentation madnessEugene Sandulenko
svn-id: r13686
2004-04-30Very experimental support for the separate MIDI files used by the WyrmkeepTorbjörn Andersson
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-29use timer rate from driver, makes midi a bit more audibleJonathan Gray
svn-id: r13679
2004-04-29Quick-and-dirty music fix. I can hear music in the ITE intro now. I haven'tTorbjörn Andersson
tried IHNM yet. svn-id: r13678
2004-04-29init some things to fix segfaultsJonathan Gray
svn-id: r13674
2004-04-29Now it produces sound, but it's clear that XMIDI parsing is wrongEugene Sandulenko
svn-id: r13673
2004-04-29Make MIDI driver run, though no sound yet.Eugene Sandulenko
svn-id: r13672
2004-04-29Music.cpp objectizing.Eugene Sandulenko
Initial MIDI checkin, doesn't work svn-id: r13670
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 20:44:30 +0000