libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,245 Commits 5 Branches 5 Tags 1.8 GiB
f9bbc2ca37
Commit Graph

461 Commits

Author SHA1 Message Date
md5
9a987001d4 SCI: Some initial work on supporting patch.005 in KQ1 Amiga 2011-04-15 11:20:07 +03:00
md5
22046d2480 SCI: Added handling for another version of mt32.drv (bug #3285556) 
This is used in another version of KQ4 early (0.000.274)
 2011-04-13 10:29:24 +03:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG 
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
 2011-04-12 16:53:15 +02:00
md5
bfef0f5a6f SCI: Fixed fading-related bugs #3267956 and #3041738 2011-04-03 19:02:14 +03:00
md5
6d90b0739a SCI: Show object names in the songlib console command 2011-04-03 19:01:20 +03:00
md5
9654068659 SCI: Fixed bug #3266480 and partially fixed bug #3041738 
Hopefully, this will fix some of the oddities happening because of music fading
 2011-04-03 14:37:15 +03:00
dhewg
23ad90b781 SCI: Replace not required emumidi header 2011-04-02 13:31:53 +02:00
Walter van Niftrik
6501a86095 SCI: Fix default pan value in MIDI driver. 2011-03-27 00:04:28 +01:00
Max Horn
29847ea42d AUDIO: Change several fake MidiDrivers to MidiDriver_BASE subclasses 
Many engines follow the advice in audio/midiparser.h and create a
"pseudo-MidiDriver" subclass. But MidiParser really only needs a tiny
subset of the MidiDriver capabilities, namely those found in
MidiDriver_BASE. So we try to subclass from that whenever possible; this
allows us to remove many stub methods, and enables further future
simplifications.
 2011-03-23 15:25:47 +01:00
Max Horn
7b02dac3c5 ENGINES: Use Common::StackLock in more places 2011-03-23 15:25:46 +01:00
Max Horn
8982fff1b7 AUDIO: Add pure virtual MidiDriver::isOpen() method 
This in turn enables modifying MidiDriver_MPU401::close() to allow
it to be called on a midi driver that has not yet been opened.

The specific issue that triggered me to make these changes was a
crash-upon-quit in HUGO, caused by it instantiating a midi driver,
then encountering an error (missing hugo.dat) *before* having
opened the new midi driver; the general cleanup code then tries
to close the (not yet opened) midi driver -> kaboom

Also fixed some engines which were leaking MidiDriver instances.
 2011-03-22 23:51:47 +01:00
md5
d2acad39c8 SCI: Always clear looping and hold before jumpToTick() is called 
Fixes a crash in LSL3 Amiga
 2011-03-03 12:45:03 +02:00
md5
9af4453ee5 SCI: Don't ignore SysEx messages at the driver level but warn instead 
SysEx messages in the driver are usually the result of a bug which should
be investigated and not silently ignored
 2011-03-03 11:18:59 +02:00
md5
9d6ed4de31 SCI: Slight cleanup of some sound drivers 2011-03-03 01:47:08 +02:00
md5
d149405d79 SCI: Fixed bug #3039188 - "LSL2 Amiga: Failed to Initialize Sound Driver error" 
This was a signed/unsigned issue. Also fixed compilation when DEBUG is
enabled. Thanks to waltervn for his help on this.
 2011-03-01 16:28:08 +02:00
md5
1dcce4445c SCI: Reverted rc7bfbc3 and fixed the actual cause of bug #3106107 
While fast forwarding a song, disable its hold value together with any possible
sound looping, so that the song won't loop forever.
 2011-02-28 01:06:29 +02:00
md5
c7bfbc31e2 SCI: Fixed bug #3106107 - "QFG3: Crash when saving outside palace" 
Ignore requests to alter a song's hold value while it's being faded, and reset
a song's hold value when fading starts. This ensures that the song will actually
stop when fading is done and won't keep looping forever.
 2011-02-28 00:18:23 +02:00
md5
72f65b3946 SCI: Renamed SCI_VERSION_1_EGA to SCI_VERSION_1_EGA_ONLY 
This renaming allows us to better distinguish that this version is for games
that only had an EGA version, and avoid confusion with newer SCI1 game releases
with EGA graphics (e.g. KQ5 EGA). The only game with this SCI version is QFG2,
a SCI1 EGA game with a parser. Also, added some games for each SCI version.
 2011-02-27 16:48:53 +02:00
Ori Avtalion
da62869baf SCI: Avoid hiding overloaded virtual methods 2011-02-26 21:22:03 +02:00
md5
88235cee7c SCI: Some slight fixes for the code that reads the LSL2 early MT32.DLL driver, thanks to waltervn 2011-02-26 15:27:01 +02:00
md5
318c51a202 SCI: Added support for reading data off the MT32.DRV driver found in LSL2 early (bug #3192627) 2011-02-26 05:22:10 +02:00
md5
8024f40638 SCI: Changed the fix for the intro of Longbow (bug #3044844) into a hack for that scene. Fixes the freeze in LSL6 (bug #3192166). Fading in KQ5 is unaffected by this. 2011-02-25 21:45:39 +02:00
md5
9ad4ad1abc SCI: Fixed two bugs related to music fading 
- bug #3037594: "KQ5: Music not fading when brigands leave temple"
- bug #3044844: "LONGBOW: Intro skips each first verse of song"
 2011-02-24 02:17:28 +02:00
Filippos Karapetis
6a4ea3abd3 SCI: Added comments to the FB-01 and MIDI drivers. The original driver files are only 
needed in SCI0 early games, which didn't include separate sound patch resources. Thanks
to waltervn for the information he supplied

svn-id: r55875
 2011-02-10 21:10:49 +00:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Max Horn
2d1c8a3533 ALL: Fix whitespaces / indention 
svn-id: r55818
 2011-02-07 23:01:06 +00:00
Filippos Karapetis
9149100629 SCI: Several changes related to robot files 
- Added WIP robot sound support (which has pops between each frame for some reason)
- Now handling a lot of previously ignored fields
- Now handling the chunk before the palette chunk properly. Fixes some v6 videos
- Added known robot related TODOs

svn-id: r55793
 2011-02-06 11:51:21 +00:00
Filippos Karapetis
512bcf8b90 SCI: Rewrote the robot playing code in a way similar to other video decoders 
- The code now streams videos instead of loading them in memory, without utilizing seeking
- Removed the sound-related robot code from the graphics classes
- Started implementing the code for the sound in robot videos (still not finished)

svn-id: r55772
 2011-02-04 17:51:59 +00:00
Matthew Hoops
a6891a4372 SCI: Fix Mac sync resource support 
svn-id: r55716
 2011-02-02 02:20:25 +00:00
Filippos Karapetis
47d109a093 SCI: Bugfix for r55246: Don't send init commands when resuming a sound 
svn-id: r55247
 2011-01-15 09:28:42 +00:00
Filippos Karapetis
cd108d3a81 SCI: Fixed bug #3034974 - "SCI: Music out of tune after loading a save" 
svn-id: r55246
 2011-01-15 00:29:02 +00:00
Johannes Schickel
645ba4c379 SOUND: Get rid of unused forward declarations in mixer.h. 
svn-id: r55197
 2011-01-10 22:20:51 +00:00
Filippos Karapetis
32d7e687ee SCI: debugC calls no longer require a debug level of 2 to show output 
svn-id: r55086
 2011-01-01 12:48:12 +00:00
Filippos Karapetis
401a8c355d SCI: Some initial work on the sound of robot videos (doesn't work yet, seems to be a problem with the encoding of the customized SOL audio files in robot videos) 
svn-id: r55023
 2010-12-23 13:11:10 +00:00
Filippos Karapetis
de2ef2edc0 SCI: Removed the system strings code and replaced it with a much more simplified version, thus greatly simplifying handling of system strings 
svn-id: r54805
 2010-12-07 00:47:05 +00:00
Filippos Karapetis
0312235f67 SCI: Removed bogus warning 
svn-id: r54512
 2010-11-27 18:27:02 +00:00
Filippos Karapetis
49afe9ccff SCI: Fix for bug #3119713 - "PQ2: song-specific reverb changes are ignored" (thanks to waltervn) 
svn-id: r54509
 2010-11-27 17:29:42 +00:00
Walter van Niftrik
52b89206c0 SCI: Pull reverb default directly from control channel. 
svn-id: r54499
 2010-11-26 14:35:46 +00:00
Walter van Niftrik
3d38a383bb SCI: Only filter channels for early SCI0, as GM currently uses all channels. 
svn-id: r54498
 2010-11-26 14:35:28 +00:00
Filippos Karapetis
5562f9e087 SCI: Added a define to turn off channel remapping (for debugging) 
svn-id: r54496
 2010-11-26 14:25:18 +00:00
Filippos Karapetis
1d4e452c78 SCI: Send the SCI0 reverb init after reading the reverb data 
svn-id: r54492
 2010-11-26 06:41:45 +00:00
Filippos Karapetis
e793d62c8d Fixed bug with r54485 
svn-id: r54488
 2010-11-26 00:10:51 +00:00
Filippos Karapetis
069309f88a SCI: set the reverb setting of the current song when a relevant event is fired from the MIDI stream 
svn-id: r54485
 2010-11-26 00:05:27 +00:00
Filippos Karapetis
af15ac6f6a SCI: Some reverb-related changes in the MIDI driver, based on a patch by waltervn 
svn-id: r54484
 2010-11-25 22:23:14 +00:00
Filippos Karapetis
3a8648c4db SCI: Initialize reverb in the music driver correctly. Based on a patch by waltervn 
svn-id: r54483
 2010-11-25 22:17:23 +00:00
Filippos Karapetis
11ac03b7ab SCI: Global reverb can't be 127. Some cleanup 
svn-id: r54482
 2010-11-25 22:16:22 +00:00
Filippos Karapetis
1cf26f67e0 SCI: Initialize global reverb correctly. Fixes bug #3118700 - "SCI KQ5: Assertion in midi.cpp" (regression from r54478) 
svn-id: r54481
 2010-11-25 22:14:38 +00:00
Filippos Karapetis
601494cad4 SCI: implemented reverb handling and related functionality 
svn-id: r54478
 2010-11-25 16:09:45 +00:00
Filippos Karapetis
2c2f3a97e6 SCI: Added support for the alternate Windows MIDI soundtracks of the CD versions of EcoQuest, Jones, KQ5 and SQ4 
svn-id: r54476
 2010-11-25 14:22:09 +00:00
Walter van Niftrik
8c4ebc434d SCI: Fix bug in MT-32 checksum computation. Thanks Sven for finding this. 
svn-id: r54471
 2010-11-25 11:19:46 +00:00
Filippos Karapetis
52898b6336 SCI: Fixed digital audio at the beginning of KQ5CD and removed a hack for the Windows version 
svn-id: r54466
 2010-11-25 02:21:07 +00:00
Filippos Karapetis
ff58eea2ce SCI: Set _useMT32Track correctly for KQ5 Windows, thus simplifying the code 
svn-id: r54465
 2010-11-25 01:31:03 +00:00
Filippos Karapetis
7508260954 SCI: Added support for the alternative GM tracks of the Windows version of KQ5CD (bug #3041239) 
Note that the empty GM track for the Sierra logo makes the game hang, so the
MT-32 track is used, which sounds awful

svn-id: r54464
 2010-11-25 01:19:45 +00:00
Filippos Karapetis
dcd1326970 SCI: Some renaming and added several TODOs concerning reverb 
svn-id: r54461
 2010-11-24 16:01:30 +00:00
Filippos Karapetis
1ebae78ff1 SCI/SOUND: Applied patch #3117577 - "SCI: MT-32 plays "warble" of notes when music resumes", with some slight modifications 
This is only used by SCI for now, but it is probably correct to apply this for
all engines, thus an appropriate TODO has been added

svn-id: r54460
 2010-11-24 15:12:43 +00:00
Filippos Karapetis
9493b9add5 SCI: Moved handling of special reverb value 127 outside of the MIDI driver 
svn-id: r54459
 2010-11-24 14:51:29 +00:00
Filippos Karapetis
364d37b302 SCI: some changes to the way reverb is handled 
- "Invalid" SCI reverb values (127) are properly handled now
- SCI kDoSound(reverb) sets the global reverb (renamed it accordingly)
- kDoSound(reverb) can also return the current reverb if no parameter is sent

svn-id: r54457
 2010-11-24 14:21:31 +00:00
Filippos Karapetis
642d15e43f SCI: Added a getReverb() accessor to the SciMusic class 
svn-id: r54456
 2010-11-24 14:15:46 +00:00
Filippos Karapetis
332a438ccf SCI: Added a TODO for the default reverb value 
svn-id: r54454
 2010-11-24 11:26:48 +00:00
Filippos Karapetis
fcd8a04c64 SCI: Read MT-32 reverb data correctly (patch #3117434) 
svn-id: r54453
 2010-11-24 11:19:27 +00:00
Filippos Karapetis
d438b739cf SCI: Also send a sustain off on a notes off event (patch from bug #3116608) 
svn-id: r54429
 2010-11-23 16:03:30 +00:00
Filippos Karapetis
23bd8a1c26 SCI: Ignore polyphonic/channel aftertouch (0xa0 / 0xd0) in the MIDI driver, like in the Adlib driver. SSCI doesn't handle these, so we shouldn't handle them either 
svn-id: r54428
 2010-11-23 15:47:54 +00:00
Max Horn
2180b2d6b5 COMMON: Split common/stream.h into several headers 
svn-id: r54385
 2010-11-19 17:03:07 +00:00
Filippos Karapetis
3b07056a47 SCI: Moved the Object class in a separate file 
svn-id: r54361
 2010-11-19 08:18:24 +00:00
Filippos Karapetis
9d1006c7a3 SCI3: Some changes 
- Placed the SCI3 version detection in the proper place
- Some new types of SCI3 MT-32 patches (e.g. in the Lighthouse SCI3 demo) are
ignored, for now

svn-id: r54188
 2010-11-10 14:28:45 +00:00
Max Horn
059944e59c COMMON: Push #include audiocd.h in system.h out to .cpp files 
svn-id: r54148
 2010-11-08 23:07:42 +00:00
Max Horn
82e473bc3b BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only 
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).

The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.

svn-id: r54147
 2010-11-08 22:53:36 +00:00
Max Horn
ba3e826872 SCI: Remove any use of printf 
svn-id: r54037
 2010-11-02 09:49:47 +00:00
Filippos Karapetis
43221a3253 SCI: Removing obsolete function parameter 
svn-id: r53986
 2010-10-31 20:57:50 +00:00
Filippos Karapetis
b3e42b94c9 SCI: Added some missing GM mappings for MT-32 instruments: 
- MT-32 Castanets -> GM Claves
- MT-32 OneNoteJam -> GM Celesta
- MT-32 JungleTune -> GM Pan Flute
For PQ3 (from rev #53902, not in the commit description):
- MT-32 Warm Pad -> GM Pad 2 (warm)

Thanks to digitall and waltervn for their help with these

svn-id: r53907
 2010-10-28 18:45:11 +00:00
Filippos Karapetis
27c52434ba SCI: Split the GM related names out of map-mt32-to-gm.h and into a separate header file 
svn-id: r53906
 2010-10-28 16:26:04 +00:00
Filippos Karapetis
0e7444a463 SCI: Fixed compilation and added include safeguards to map-mt32-to-gm.h 
svn-id: r53904
 2010-10-28 15:27:44 +00:00
Filippos Karapetis
a7b5133903 SCI: Improved the description of the "map_instrument" console command a bit. Also, the dynamic mappings are now checked before the static ones 
svn-id: r53903
 2010-10-28 13:00:21 +00:00
Filippos Karapetis
3a4647dc50 SCI: Several changes related to MT-32 -> GM mapping 
- Changed C - style comments in map-mt32-to-gm.h to C++ - style comments
- Added a new dynamic MT-32 -> GM mapping, complementary to the normal one, which can be done on the fly using the new console command "map_instrument"
- The "show_instruments" command has been moved to the music section and now displays the instruments of the game which aren't in the MT32-> GM mapping

svn-id: r53902
 2010-10-28 12:48:51 +00:00
Martin Kiewitz
f8c7243938 SCI: fixing possible deadlock inside clearPlaylist 
thx to ajax16384

svn-id: r53613
 2010-10-19 14:53:39 +00:00
Johannes Schickel
75e8452b6e OPENGL: Merged from trunk, from rev 52105 to 53396. 
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399
 2010-10-13 03:57:44 +00:00
Filippos Karapetis
e1a5b5cda1 SCI: Fix for bug #3083151 - "QFG3: Long pause while loading specific savegame" 
svn-id: r53060
 2010-10-07 21:50:47 +00:00
Johannes Schickel
fd3cc727c9 SCI: Implement voice mapping for CMS driver. 
svn-id: r52871
 2010-09-24 00:38:18 +00:00
Filippos Karapetis
433448ff62 SCI: Added documentation for the different music patches in SCI games 
svn-id: r52802
 2010-09-19 11:44:07 +00:00
Johannes Schickel
9f273b31aa SCI: Fix compilation on AmigaOS. 
svn-id: r52784
 2010-09-17 21:28:24 +00:00
Johannes Schickel
eb400c8787 SCI: Add CMS driver for SCI1-SCI1.1. 
svn-id: r52781
 2010-09-17 20:03:20 +00:00
Johannes Schickel
b8e4f0b135 SCI: Proper initialization in MidiPlayer's constructor. 
svn-id: r52768
 2010-09-17 18:03:12 +00:00
Johannes Schickel
f742d2ecc5 SCI: Some constification. 
svn-id: r52726
 2010-09-14 21:53:22 +00:00
Walter van Niftrik
5eb0314e4c SCI: Fix last MIDI channel number for adlib driver 
svn-id: r52662
 2010-09-09 18:26:16 +00:00
Walter van Niftrik
8264bb704f SCI: Add getLastChannel() function to MidiPlayer class 
svn-id: r52655
 2010-09-09 12:46:46 +00:00
Martin Kiewitz
06afbd7fbb SCI: dont remap to channel 9 (fix real mt32) 
svn-id: r52634
 2010-09-08 10:49:12 +00:00
Martin Kiewitz
624d06b684 SCI: extending comment for prev. commit 
svn-id: r52606
 2010-09-06 19:03:55 +00:00
Martin Kiewitz
d618678982 SCI: dont play audio on kDoSound in hoyle4 
hoyle4 has garbled audio data

svn-id: r52605
 2010-09-06 19:00:43 +00:00
Martin Kiewitz
2bf82a8354 SCI: fix regression of r52569 
fade in/out of samples

svn-id: r52604
 2010-09-06 18:23:03 +00:00
Walter van Niftrik
ba6bc8f17b SCI: AdLib: process patch change commands when playswitch is off. 
svn-id: r52595
 2010-09-06 16:09:19 +00:00
Martin Kiewitz
1856723a9e SCI: ignore kDoSound volume changes on samples 
svn-id: r52569
 2010-09-05 19:34:26 +00:00
Martin Kiewitz
6ffbe90130 SCI: sierra sci ignores vol for kDoSound samples 
now "score" is halfway playing, but it's cut so only "s" is played. Needs to get further investigated

svn-id: r52568
 2010-09-05 19:25:08 +00:00
Filippos Karapetis
f78b4b9f85 SCI: Added a warning when using GM with SCI1 games 
The MT-32 <-> GM mapping has only been worked on for
SCI0/SCI01 games. Throw a warning when the user
chooses GM in a SCI1 game, and there is no after
market GM support from Sierra for this game

svn-id: r52505
 2010-09-03 12:42:35 +00:00
Filippos Karapetis
ace4477041 SCI: Rewrote the game name IDs of the Mt32MemoryTimbreMaps array to be like the game IDs we use 
svn-id: r52504
 2010-09-03 08:46:07 +00:00
Filippos Karapetis
d87fa1c890 SCI: Show a warning window regarding GM in some games. 
Sierra has released a patch adding after market General MIDI support for 8 SCI1
games (LSL1, LSL5, Hoyle 3, SQ1, SQ4, Eco1 floppy, Longbow and Fairy Tales). If
the user has selected the General MIDI music driver in one of these games and
no associated MIDI patch is found, show an informational dialog on game startup
in order to inform the user to download Sierra's MIDI patch, together with some
short instructions.

svn-id: r52500
 2010-09-02 21:50:00 +00:00
Martin Kiewitz
64313cd7f1 SCI: set master volume correctly 
and merge it together with global volume, fixes bug #3053104)

svn-id: r52484
 2010-09-01 19:20:17 +00:00
Martin Kiewitz
4ecb2b6047 SCI: renaming fb01-enable to "native_fb01" 
svn-id: r52471
 2010-08-31 11:51:43 +00:00
Martin Kiewitz
55f8415187 SCI: forgot one rename of "enable_fb01" 
svn-id: r52470
 2010-08-31 11:43:56 +00:00
Filippos Karapetis
37d2f10206 SCI: Added checking for the existence of a GM track, to determine if device ID 7 or 12 should be used. Fixes the GM music in the demo of QFG3, which is using an in-between version of SCI1 and SCI1.1 
svn-id: r52211
 2010-08-19 13:52:21 +00:00
Filippos Karapetis
c969090ef8 SCI: Only perform queuing of song signals for SCI0, where we handle the updating of song queues ourselves. Newer games handle signaling on their own, thus we shouldn't interfere with this. Fixes bug #3045913 - "PHARKAS CD: Crash at the start menu" (a regression from rev #52043) 
svn-id: r52195
 2010-08-18 20:00:18 +00:00
Filippos Karapetis
ff8cfd3d9b SCI MIDI: adding some asserts as well as proper initialization for _velocityMap 
svn-id: r52184
 2010-08-18 11:03:12 +00:00
Filippos Karapetis
135b9ee63c SCI: Changed a warning into a debugC 
svn-id: r52183
 2010-08-18 07:58:38 +00:00
Alejandro Marzini
b0409d6739 Merge trunk, from r51777 to r52105 
svn-id: r52108
 2010-08-16 00:21:07 +00:00
Martin Kiewitz
4be0eb985e SCI: queuing signal, if signal not passed to scripts 
fixes laura bow 1 when knocking at the door in the attic, scripts wait for 0xb in that case, sound resource sets 0xb and then immediately ends. This resulted in the scripts only getting the termination signal, so they waited endlessly. (bug #3042981)

svn-id: r52043
 2010-08-12 15:45:53 +00:00
Martin Kiewitz
324e937347 SCI: not pausing kDoSound samples anymore 
but pausing looped samples only
fixes "I'm melting" sample in sq1 death (bug #3038048)
added detailed comment about this change

svn-id: r51985
 2010-08-11 15:04:26 +00:00
Alejandro Marzini
33e40e1a20 Merged from trunk, from r51495 to r51775 
svn-id: r51776
 2010-08-06 03:21:21 +00:00
Filippos Karapetis
4db52c1ce1 SCI: Turned a warning into a debugC 
svn-id: r51738
 2010-08-04 13:35:56 +00:00
Martin Kiewitz
b45f2fcb97 SCI: fix fadeout on workarounds 
svn-id: r51728
 2010-08-04 09:15:37 +00:00
Martin Kiewitz
7487b51e87 SCI: not error()ing out on no free channels 
instead we just ignore such channels. I'm not sure how sierra sci behaved in that case, they ignored channels as well, but maybe they removed them from earlier music

svn-id: r51715
 2010-08-03 21:38:26 +00:00
Filippos Karapetis
5ca6b33ba7 SCI: Silenced some sound related warnings. Added an empty function for kDoSound(Restore), called when restoring games 
svn-id: r51661
 2010-08-02 21:20:43 +00:00
Martin Kiewitz
55d7af0766 SCI: kDoSound(mute) behaviour change 
svn-id: r51589
 2010-08-01 19:57:03 +00:00
Alejandro Marzini
fb4086cadb Merged from trunk, from Rev 50841 to HEAD 
svn-id: r51495
 2010-07-30 05:28:09 +00:00
Martin Kiewitz
1c24f2ca8f SCI: midi hold behaviour fixed 
we shouldnt react on hold midi data when no actual hold was called, fixes eq2/amulet problem (bug #3035392)

svn-id: r51482
 2010-07-29 21:12:16 +00:00
Filippos Karapetis
f22821af66 SCI: Added back debug output to sound commands 
svn-id: r51460
 2010-07-29 10:58:01 +00:00
Matthew Hoops
596e10bb42 SCI: Fix PCjr sound 
svn-id: r51369
 2010-07-27 13:31:28 +00:00
Matthew Hoops
7a86204e5c SOUND: Move the Mac snd decoder from SCI to /sound 
For use with Kyra1 Mac instrument samples. T7G Mac and Loom Mac also use this format for their custom instrument samples.

svn-id: r51327
 2010-07-26 18:13:35 +00:00
Filippos Karapetis
1f60595cdc SCI: Cleanup leftovers from the FreeSCI sound code 
svn-id: r51178
 2010-07-22 22:13:28 +00:00
Martin Kiewitz
f771a2bbc7 SCI: fix regression of r50463 
also check delta, because _play_tick does not include delta at that point - fixing sq1 ship takeoff

svn-id: r51067
 2010-07-20 17:28:10 +00:00
Martin Kiewitz
a24de29358 SCI: renaming kDoSound(resume) to resumeAfterRestore 
kDoSound(resumeAfterRestore) is called right after restoring a saved game for sound-sci0 games, we already resume playing music inside restore, so we don't need to implement this at all

svn-id: r51058
 2010-07-20 11:17:33 +00:00
Martin Kiewitz
961079ae19 SCI: disabling kDoSound(StopAll) 
this call can't be right, gets called in kq1 several times and would stop background effects

svn-id: r51039
 2010-07-19 22:11:06 +00:00
Martin Kiewitz
9cb23c8a7b SCI: update sample ticker when paused 
little adjustment of r51017

svn-id: r51018
 2010-07-19 07:37:22 +00:00
Martin Kiewitz
d952e48a57 SCI: change kDoSound(updateCues) for samples 
only set signal when sample was/is playing, fixes qfg2 genie intro

svn-id: r51017
 2010-07-19 07:29:17 +00:00
Matthew Hoops
0e9de72f62 SCI: Rename the Amiga music drivers to AmigaMac to reflect its current purpose. 
svn-id: r51006
 2010-07-18 19:01:35 +00:00
Matthew Hoops
d14635d6b2 SCI: Oops, silence gcc warning. 
svn-id: r51002
 2010-07-18 18:18:11 +00:00
Matthew Hoops
6eedb73dba SCI: Add initial support for SCI0 Mac and SCI1 Amiga/Mac sound. 
SCI1 sound is pretty much done, but envelope support is still not 100% complete. SCI0 Mac sound is not complete, but sounds "ok" for now.

Much thanks to Walter, who did a ton of work on this.

svn-id: r51001
 2010-07-18 18:14:56 +00:00
Martin Kiewitz
3189fe4a32 SCI: change to r50995 - better stop fading when stop is called 
svn-id: r50996
 2010-07-18 16:25:23 +00:00
Martin Kiewitz
aa5a1ddb47 SCI: if game starts fading, stops music and later starts music again don't resume fading - fixes lsl6 music when going in from swimming pool 
svn-id: r50995
 2010-07-18 16:22:16 +00:00
Martin Kiewitz
46b27926b2 SCI: adding obj in kDoSound debug output 
svn-id: r50994
 2010-07-18 16:02:16 +00:00
Johannes Schickel
83e2aa2360 Remove extra ";" in class declarations. 
svn-id: r50955
 2010-07-17 00:05:27 +00:00
Martin Kiewitz
3ceb02f08a SCI: adding signatures for 4-parameter variant of kDoSound(sendMidi), needs to get figured out how this works - fixes signature mismatch in lsl1 
svn-id: r50937
 2010-07-16 13:37:19 +00:00
Martin Kiewitz
539d10ea11 SCI: adding sound version 2.1, to properly add sci2.1 signature for kDoSound(play) 
svn-id: r50878
 2010-07-14 11:29:55 +00:00
Martin Kiewitz
19d4374cbd SCI: erroring out on unsupported soundversion in midiparser 
svn-id: r50849
 2010-07-13 18:15:19 +00:00
Alejandro Marzini
609e08d5db Merged from trunk, from Rev 49499 to HEAD 
svn-id: r50840
 2010-07-13 04:31:15 +00:00
Martin Kiewitz
38d79f60e3 SCI: changing signature for kDoSound(resume) it seems its called right after restoring to resume music - which we do already automatically 
svn-id: r50800
 2010-07-11 11:52:17 +00:00
Martin Kiewitz
ce6a73adf5 SCI: updated debug output from kDoSound 
svn-id: r50781
 2010-07-10 13:19:20 +00:00
Martin Kiewitz
3fe205ba7f SCI: fixing regression of r50414 - we set volume to standard levels inside initCommands since then, so if we set the actual needed volume before calling that it will get ignored - fixes lsl1demo 
svn-id: r50766
 2010-07-09 18:35:46 +00:00
Martin Kiewitz
18d1ab8c70 SCI: move comments and change selector for sci0 sound in kDoSoundPause, also allow pausing everything even for sci1early (qfg2 is using it) 
svn-id: r50765
 2010-07-09 18:11:42 +00:00
Martin Kiewitz
eddd6d0dba SCI: actually all sound-sci0 games used a completely different kDoSoundPause logic, implement it - fixes all sorts of games not pausing when going to restore menu and more 
svn-id: r50760
 2010-07-09 16:05:47 +00:00
Martin Kiewitz
aadf2e9765 SCI: added currently commented-out pauseSound implementation for some sci0 games, allowing integer for that subfunction 
svn-id: r50759
 2010-07-09 14:11:27 +00:00
Martin Kiewitz
b8933d7e8f SCI: removing unneeded mutex locking inside sci0 update cues 
svn-id: r50758
 2010-07-09 13:01:48 +00:00
Martin Kiewitz
b602e7071b SCI: fixing regression of r50755 - fixing kDoSoundSendMidi 
svn-id: r50757
 2010-07-09 12:30:34 +00:00
Martin Kiewitz
ba776fb293 SCI: implemented subsignatures for kDoSound 
svn-id: r50755
 2010-07-09 12:06:41 +00:00
Filippos Karapetis
a1dc56429c SCI: Removed duplicate warning for missing audio samples 
svn-id: r50560
 2010-07-01 17:42:39 +00:00
Filippos Karapetis
bff3e89e48 SCI: Removed the FreeSCI music code 
svn-id: r50532
 2010-06-30 13:49:05 +00:00
Max Horn
b09996cb5c SCI: Rewrap yet more comments 
svn-id: r50505
 2010-06-29 20:50:52 +00:00
Martin Kiewitz
15f9f37d4d SCI: removing ignoring of channel volume change code from r50463, the lsl5 issue was actually caused by the old volume adjust code that was also causing the issues in gk1 
svn-id: r50466
 2010-06-28 22:26:28 +00:00
Martin Kiewitz
668d820afd SCI: its lsl5 sound resource 294, not 274 (changed comment only) 
svn-id: r50465
 2010-06-28 22:14:03 +00:00
Martin Kiewitz
805374ff4e SCI: ignoring set signal on tick 0 directly in parseNextEvent instead of filtering, also now ignoring channel volume changes on tick 0 (fixes lsl5 fading of sound 274, almost at the end), fixing also fading in gk1 and enabling fading in sci32 again 
svn-id: r50463
 2010-06-28 22:06:19 +00:00
Martin Kiewitz
d8e4160f34 SCI: remove clipping of volume inside SciMidiParser::setvolume 
svn-id: r50456
 2010-06-28 20:17:43 +00:00
Martin Kiewitz
22a8b2236e SCI: set volume all the time, fixes volume being 0 after fading in sci0 
svn-id: r50418
 2010-06-28 10:48:09 +00:00