aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse.cpp
AgeCommit message (Collapse)Author
2003-09-08make even more use of Scumm::_musicEngine; added MusicEngine::setMasterVolumeMax Horn
svn-id: r10097
2003-09-07cleanup/refactoringMax Horn
svn-id: r10070
2003-09-07some cleanup; clarified isSoundInUse semantics and the difference between ↵Max Horn
IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus svn-id: r10069
2003-09-07added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 ↵Max Horn
(initial stab, more work to follow) svn-id: r10066
2003-08-29Replaced VER_V* notation for savegames withJamieson Christian
a simple number. So that it's still obvious that the number refers to version, a VER() macro does nothing to the number but makes it obvious what the number is for. This has the exact same effect as the enum that was going to get more and more lengthy as the savegame version evolved. svn-id: r9901
2003-08-23TypoTravis Howell
svn-id: r9827
2003-08-23Added explicit 'ASFX' awareness for clarityJamieson Christian
svn-id: r9826
2003-08-16More corrections to the VAR_MUSIC_TIMERJamieson Christian
computations, mostly to produce the exptected output with AD resources. svn-id: r9730
2003-08-16Corrected timing mechanism for RO music streams.Jamieson Christian
RO streams have built-in timer markers (the unknown 0xA0 mentioned in FR [742249]) that override automated methods of updating VAR_MUSIC_TIMER. Since these timer markers do not seem to be present in AD resources, the old mechanism is used if MD_ADLIB is the current MidiDriver. svn-id: r9720
2003-08-16Fixed transpose/detune computationsJamieson Christian
svn-id: r9715
2003-08-15No need for those bracketsTravis Howell
svn-id: r9694
2003-08-15Don't confuse RO and ROL sound resourcesTravis Howell
svn-id: r9693
2003-08-14Added support for Roland MT-32 music tracksJamieson Christian
in monkeyvga/ega. Tested in monkeyvga, but not in monkeyega yet. There are still wrinkles to work out, but the parser for the new format is in and hooked up. svn-id: r9684
2003-08-12Removed unused stuff.Jamieson Christian
svn-id: r9647
2003-08-10Fix for Bug [785373] SAM: Overlapping music at Bigfoot conventionJamieson Christian
Included the ImDeferredCommand list when checking for sounds that have been queued to play. Also added sound queue processing between execution of exit script and entry script. In the case of this bug, the entry script required that the iMuse state be fully up to date, including last-moment changes from the previous exit script. svn-id: r9622
2003-08-07In fact, Nicolas, this is no more needed :)Chris Apers
svn-id: r9584
2003-08-06Remove old tweak that can break the music when restoring now ... Chris, you ↵Nicolas Bacca
should check it too :p svn-id: r9582
2003-08-06Upgraded IMuse::doCommand() to support more than 8 parameters.Jamieson Christian
V6 scripts can specify up to 16 parameters to be passed to doCommand(). In most cases 8 or fewer parameters were used, but occasional uses of 9 or 10 parameters resulted in incorrect iMuse behavior due to lost doCommand() data. ImTrigger was also upgraded to support 8 parameters instead of 4, since the incorrect behavior that was observed involved the use of triggered commands that required more than 4 parameters. Since ImTrigger data is not currently being saved (which is bad), we do not at this time have to go to another savegame format to support the additional ImTrigger data (which is good). This fix corrects a problem in the Tunnel of Love. When the "execution scene" music finishes and the hidden door opens, the Tunnel of Love music is supposed to start up again. In ScummVM, it never would, do to the loss of parameters for a trigger-based "Parameter Fade" command. A bit of miscellaneous cleanup has also been made. svn-id: r9579
2003-08-06Fix for Bug [780918] SAM: Music stops at BumpusvilleJamieson Christian
Tweaked handling of ImSetTrigger when the triggered command starts a new song. If the song to be started is already playing, we stop it (in preparation for a restart) ONLY if the song containing the command trigger is actually playing. Otherwise the restart is likely to never occur (as is the case with the Bumpusville mansion interior music). svn-id: r9576
2003-08-05getting rid of g_mixer; removing lots of whitespaceMax Horn
svn-id: r9527
2003-08-01indention fix (so the code adheres to our indention rules)Max Horn
svn-id: r9384
2003-07-15replaced SCUMMVM_VERSION/SCUMMVM_CVS by ↵Max Horn
gScummVMVersion/gScummVMBuildDate/gScummVMFullVersion; made engine.o depend on all other .o files, so that the build date in it is always up-to-date svn-id: r9032
2003-07-07Fix for bug [761637] FOA: Music problems in endgame/credits.Jamieson Christian
Revision to the handle_maker() fix for bug #733401, since that didn't seem to take care of the problem. This fix chomps marker queue entries if it finds a matching marker not at the head of the queue. This might cause inappropriate behavior elsewhere; regression testing is advised. svn-id: r8831
2003-06-18Fix for bug [756555] ALL: With '-ewindows' notes don't stop at quitJamieson Christian
and bug [755176] SIMON2: Hanging notes More cleanup of the thread issues associated with iMuse and MidiParser shutdown. Untested. svn-id: r8546
2003-06-17I will add a wrapper for that (currently NULL driver)Chris Apers
svn-id: r8526
2003-06-15moved GameId declaration to common/engine.h (more logical); moved scumm ↵Max Horn
specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies) svn-id: r8496
2003-06-14Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; ↵Max Horn
augmented by some more changes of mine svn-id: r8482
2003-06-12This was missingChris Apers
svn-id: r8444
2003-06-01Fixed MT-32 welcome messageJamieson Christian
svn-id: r8225
2003-06-01Some last SysEx cleanup.Jamieson Christian
svn-id: r8223
2003-06-01Teaking the MT-32 welcome message.Jamieson Christian
svn-id: r8207
2003-06-01Welcome message for MT-32 panels.Jamieson Christian
More for SysEx tests than anything. svn-id: r8202
2003-05-28Treat AMI music resoucres in monkey2 for Amiga as ROL for now, to allow ↵Travis Howell
music playback svn-id: r8046
2003-05-26Fixed a MORONIC oob memory write. Now back to remedial C++ classJamieson Christian
svn-id: r8019
2003-05-26Fixes possible crashes during music shutdownJamieson Christian
svn-id: r8009
2003-05-24er oopsJonathan Gray
svn-id: r7914
2003-05-24Various iMuse cleanupJamieson Christian
svn-id: r7900
2003-05-24returning 1 instead of the id is the correct behaviour I believe, but the ↵Jonathan Gray
scripts check for a 0 result so either will work. I'm just picky :) svn-id: r7871
2003-05-23Added XMIDI support to IMuse. IMuse now plays music from Humongous games.Jamieson Christian
Added some IMuse property options to support some assumptions that seem to be made by Humongous games. This is still preliminary. It will play music, and it will switch between songs. But I don't know if it's switching to the right song at the right time. svn-id: r7869
2003-05-23Revamped iMuse and Player classes. Player now uses MidiParser to parse its ↵Jamieson Christian
data, which will allow it to parse other MIDI formats. To receive parsed data, Player now derives from MidiDriver to act as a "fake MIDI driver". Miscellaneous upgrades and fixes to MidiParser, including the Smart Jump (which could not be tested before iMuse started making use of the MidiParser). *** THIS IS A BIG UPGRADE! EXTENSIVE REGRESSION TESTING IS NEEDED! *** This has been tested through the intros and a number of other scenes from MI2, FOA and S&M. NOTE! This upgrade introduces savegame format version V19. Earlier version savegames will load, but the music will simply start over from the beginning. Only V19 and later games will properly restore the position of the music! Don't say you weren't warned.... svn-id: r7849
2003-05-22Separated IMuse Player into its own fileJamieson Christian
svn-id: r7832
2003-05-21Added ParameterFader into savegame format.Jamieson Christian
Savegames are now version 17 (VER_V17). svn-id: r7808
2003-05-21Replaced VolumeFader with more generic ParameterFaderJamieson Christian
svn-id: r7803
2003-05-21Integrated VolumeFader into each PlayerJamieson Christian
svn-id: r7801
2003-05-21many pedantic warning fixes (and some actual potential buglets fixed, too)Max Horn
svn-id: r7795
2003-05-20More thorough parameterFade and deferredCommand implementation.Jamieson Christian
Lot of guesswork. parameterFade STILL NEEDS A LOT OF WORK! These additions at least partially correct the music behavior in the Tunnel of Love when shorting the controls. svn-id: r7704
2003-05-19Updated doCommand(14) with new information.Jamieson Christian
Fixed music bug introduced with fix [712042]. Improved iMuse debug output. svn-id: r7703
2003-05-19Proof of concept for XMIDI parser in Humongous games.Jamieson Christian
You must still uncomment the VAR_SOUNDPARAM setting for this to work...? svn-id: r7670
2003-05-17Fixed program change msgs being sent under AdlibJamieson Christian
svn-id: r7615
2003-05-17Added imuse_multimidi to debuggerJamieson Christian
svn-id: r7614