Commit graph

207 commits

Author SHA1 Message Date
Martin Kiewitz
d2513c9cc2 SCI: enabling fading again, issues in pharkas and gk1demo are actually "normal" - maybe we should add some hack workaround, but the delay in ssci was just slow resource loading
svn-id: r49269
2010-05-27 20:53:37 +00:00
Martin Kiewitz
cfed70df07 SCI: fixing resuming samples - fixes hang when ship is flying away happening when you entered menu during that sequence
svn-id: r49261
2010-05-27 11:26:37 +00:00
Martin Kiewitz
849cfe4f0e SCI: dont lock mutex in pauseAll(), isn't needed anyway - fixes deadlock in sq4
svn-id: r49214
2010-05-25 15:38:30 +00:00
Martin Kiewitz
b49efb67f6 SCI: only remove isQueued status for sound sci0
svn-id: r49187
2010-05-24 14:47:43 +00:00
Martin Kiewitz
350e3d7c05 SCI: remove isQueued status when sound gets stopped - fixes iceman resuming music when entering hotel complex (with bar) right at the start
svn-id: r49186
2010-05-24 13:50:19 +00:00
Martin Kiewitz
aa4ae667a9 SCI: use priority when queuing up music in sound sci0 -> fixes lsl3 jingle issues
svn-id: r49156
2010-05-23 12:22:23 +00:00
Martin Kiewitz
5f8778395a SCI: fix regression of r49109 - only queue up midi sounds
svn-id: r49114
2010-05-20 06:11:46 +00:00
Martin Kiewitz
264fde962b SCI: sound code now queues up music in sci0, wip-code: not reacting on priority yet - fixes iceman room 14
svn-id: r49109
2010-05-19 21:10:43 +00:00
Martin Kiewitz
9b4f352870 SCI: cleanup soundcode - number renamed to resourceId, prio renamed to priority
svn-id: r49098
2010-05-19 14:19:16 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Max Horn
ac4d325e0d SCI: Add global g_sci pointer to the active SciEngine instance
svn-id: r48046
2010-02-13 17:42:49 +00:00
Matthew Hoops
f1f277d56d Add detection entry for KQ5 Mac. Also, make Mac and Amiga SCI1_EGA+ games default to MIDI as we don't (yet) support their patches. KQ5 Mac will start and go until the main menu.
svn-id: r47924
2010-02-06 01:38:00 +00:00
Filippos Karapetis
ee66af41a2 Fixed the hang with the new music code after the copy protection in Island of Dr. Brain
svn-id: r47870
2010-02-03 23:02:37 +00:00
Matthew Hoops
35d2f48fc1 Use MIDI by default for SCI32. Fixes the GK2 demo.
svn-id: r47819
2010-02-02 19:39:02 +00:00
Walter van Niftrik
3493958423 SCI: Abort when sound driver fails to open.
svn-id: r47807
2010-02-02 03:23:48 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +00:00
Walter van Niftrik
ce5f91c785 SCI: Do not prefer MIDI drivers, as MT-32 to GM mapping is still lacking.
svn-id: r47711
2010-01-30 13:35:41 +00:00
Filippos Karapetis
31319de828 Always prefer MIDI drivers over the other ones
svn-id: r47677
2010-01-29 18:30:19 +00:00
Filippos Karapetis
6fd8f7c015 Always try and load the associated digital track if the requested MIDI track couldn't be found
svn-id: r47631
2010-01-28 08:23:40 +00:00
Filippos Karapetis
76ff84a62f Fixed the demo version of Longbow - speech was not played at all with the new sound code
svn-id: r47610
2010-01-27 21:11:24 +00:00
Filippos Karapetis
1ddcd178c2 The two unknown fields point to the beginning and end of the sound sample
svn-id: r47601
2010-01-27 16:04:46 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
2010-01-26 22:48:45 +00:00
Walter van Niftrik
9861b04b93 SCI: Add driver for Yamaha FB-01. Cleanup.
svn-id: r47571
2010-01-26 19:25:33 +00:00
Filippos Karapetis
31a3c98fa2 Removed the unnecessary fadeVolume variable
svn-id: r47566
2010-01-26 13:06:21 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +00:00
Filippos Karapetis
27b37ed97e Amiga SCI1 games had signed sound data. Fixes PQ3 Amiga
svn-id: r47477
2010-01-23 15:01:17 +00:00
Filippos Karapetis
d6e0276119 Added song manipulation debug commands: songinfo, startsound, togglesound and stopallsounds. is_sample now works with the new sound code
svn-id: r47475
2010-01-23 14:39:03 +00:00
Filippos Karapetis
47c97f4a60 - The reverb value is now obtained from the music driver
- Implemented kSetReverb (0x50) and kResetOnPause (0x4C)

