Commit Graph

43 Commits

Author SHA1 Message Date
Filippos Karapetis
601494cad4 SCI: implemented reverb handling and related functionality
svn-id: r54478
2010-11-25 16:09: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
642d15e43f SCI: Added a getReverb() accessor to the SciMusic class
svn-id: r54456
2010-11-24 14:15:46 +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
Martin Kiewitz
2bf82a8354 SCI: fix regression of r52569
fade in/out of samples

svn-id: r52604
2010-09-06 18:23:03 +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
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
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
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
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
Filippos Karapetis
bff3e89e48 SCI: Removed the FreeSCI music code
svn-id: r50532
2010-06-30 13:49:05 +00:00
Martin Kiewitz
e4153044d4 SCI: reverting r50315 - had the deadlock just again...
svn-id: r50316
2010-06-26 11:48:42 +00:00
Martin Kiewitz
be75870100 SCI: fixing deadlock possiblity on samples (sq3 deadlocked on door opening/where am i on me)
svn-id: r50315
2010-06-26 11:43:14 +00:00
Martin Kiewitz
3c4bfa6cac SCI: removing unneeded capacity uint from r50143
svn-id: r50147
2010-06-22 15:45:59 +00:00
Martin Kiewitz
a82ca9de5c SCI: change midi queue to Common::Array and make it resize itself if needed instead of error()
svn-id: r50143
2010-06-22 15:05:09 +00:00
Martin Kiewitz
1041067a0c SCI: instead of queueing inside midiparser, we are queueing now globally in SciMusic, also some little cleanup
svn-id: r50130
2010-06-21 22:07:03 +00:00
Martin Kiewitz
ed50ecd62d SCI: make channel remapping stop using channel 0 for mt32 - fixes playback accordingly (like lsl1 at the start)
svn-id: r50056
2010-06-19 19:06:58 +00:00
Martin Kiewitz
ab4e02422c SCI: free channels for channel remapping on stop and pause, instead of dispose - fixes qfg3 demo going out of channels
svn-id: r50054
2010-06-19 17:43:13 +00:00
Martin Kiewitz
423029c027 SCI: implemented channel muting for sci1, finally fixes lsl5 paino scene with patti
svn-id: r49926
2010-06-17 11:54:54 +00:00
Martin Kiewitz
af65de6e1a SCI: implement channel remapping for SCI1
svn-id: r49905
2010-06-16 21:02:58 +00:00
Johannes Schickel
02ed1a684a - Made some methods const
- Prefer const_iterator over iterator in SciMusic::findUsedChannels

svn-id: r49417
2010-06-03 23:07:53 +00:00
Filippos Karapetis
8dd7537a55 A first attempt at channel remapping (currently disabled)
svn-id: r49416
2010-06-03 22:13:23 +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
Martin Kiewitz
2624b72513 SCI: fix assert in sound code when fadeout is done (lsl1 bug #2970301)
svn-id: r48271
2010-03-16 14:13:52 +00:00
Max Horn
ee1110a114 SCI: Reduce header interdependencies
svn-id: r48086
2010-02-17 23:38:43 +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
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +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
Walter van Niftrik
208dbf1d9a SCI: Renamed softseq/ to drivers/
svn-id: r47418
2010-01-21 16:27:29 +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
Walter van Niftrik
7058e0fc9c SCI: Cleanup
svn-id: r47327
2010-01-16 19:14:24 +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
Walter van Niftrik
1e3679b4b6 SCI: Cleanup
svn-id: r47194
2010-01-09 03:08:51 +00:00
Johannes Schickel
20a43c638c Premiliary adaption of SCI to use LoopingAudioStream. (This could really need some cleanup...)
svn-id: r47136
2010-01-07 17:45:17 +00:00
Johannes Schickel
45b6f84ba7 Some formatting fixes.
svn-id: r47135
2010-01-07 17:28:15 +00:00
Filippos Karapetis
3b8512b104 Cleanup, fixed fading of digital sound effects
svn-id: r47023
2010-01-05 10:28:09 +00:00
Filippos Karapetis
84cd8d2dc7 Renamed /gui to /graphics and /sfx to /sound, to better illustrate their purpose
svn-id: r47007
2010-01-05 01:22:16 +00:00