Commit Graph

266 Commits

Author SHA1 Message Date
Max Horn
96a8d0ec1c proper fix for COMI timer issue: don't let a Timer remove itself
svn-id: r10867
2003-10-17 16:30:24 +00:00
Max Horn
31ba12c800 some more target<->game cleanup
svn-id: r10769
2003-10-12 19:10:17 +00:00
Max Horn
d177364715 new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS
svn-id: r10687
2003-10-08 21:59:23 +00:00
Travis Howell
bafce8daf5 Remove comment, which is no longer needed too.
svn-id: r10655
2003-10-07 03:59:24 +00:00
Travis Howell
5c64695367 Ooops, used wrong one.
svn-id: r10653
2003-10-07 03:58:29 +00:00
Travis Howell
dacd8ce4d1 FM TOWNS sfx fix, correct sample rate.
svn-id: r10652
2003-10-07 03:54:49 +00:00
Max Horn
d7660a2662 introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)
svn-id: r10549
2003-10-02 22:42:03 +00:00
Jamieson Christian
e78b1aeb44 A few FmTowns games don't fall under the GF_FMTOWNS flag.
Must not filter them out in stopSound().

svn-id: r10527
2003-10-01 18:27:31 +00:00
Jamieson Christian
9d93e97ed4 Support for FMTowns versions of MI1/2,
submitted by Hibernatus.

svn-id: r10511
2003-09-30 17:53:42 +00:00
Jamieson Christian
4ab0dff9eb This may be an issue in legit gameplay, but GF_FMTOWNS
games do use _musicEngine for the FM synth stuff, so
don't exclude it in stopSound(). (Is this assumption
made elsewhere also?)

svn-id: r10506
2003-09-30 16:45:50 +00:00
Max Horn
6f978e9e30 some minor cleanup
svn-id: r10437
2003-09-27 20:31:19 +00:00
Travis Howell
4a62eb3e3b More Amiga V2/V3 sound updates from _Q_:
1. A Player_MOD class, basically acts as a simplified mixer that mixes at 60Hz intervals (or whatever interval you specify), this gives smooth music playback in player_v3a
2. Some changes to player_v3a as a result of #1, including reduced music volume
3. player_v2a, and the necessary additions to scummvm.cpp/scumm.h

svn-id: r10392
2003-09-24 06:56:30 +00:00
Torbjörn Andersson
570e60a487 Whitespace changes
svn-id: r10390
2003-09-24 06:33:59 +00:00
Jamieson Christian
091b41a278 Partial fix for Bug [636985] ZAK256: No kazoo tune
Implemented a parser for Euphony music. No
FM instrument support yet, as the FM chip used
by FM Towns is not being emulated yet. In the
meantime, a stock FM-emulated GM instrument is
being used instead.

This at least makes the Zak Towns kazoo tune
and the Loom Towns distaff audible. Emulation
of the FM Towns synth chip, or suitable
emulation using the OPL2 synth, is still
under investigation.

