71 Commits

Author SHA1 Message Date
Johannes Schickel
64fe71fed3 Added a member function loadSoundFile to Sound which accepts a filename string instead of a filename list id.
svn-id: r33527
2008-08-02 15:05:19 +00:00
Florian Kagerer
b0e22db7a8 - some more work on the Hof FM-Towns/PC98 music driver
- move channels to a separate class

svn-id: r32841
2008-06-29 15:25:45 +00:00
Florian Kagerer
7b30081be2 - improved hof music support for fm-towns (driver for *.twn tracks) (still needs quite some work)
- some PC-98 music support since it uses a very similar driver, but this can't be considered working yet)
- Kyra 1 PC-98 music doen't work at all since I haven't figured out yet how to turn track numbers into the corresponding music file names (might require a hard coded track map)

svn-id: r32807
2008-06-26 19:42:59 +00:00
Johannes Schickel
3be34f071f Added support for compressed kyra3 audio files.
svn-id: r32516
2008-06-03 18:12:21 +00:00
Johannes Schickel
335eb1bf08 Committed my fix for bug #1497437 "KYRA1: Subtitles glitch during 'Speech of the Land'".
svn-id: r32260
2008-05-24 22:47:08 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
4b21c2958d Implemented helium mode support for Kyra3.
svn-id: r32028
2008-05-11 17:50:13 +00:00
Johannes Schickel
a83d79bafd Fixed typos.
svn-id: r31965
2008-05-09 13:33:31 +00:00
Johannes Schickel
b53fe83695 Silenced some g++ 4.3 warnings.
svn-id: r31956
2008-05-08 21:23:14 +00:00
Johannes Schickel
87f10ebe40 Committed patch removing Audio::Mixer::SoundType alias in Kyra::SoundDigital.
svn-id: r31632
2008-04-20 22:24:24 +00:00
Johannes Schickel
d484c7ed43 Improved sound priority handling.
svn-id: r31598
2008-04-20 14:36:39 +00:00
Johannes Schickel
96fd18a13b Implemented sound priority handling.
svn-id: r31597
2008-04-20 14:25:37 +00:00
Johannes Schickel
eb2ffce2fd Implemented volume handling for SFX.
svn-id: r31548
2008-04-17 17:57:16 +00:00
Johannes Schickel
0f34c16c1e Cleanup.
svn-id: r31547
2008-04-17 17:49:18 +00:00
Johannes Schickel
87256747b1 Implemented sfx support for Kyra3.
svn-id: r31546
2008-04-17 17:46:39 +00:00
Johannes Schickel
853b6e28e9 Implemented some kyra3 code.
svn-id: r31503
2008-04-14 20:20:51 +00:00
Johannes Schickel
d54eaa39a1 Added fade out time parameter for digital sounds.
svn-id: r31489
2008-04-12 23:26:13 +00:00
Johannes Schickel
9377fc7dc8 Some MIDI related cleanup.
svn-id: r31443
2008-04-07 17:56:04 +00:00
Johannes Schickel
a05b085a21 Fixed potentional crash.
svn-id: r31432
2008-04-06 14:58:02 +00:00
Johannes Schickel
2755727249 Cleanup.
svn-id: r31426
2008-04-06 14:13:14 +00:00
Johannes Schickel
22992f4aa5 Implemented opcode 33 o2_loadSoundfile.
svn-id: r31425
2008-04-06 14:11:43 +00:00
Johannes Schickel
a2e355d671 Implemented fadeout waiting in KyraEngine_v2::enterNewScene for AdLib.
svn-id: r31424
2008-04-06 13:57:28 +00:00
Johannes Schickel
21a66f12ba - Fixed HACKs in o2_getMusicDriver and o2_getSfxDriver
- Implemented missing bits in KyraEngine_v2::enterNewScene for MIDI (AdLib code still missing)
- Added music/sfx type to Sound class

svn-id: r31423
2008-04-06 13:32:41 +00:00
Johannes Schickel
82c2f1203e Cleaned up volume settings managment.
svn-id: r31385
2008-04-04 18:09:19 +00:00
Florian Kagerer
221e6bb84f - some accuracy changes for KyraEngine_v2::snd_playSoundEffect()
- fix one more skip flag bug in the sequence player
- fix SoundTowns_v2::voicePlay()

