aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound/music.cpp
AgeCommit message (Collapse)Author
2010-07-18SCI: Rename the Amiga music drivers to AmigaMac to reflect its current purpose.Matthew Hoops
svn-id: r51006
2010-07-18SCI: Add initial support for SCI0 Mac and SCI1 Amiga/Mac sound.Matthew Hoops
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-18SCI: change to r50995 - better stop fading when stop is calledMartin Kiewitz
svn-id: r50996
2010-07-18SCI: if game starts fading, stops music and later starts music again don't ↵Martin Kiewitz
resume fading - fixes lsl6 music when going in from swimming pool svn-id: r50995
2010-07-09SCI: fixing regression of r50414 - we set volume to standard levels inside ↵Martin Kiewitz
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-09SCI: added currently commented-out pauseSound implementation for some sci0 ↵Martin Kiewitz
games, allowing integer for that subfunction svn-id: r50759
2010-06-29SCI: Rewrap yet more commentsMax Horn
svn-id: r50505
2010-06-28SCI: ignoring set signal on tick 0 directly in parseNextEvent instead of ↵Martin Kiewitz
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-27SCI: tell midiparser that he lost ownership of channels in case we take them ↵Martin Kiewitz
away svn-id: r50405
2010-06-26SCI: dont call midiparser->stop() if paused sound gets stoppedMartin Kiewitz
svn-id: r50310
2010-06-25SCI: set MDT_PREFER_GM instead od MDT_PREFER_MT32Florian Kagerer
svn-id: r50289
2010-06-25AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either ↵Florian Kagerer
select MDT_PREFER_MT32 or MDT_PREFER_GM svn-id: r50288
2010-06-22SCI: removing unneeded capacity uint from r50143Martin Kiewitz
svn-id: r50147
2010-06-22SCI: change midi queue to Common::Array and make it resize itself if needed ↵Martin Kiewitz
instead of error() svn-id: r50143
2010-06-21SCI: fades already send out commands directlyMartin Kiewitz
svn-id: r50131
2010-06-21SCI: instead of queueing inside midiparser, we are queueing now globally in ↵Martin Kiewitz
SciMusic, also some little cleanup svn-id: r50130
2010-06-21Patch #1956501: "GUI/LAUNCHER: Midi device selection"Max Horn
svn-id: r50128
2010-06-20SCI: storing all manual midi commands now and actually sending them to ↵Martin Kiewitz
driver during onTimer() - fixes mt32 emulation crashing during lsl5 piano scene svn-id: r50073
2010-06-19SCI: locking _mutex inside SciMusic::sendMidiCommand(MusicEntry *pSnd, ↵Martin Kiewitz
uint32 cmd) svn-id: r50065
2010-06-19SCI: fixing another uninitialized variable usage issue - also limiting reset ↵Martin Kiewitz
velocity to used channels only, same is true for setting voice count svn-id: r50062
2010-06-19SCI: stopping scripts from sending to unused channels manually (fixes sq1vga)Martin Kiewitz
svn-id: r50060
2010-06-19SCI: make channel remapping stop using channel 0 for mt32 - fixes playback ↵Martin Kiewitz
accordingly (like lsl1 at the start) svn-id: r50056
2010-06-19SCI: free channels for channel remapping on stop and pause, instead of ↵Martin Kiewitz
dispose - fixes qfg3 demo going out of channels svn-id: r50054
2010-06-17Strict mode: Changed several warnings due to logic bugs into errors. If an ↵Filippos Karapetis
error pops up from these ones, please add the game where it occurred and the steps to reproduce the error before turning it into a warning svn-id: r49973
2010-06-17SCI: implemented channel muting for sci1, finally fixes lsl5 paino scene ↵Martin Kiewitz
with patti svn-id: r49926
2010-06-17SCI: fixes regressions of r49905 (thx to digitall) - first we now find out ↵Martin Kiewitz
what channels are used in sci0 as well, we are doing straight mapping for sci0 though - this fixes music in sci0 games, also fixing crash in sq1vga because of using null pMidiParser svn-id: r49922
2010-06-16SCI: dont seek during init of music but on play, fixes assert when restoring ↵Martin Kiewitz
saves caused by r49905 - because channel remapping isn't done at that point svn-id: r49907
2010-06-16SCI: implement channel remapping for SCI1Martin Kiewitz
svn-id: r49905
2010-06-09SCI: fix multiple playing of the same sound in a row (without using looping) ↵Martin Kiewitz
- thx to LordHoto for helping me finding this one out - fixes pharkas right at the start (hammering only played once) svn-id: r49538
2010-06-04Some more work on channel remapping: Moved the remapping code to the music ↵Filippos Karapetis
loading code (still disabled) svn-id: r49430
2010-06-03Replace two uses of ::qsort by Common::sort.Johannes Schickel
svn-id: r49418
2010-06-03- Made some methods constJohannes Schickel
- Prefer const_iterator over iterator in SciMusic::findUsedChannels svn-id: r49417
2010-06-03A first attempt at channel remapping (currently disabled)Filippos Karapetis
svn-id: r49416
2010-05-27SCI: disabling music fading again, but only for sci32 - drivers seem to have ↵Martin Kiewitz
issues when fading in on gk1/sierra logo svn-id: r49271
2010-05-27SCI: enabling fading again, issues in pharkas and gk1demo are actually ↵Martin Kiewitz
"normal" - maybe we should add some hack workaround, but the delay in ssci was just slow resource loading svn-id: r49269
2010-05-27SCI: fixing resuming samples - fixes hang when ship is flying away happening ↵Martin Kiewitz
when you entered menu during that sequence svn-id: r49261
2010-05-25SCI: dont lock mutex in pauseAll(), isn't needed anyway - fixes deadlock in sq4Martin Kiewitz
svn-id: r49214
2010-05-24SCI: only remove isQueued status for sound sci0Martin Kiewitz
svn-id: r49187
2010-05-24SCI: remove isQueued status when sound gets stopped - fixes iceman resuming ↵Martin Kiewitz
music when entering hotel complex (with bar) right at the start svn-id: r49186
2010-05-23SCI: use priority when queuing up music in sound sci0 -> fixes lsl3 jingle ↵Martin Kiewitz
issues svn-id: r49156
2010-05-20SCI: fix regression of r49109 - only queue up midi soundsMartin Kiewitz
svn-id: r49114
2010-05-19SCI: sound code now queues up music in sci0, wip-code: not reacting on ↵Martin Kiewitz
priority yet - fixes iceman room 14 svn-id: r49109
2010-05-19SCI: cleanup soundcode - number renamed to resourceId, prio renamed to priorityMartin Kiewitz
svn-id: r49098
2010-04-12AUDIO: Rename Mixer::playInputStream to playStreamMax Horn
svn-id: r48637
2010-02-13SCI: Add global g_sci pointer to the active SciEngine instanceMax Horn
svn-id: r48046
2010-02-06Add detection entry for KQ5 Mac. Also, make Mac and Amiga SCI1_EGA+ games ↵Matthew Hoops
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-03Fixed the hang with the new music code after the copy protection in Island ↵Filippos Karapetis
of Dr. Brain svn-id: r47870
2010-02-02Use MIDI by default for SCI32. Fixes the GK2 demo.Matthew Hoops
svn-id: r47819
2010-02-02SCI: Abort when sound driver fails to open.Walter van Niftrik
svn-id: r47807
2010-01-30Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.Johannes Schickel
svn-id: r47716