Commit Graph
190 Commits
Author SHA1 Message Date
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
Max Horn 791efd853a lots of mixer changes: replaced _volumeTable by _globalVolume (applying volume after resampling is more accurate); made more member vars of SoundMixer protected (and thus added some new getter methods); added (untested) support for a second (stereo) channel when playing MP3
svn-id: r9184
2003-07-25 01:19:14 +00:00
Travis Howell 2b0e1b7000 Small correction for mac loom
svn-id: r9143
2003-07-23 05:36:08 +00:00
Travis Howell fc5080bfb2 Ooops that should not have been commmited
svn-id: r9142
2003-07-23 05:18:47 +00:00
Travis Howell 13dae9b394 fm towns cd audio fix from Hibernatus
svn-id: r9141
2003-07-23 05:17:21 +00:00
Max Horn 2becb78d86 fix for bug #762593 (ZAK256: Audio CD not handled properly)
svn-id: r9135
2003-07-22 22:14:14 +00:00
Max Horn 9bd7cdbce0 so it's not the endFrame, but the duration (in frames), after all! grmbl, took me long enough to figure this out, now I can fix up system.h, and then decide whom I can blame for this mess (yeah I know I renamed everything to endFrame in here, but it was named incorrectly in many other places already... ah well, at least now we know :-)
svn-id: r9130
2003-07-22 20:27:54 +00:00
Travis Howell d3f303bb46 Small update to Amogs sfx support for indy3/loom, patch #771355
svn-id: r9081
2003-07-19 16:07:33 +00:00
James Brown be4446f945 Ignore me, I'm a carrot.
svn-id: r9073
2003-07-19 07:43:13 +00:00
James Brown b295340912 Restore size hack properly
svn-id: r9072
2003-07-19 07:42:01 +00:00
Travis Howell e4b598fb5d Change back to warning
svn-id: r9071
2003-07-19 07:32:26 +00:00
Travis Howell b887fd708e Another fix from Hibernatus
svn-id: r9070
2003-07-19 04:32:35 +00:00
Travis Howell fdb79e01cc More fix from Hibernatus
svn-id: r9069
2003-07-19 03:54:33 +00:00
Travis Howell 9c026748f3 Another fix from Hibernatus
svn-id: r9066
2003-07-18 14:48:18 +00:00
Travis Howell 8fbb8a6df8 Add 22KHz sounds effect support for fm towns games, patch #773434
svn-id: r9063
2003-07-18 05:59:32 +00:00
Travis Howell f20c47bb21 Add Indy3 FM Towns support, patch #773434
svn-id: r9062
2003-07-18 05:49:21 +00:00
Travis Howell 09984089fb Revert part of last changes.
Caused indy3ega/loom to try to use amiga sound sometimes, when Amiga option was enabled.

svn-id: r9059
2003-07-17 12:27:13 +00:00
Travis Howell 5a1dce2773 Ooops
svn-id: r9058
2003-07-17 11:56:47 +00:00
Travis Howell 05b40887d9 Make the Amiga option costumes/palette only again.
svn-id: r9057
2003-07-17 11:20:31 +00:00
Max Horn 8fbc3ed31b proper fix for the small regression caused by my COMI fix last night; this also fixes bug #766382
svn-id: r9047
2003-07-15 22:21:30 +00:00
Max Horn 83a3afab42 temporary fix for bug #771562, I am working on a proper one now
svn-id: r9044
2003-07-15 20:51:18 +00:00
Travis Howell eddf075495 Remove warning in simon
Add INDY3EGA Amiga - experimental support for sound effects, patch #771355