svn-id: r31278
2008-03-28 00:07:40 +00:00
Johannes Schickel
b615eb177b Cleanup.
svn-id: r31210
2008-03-21 16:21:27 +00:00
Johannes Schickel
a169619526 - Implemented opcode 97: o2_isAnySoundPlaying
- reworked sound channel handling in HoF
  => fixed some voice related bugs

svn-id: r31209
2008-03-21 16:18:27 +00:00
Florian Kagerer
753536fa61 committing patch 1891492 : dialogue (dlg/tim) support for HoF
- talking to NPCs is now possible.
- Zanthia's talks when entering a new scene for the first time now work
- using items on Zanthia is now possible.

svn-id: r30886
2008-02-17 02:06:04 +00:00
Johannes Schickel
31938bc071 Fixed kyra3 code.
svn-id: r30822
2008-02-07 23:27:08 +00:00
Johannes Schickel
ae0b605ad4 Reworked Kyrandia resource loading code.
svn-id: r30820
2008-02-07 23:13:13 +00:00
Johannes Schickel
2a28b40512 Added some paranoia checks.
svn-id: r30398
2008-01-11 00:35:39 +00:00
Johannes Schickel
f510fb6b14 Fix regression introduced with last commit. (Caused crash in Amiga version)
svn-id: r30397
2008-01-11 00:33:45 +00:00
Johannes Schickel
2dd6db4ca5 Commit slighty modified patch #1865509 "KYRA: kyradat support for hof".
svn-id: r30394
2008-01-10 23:25:19 +00:00
Filippos Karapetis
1411c9f3f1 Fix compilation
svn-id: r30204
2008-01-03 21:57:54 +00:00
Johannes Schickel
58f0d4e632 Committed slightly modified patch #1862758 "KYRA: audio data assignment patch".
svn-id: r30198
2008-01-03 14:42:49 +00:00
Johannes Schickel
35e72866ec Simplification of GM vs MT-32 detection.
svn-id: r29997
2007-12-26 01:09:46 +00:00
Johannes Schickel
0cbff0fc42 Logic fix for MixedSoundDriver::init.
svn-id: r29953
2007-12-22 23:29:15 +00:00
Johannes Schickel
1ecbde083f Reverted too complicated (and unneeded) volume settings code for towns driver.
svn-id: r29939
2007-12-21 09:28:27 +00:00
Johannes Schickel
4a3dedfe7e Commit of patch #1848147 "KYRA: SoundTowns Update" with some changes. Thanks to Florian for the patch.
svn-id: r29881
2007-12-16 18:48:43 +00:00
Johannes Schickel
287e79d477 Documenting the sound code a bit.
svn-id: r29392
2007-11-03 23:32:15 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
11b2806741 Removed the old (obsolete) audiostream factories for MP3/Vorbis/FLAC data which took a File pointer and a size (these were only implemented as brain-dead wrapper around the newer factory methods anyway)
svn-id: r28110
2007-07-15 18:29:05 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Johannes Schickel
397c10f059 made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
2007-04-01 13:10:50 +00:00
Johannes Schickel
d1645e2fbf Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
2007-03-24 00:04:08 +00:00
Max Horn
8466221fce Simplify code a bit -- got rid of File::incRef usage, an unnecessary member var, fixed a potential memory leak (if all channels are in use), and fixed a potential OOB error (if stopSound(-1) was called)
svn-id: r25916
2007-03-01 17:04:50 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
2007-02-20 18:50:17 +00:00
Torbjörn Andersson
1987813f53 Another batch of header consistency changes.
svn-id: r25746
2007-02-20 17:33:54 +00:00
Johannes Schickel
940e89d00e Added support for Kyrandia 2 ADL files.
svn-id: r25634
2007-02-16 16:57:59 +00:00
Johannes Schickel
7bb9b05f55 cleanup
svn-id: r25268
2007-01-29 21:34:39 +00:00