svn-id: r47433
2010-01-22 12:26:12 +00:00
Filippos Karapetis
93a8b469c0 - Fixed pausing of all sounds in the playlist
- Sounds are now paused correctly when opening/closing the debug console
- Some cleanup

svn-id: r47422
2010-01-21 21:28:32 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Filippos Karapetis
f0e6c3f142 - Removed the resetDriver() hack. The reason why notes stopped being played sometimes was actually mixer->stopAll(), which stopped the music stream as well (spotted by waltervn)
- Hooked setReverb() to actually set music reverb

svn-id: r47392
2010-01-19 20:02:17 +00:00
Filippos Karapetis
54638f005b Delete the inner music driver when MidiPlayer_AdLib() is destroyed, not in close(), as MidiPlayer_AdLib() is closed and reopened inside SciMusic::resetDriver(). Fixes savegame loading and resetting the game
svn-id: r47384
2010-01-19 17:34:24 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn
69be747621 Move raw audio streams to new header sound/raw.h
svn-id: r47368
2010-01-19 00:54:06 +00:00
Max Horn
349fcd1d71 Rename 'Linear' audio streams to 'raw'
svn-id: r47367
2010-01-19 00:52:41 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +00:00
Walter van Niftrik
7058e0fc9c SCI: Cleanup
svn-id: r47327
2010-01-16 19:14:24 +00:00
Walter van Niftrik
6caf8e3f89 SCI: Fix rhythm channel handling in SCI0
svn-id: r47326
2010-01-16 19:11:37 +00:00
Filippos Karapetis
5437bf9cda Disabled code which causes crashes/and or oddities with MIDI in later SCI games, from rev #47321
svn-id: r47324
2010-01-16 16:54:54 +00:00
Walter van Niftrik
220c118a8f SCI: Add support for earlier MT-32 patch format
svn-id: r47321
2010-01-16 16:06:41 +00:00
Walter van Niftrik
373700f00a SCI: Add MIDI support. Currently only the later MT-32/GM patch type works.
Support for the earlier MT-32 patch format will be added in the near future.

svn-id: r47297
2010-01-14 01:44:11 +00:00
Filippos Karapetis
24d1db6155 The pitch wheel is now properly reset when a song is unloaded
svn-id: r47290
2010-01-13 14:46:45 +00:00
Johannes Schickel
0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
2010-01-12 21:07:56 +00:00
Walter van Niftrik
1a570df5dc SCI: Handle master volume inside music drivers
svn-id: r47261
2010-01-12 00:51:37 +00:00
Filippos Karapetis
70694f9858 New music code: Implemented sound stopping after fading, and disabled MIDI sound volume fading, till we figure out what's wrong with fading in the Sierra logo screen in GK1
svn-id: r47252
2010-01-11 14:26:13 +00:00
Johannes Schickel
6ca0570fe3 - Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream.
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.

svn-id: r47226
2010-01-10 15:20:14 +00:00
Walter van Niftrik
1e3679b4b6 SCI: Cleanup
svn-id: r47194
2010-01-09 03:08:51 +00:00
Walter van Niftrik
d1d4091281 SCI: Cleanup
svn-id: r47191
2010-01-09 02:16:17 +00:00
Walter van Niftrik
6f78bc40dd SCI: Move music device IDs to drivers.
svn-id: r47190
2010-01-09 02:14:12 +00:00