Commit Graph

236 Commits

Author SHA1 Message Date
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
Paweł Kołodziejski
f59a0633d6 fixed if check
svn-id: r9962
2003-09-02 07:18:24 +00:00
Travis Howell
3f2ca2b36a Fix from Hibernatus, correct start position for sfx in Amiga maniac/zak.
svn-id: r9960
2003-09-02 03:21:14 +00:00
Travis Howell
7b26efda21 Add sound looping for Amiga zak/maniac
svn-id: r9959
2003-09-01 17:11:09 +00:00
Paweł Kołodziejski
743a3fbdaf added sound handle stuff to mixer streams
svn-id: r9956
2003-09-01 13:43:22 +00:00
Paweł Kołodziejski
2533b23a60 added mixer features: volume and pan control per channel
svn-id: r9944
2003-08-31 20:26:21 +00:00
Travis Howell
890c5cde04 Very basic sfx support for Amiga version of maniac/zak
svn-id: r9922
2003-08-30 15:32:57 +00:00
Travis Howell
144b9ed71c Alter last commit, since looping would never be stopped on Mac version.
svn-id: r9919
2003-08-30 09:42:29 +00:00
Travis Howell
5fe5bd2e0d *** empty log message ***
svn-id: r9918
2003-08-30 09:15:10 +00:00
Travis Howell
21814137c2 indy3ega [mac] use same sound effects format as indy3ega [amiga]
svn-id: r9917
2003-08-30 09:12:45 +00:00
Jonathan Gray
485852ba6c change sound queue overflow error to warning as error was supposed to be temporarily apparently...
svn-id: r9812
2003-08-22 01:47:15 +00:00
Travis Howell
f16aec61f0 Fix speedy music regression in monkeyega/vga/pass.
Add unique tag to sfx when converting AD resources, to solve sfx cutting off music issue in monkeyega/vga.

svn-id: r9801
2003-08-20 15:19:23 +00:00
Travis Howell
a892474a4f Fix my fix
svn-id: r9711
2003-08-15 15:17:25 +00:00
Travis Howell
7e611160a9 *** empty log message ***
svn-id: r9707
2003-08-15 14:18:09 +00:00
Travis Howell
f9aea7673f Correct comment
svn-id: r9702
2003-08-15 10:07:31 +00:00
Travis Howell
f76980af39 Restrict monkeyega/vga music stop hack to ADL and RO sound resources
svn-id: r9697
2003-08-15 04:16:51 +00:00
Jonathan Gray
78b6cb41a9 patch #788078 Improved Amiga V3 SFX support by Quietust
svn-id: r9695
2003-08-15 01:21:59 +00:00
Travis Howell
7faa06aecd Revert bad change
svn-id: r9687
2003-08-14 09:27:33 +00:00
Travis Howell
fa6d96086d Remove debug stuff that shouldn't have been commited
svn-id: r9678
2003-08-14 02:52:52 +00:00
Travis Howell
cd40c899b2 Inital support for v1 maniac sound from Hoenicke
Had to move music init for v1/v2 games to get this working

svn-id: r9675
2003-08-14 02:28:19 +00:00
Travis Howell
679bc2d271 Adds finals changes for choice of sound formats in older games.
Only works wit monkeyvga, since ScummVM has it set as version 4.
Remove some old debugging comments

svn-id: r9659
2003-08-13 15:37:28 +00:00
Travis Howell
de3f72c676 temp. fixme for music in monkeyega/vga
svn-id: r9652
2003-08-13 01:46:48 +00:00
Travis Howell
b198fbc3bb Add adlib music for indy3ega/loom and adlib sfx, patch #770862
svn-id: r9649
2003-08-12 16:09:41 +00:00
Max Horn
9d56a50678 work around odd cases with odd lens for 16 bit audio data
svn-id: r9591
2003-08-07 23:54:59 +00:00
Jamieson Christian
1615278ecc Upgraded IMuse::doCommand() to support more than 8 parameters.
V6 scripts can specify up to 16 parameters to be passed to
doCommand(). In most cases 8 or fewer parameters were used,
but occasional uses of 9 or 10 parameters resulted in
incorrect iMuse behavior due to lost doCommand() data.

ImTrigger was also upgraded to support 8 parameters instead
of 4, since the incorrect behavior that was observed involved
the use of triggered commands that required more than 4
parameters. Since ImTrigger data is not currently being saved
(which is bad), we do not at this time have to go to another
savegame format to support the additional ImTrigger data
(which is good).

This fix corrects a problem in the Tunnel of Love. When the
"execution scene" music finishes and the hidden door opens,
the Tunnel of Love music is supposed to start up again. In
ScummVM, it never would, do to the loss of parameters for a
trigger-based "Parameter Fade" command.

A bit of miscellaneous cleanup has also been made.

svn-id: r9579
2003-08-06 18:20:15 +00:00
Max Horn
002f5262e3 remove obsolete warning for non-22050 Vorbis files
svn-id: r9555
2003-08-06 12:11:10 +00:00
Travis Howell
8bf012d966 Add adlib music improvements for indy3/monkeyega/monkeyvga and cleanups from patch #770862
svn-id: r9480
2003-08-05 05:21:57 +00:00
Max Horn
4a2a1fcdd0 enable partial looping: However this is *completely* untested since I have no clue where this feature is used, so i can't test it... if somebody tells me where this occurs, I can fix it, if it's not working already
svn-id: r9361
2003-08-01 12:50:19 +00:00
Max Horn
0b4e48b59e revamped MP3/Vorbis CD 'emulation' code to use a PlayingSoundHandle -> this allows to finally get rid of the hackish isChannelActive/isChannelUsed methods in SoundMixer
svn-id: r9346
2003-07-31 20:24:10 +00:00
Max Horn
6b470390f7 cleanup
svn-id: r9281
2003-07-29 12:39:41 +00:00
Max Horn
c62b74a08f Added FIXME
svn-id: r9265
2003-07-29 00:05:19 +00:00