svn-id: r10265
2003-09-16 11:44:48 +00:00
Max Horn
8f26c43b49 cleanup
svn-id: r10260
2003-09-15 19:48:54 +00:00
Travis Howell
7f81defbff Revert change, was not needed after all.
svn-id: r10228
2003-09-13 14:09:36 +00:00
Travis Howell
989f3f9215 Another fm towns sound fix from Hibernatus
svn-id: r10217
2003-09-13 12:04:48 +00:00
Travis Howell
e8f7f2a4e1 Another fm towns sound fix from Hibernatus
svn-id: r10209
2003-09-13 06:56:47 +00:00
Max Horn
ba34c1f4cf experimental fix for bug #802396 (LOOMCD: Sound lock up); it turns out this is a very long standing bug (pre-0.4.1 at the least). This fix may cause regressions in games using CD tracks, beware
svn-id: r10163
2003-09-10 22:36:46 +00:00
Max Horn
afe56a4aeb added refCon parameter to timer class
svn-id: r10156
2003-09-10 12:43:54 +00:00
Max Horn
70df5b782c another fix for bug #802396 (LOOMCD: Sound often causes lock up)
svn-id: r10142
2003-09-09 17:50:20 +00:00
Max Horn
90ec1dc34e make even more use of Scumm::_musicEngine; added MusicEngine::setMasterVolume
svn-id: r10097
2003-09-08 17:06:44 +00:00
Max Horn
84a87ec24c fix for bug #802396 (LOOMCD: Sound often causes lock up)
svn-id: r10085
2003-09-08 11:41:28 +00:00
Paweł Kołodziejski
a3aef4e0d6 fix warning
svn-id: r10081
2003-09-08 07:07:30 +00:00
Max Horn
a9591325ae properly decode SBL resources by scanning the VOC header in them; added a guess at how SEGA SBLs work (untested, might be completely wrong)
svn-id: r10074
2003-09-07 20:53:05 +00:00
Max Horn
7342163c7e make use of voc.h; some cleanup
svn-id: r10073
2003-09-07 20:30:02 +00:00
Max Horn
a7676e07c3 removed the seperate 'MP3' CD methods in class Sound (besides being misnamed, merging them into their parent functions actually seems clearer to me, reading wise)
svn-id: r10071
2003-09-07 19:47:58 +00:00
Max Horn
1dbab0237f cleanup/refactoring
svn-id: r10070
2003-09-07 19:28:45 +00:00
Max Horn
361c3b95d5 some cleanup; clarified isSoundInUse semantics and the difference between IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus
svn-id: r10069
2003-09-07 17:14:56 +00:00
Max Horn
38402315d5 make some first use of Scumm::_musicEngine; cleanup; also some changes which *might* cause some breakage, but if they don't, we can build on them to simplify Sound::playSound a little (mainly by removing lots of 'return' statements)
svn-id: r10068
2003-09-07 16:32:23 +00:00
Max Horn
0012f7fa96 added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 (initial stab, more work to follow)
svn-id: r10066
2003-09-07 16:16:19 +00:00
Travis Howell
9de8a0cfa9 Add music player for Amiga versions of indy3ega/loom from unused.
Revert last change to common.rules for now, it broke compile.

svn-id: r10061
2003-09-07 07:23:20 +00:00
Max Horn
b380affbd5 cleanup
svn-id: r10055
2003-09-07 00:03:55 +00:00
Max Horn
4e07649c97 small tweak requested by unused on IRC
svn-id: r10053
2003-09-06 23:35:42 +00:00
Max Horn
0be0196013 removed pauseMixer method from mixer, and renamed stop to stopChannel
svn-id: r10042
2003-09-06 10:47:30 +00:00
Travis Howell
ff05aeeb9e zak256 partial sfx loops are working fine.
svn-id: r10032
2003-09-06 03:05:01 +00:00
Travis Howell
8b4668740e Search header of Amiga V2 games for rate and volume.
svn-id: r10031
2003-09-06 02:27:03 +00:00
Travis Howell
8147719ff2 Remove sound looping hack for v2 amiga games.
svn-id: r10030
2003-09-06 01:44:29 +00:00
Max Horn
318daabdc7 added whitespace, added FIXME comment
svn-id: r10026
2003-09-05 22:53:36 +00:00
Max Horn
3aa8454efa moved the sound ID param in playRaw before volume/pan
svn-id: r10023
2003-09-05 22:09:56 +00:00
Max Horn
d6e4788457 any reasons for playing bundle sounds at 50% volume?
svn-id: r10020
2003-09-05 21:12:33 +00:00
Max Horn
06b6ff9a44 added default volume/pan values
svn-id: r10019
2003-09-05 21:06:32 +00:00
Max Horn
11193b0746 cleaned up sound/mixer.h a bit; renamed some mixer methods for consistency
svn-id: r10018
2003-09-05 20:48:32 +00:00
Travis Howell
0c4d151381 *** empty log message ***
svn-id: r10006
2003-09-05 15:28:22 +00:00
Travis Howell
3187b565dd Add atarist and macintosh options, since there seem to be no way to detect version been used.
svn-id: r9999
2003-09-05 07:36:05 +00:00
Paweł Kołodziejski
7bc63a0ce3 fixes for uninitialized pan and volume
svn-id: r9998
2003-09-05 06:22:10 +00:00
Travis Howell
df963e48bd Corrections for Amiga V2/V3 games from unused.
svn-id: r9994
2003-09-05 03:29:29 +00:00
Torbjörn Andersson
94df02c799 Implement the ACTOR_PAN opcode. The only place I know of where it's used is
between between ship-to-ship combats, so I didn't bother yet to store it in
savegames.

svn-id: r9988
2003-09-03 17:00:33 +00:00
Paweł Kołodziejski
5a6bce590b changed sounds volume to original volume level, and fixed sounds in bass intro
svn-id: r9963
2003-09-02 07:49:40 +00:00