svn-id: r9033
2003-07-15 07:29:23 +00:00
Max Horn 9e27fe9c95 temporarily changed this to an error to help track down what is causing the sound queue overflows(in particular, to figure out the room/script/offset where the bug occurs). Please report your findings to Fingolfin
svn-id: r9028
2003-07-14 22:24:18 +00:00
Max Horn bb87787314 fix for bug #769744 (COMI: Trying to append to a nonexistant stream)
svn-id: r9025
2003-07-14 21:37:45 +00:00
Travis Howell 21266bfc79 zak v1 uses same sound resources as zak v2
svn-id: r9002
2003-07-14 08:42:02 +00:00
Jonathan Gray fcc52b238b remove unused variable which is also incorrectly cast...
svn-id: r8948
2003-07-12 15:38:27 +00:00
James Brown d50009b7c7 Preemptive code cleanup to prevent ear damage during certain Euphony tunes
svn-id: r8947
2003-07-12 15:27:41 +00:00
Jonathan Gray dfdebc39ae add support for MRAW/dmu files in 3DO humongous games, has the overlapping music problem again so will probably have to play music via digital imuse at some point
svn-id: r8803
2003-07-06 15:02:13 +00:00
Max Horn 98027c2072 the amiga check should be separate since the big FIXME comment does not apply to it at all
svn-id: r8798
2003-07-06 10:39:02 +00:00
Travis Howell bdbd7c98bf Add back change that got lost on last two commits
svn-id: r8795
2003-07-06 07:17:50 +00:00
Travis Howell 81871c5ad0 zak256 sound updates from Hibernatus
svn-id: r8793
2003-07-06 06:47:26 +00:00
Travis Howell 580e9ec770 Add support for Amiga version of Monkey Island 1
Palette is still wrong

svn-id: r8790
2003-07-06 06:19:52 +00:00
James Brown 093a31839b Insert preliminary Zak256 sound looping support. It's not perfect, as some Zak256 sounds only loop a part of the sample - which our mixer API doesn't yet support.
svn-id: r8741
2003-07-04 14:10:44 +00:00
Max Horn 470b406587 oops
svn-id: r8738
2003-07-04 12:35:08 +00:00
Max Horn fb16fb3e24 added some very limited support for Mac Loom (text is now properly centered around x:160 instead of x:0); added (commented out) copyprot bypass (but since I am not sure if there was ever a Mac Loom w/o codes, am not sure if this ever should be enabled); added comment regarding the Mac Loom sound format
svn-id: r8737
2003-07-04 12:34:09 +00:00
Max Horn fe8719d7bd more cleanup
svn-id: r8707
2003-07-02 11:04:48 +00:00
Max Horn 2cb05bedb9 possible fix for bug #763714: DIG: 'Trying to append to a nonexistant stream 0'
svn-id: r8697
2003-07-02 00:46:24 +00:00
Max Horn 095b68d74f partially implemented the Audio CD query opcode in Zak256 (see bug #762589); cleanup
svn-id: r8680
2003-06-30 23:18:20 +00:00
Max Horn 67a1aa89db Fixes as per bug #762593 (Zak256 Audio CD handling); some cleanup (e.g. renamed start/delay -> startFrame/endFrame)
svn-id: r8679
2003-06-30 22:25:08 +00:00
Max Horn c52337b128 fix for bug #755899 (thanks Hibernatus)
svn-id: r8677
2003-06-30 20:50:52 +00:00
Max Horn c10905b975 cleanup
svn-id: r8662
2003-06-27 00:10:17 +00:00
Max Horn aa19687a4c fixed memory leak when restarting
svn-id: r8661
2003-06-26 23:04:41 +00:00
Max Horn 7f3118f8d8 more const qualifiers
svn-id: r8649
2003-06-25 23:49:54 +00:00
Max Horn 870ce2879e added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
svn-id: r8648
2003-06-25 23:25:52 +00:00
Paweł Kołodziejski a1f760b944 this should prevent changing music in some room in the DIG
svn-id: r8641
2003-06-23 21:23:10 +00:00
Max Horn 4ead10e4d5 Change names of the stream API in the mixer; added endStream method (stop() halts stream immediately; endStream() lets it first finish playing)
svn-id: r8603
2003-06-22 11:47:03 +00:00
Max Horn 4ad5a183ce renamed SoundMixer::hasActiveChannel->hasActiveSFXChannel, and fixed the regression in it caused by removing _beginSlots (I hope); added isActiveChannel method used by scumm/sound.cpp (this allowed me to move the Channel class from mixer.h into mixer.cpp); replaced Channel::soundFinished method by isActive
svn-id: r8597
2003-06-22 01:55:53 +00:00