aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse/imuse_player.cpp
AgeCommit message (Collapse)Author
2014-02-18SCUMM: Make GPL headers consistent in themselves.Johannes Schickel
2012-09-20SCUMM: Implement support for Monkey Island 2 Mac music.Johannes Schickel
This is a initial RE of the audio output Monkey Island 2 Mac uses. Support for special sound effects is not in there yet.
2012-09-20SCUMM: Extend comment about SysEx manufacturer 0x97.Johannes Schickel
2011-11-04SCUMM: Revert "Removed a duplicate variable assignment"Willem Jan Palenstijn
This reverts commit 747ebffd17eb64423fd8fb321f9d803ec31105f4, and adds a FIXME.
2011-11-04SCUMM: Removed a duplicate variable assignmentFilippos Karapetis
2011-07-11SCUMM: Adapt iMuse code formatting to our standards.Johannes Schickel
2011-07-10SCUMM: Only try to load MT-32 instruments when we have a MIDI output in iMuse.Johannes Schickel
This fixes the melody in Indy4's intro with the PC Speaker output.
2011-06-20ALL: Remove trailing whitespacesMax Horn
This tries to make our code a bit more compliant with our code formatting conventions. For future use, this is the command I used: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-05-29SCUMM: implement some missing (very low relevance) imuse codeathrxx
1) Don't skip transpose setting in sysex command 0. There are only a few sounds where this setting is used (mainly sfx). 2) Make MI2 and INDY4 read certain player start parameters from the sound resource. The start parameters usually match our default parameters (exception: e.g. LeChuck's Fortress). The use of these parameters has been dropped in DOTT (they use default parameters like we do).
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2011-03-23AUDIO: Change several fake MidiDrivers to MidiDriver_BASE subclassesMax Horn
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-23SCUMM: Remove unused iMuse MIDI 'passthrough' codeMax Horn
2011-02-09AUDIO: Rename sound/ dir to audio/Max Horn
svn-id: r55850
2010-09-18SCUMM: minor cleanupFlorian Kagerer
svn-id: r52792
2010-08-18SCUMM/FM-TOWNS: start rewriting audio codeFlorian Kagerer
- Start rewriting audio code for FM-TOWNS versions of Loom, Indy3 and Monkey Island 1 using the recently added code in towns_audio.cpp (Zak should work the same way, but I can't test, since I don't own that one). - All sound types (pcm, euphony and cd audio) now support volume and balance control (e.g. try walking into/out of the kitchen and opening/closing the door in the Scumm Bar in Monkey Island 1 or walking into/out of the circus tent). - Pcm sounds now support proper loop start/end and note offsets (e.g. try out the hammer sound in the forge in LOOM for example). - some other minor improvements - The FM-Towns versions of Indy 4 and Monkey Island 2 are not affected. I don't have Monkey Island 2, but I presume that it will work like Indy 4. Adding support for these will be a separate task, since they work quite differently. svn-id: r52198
2010-01-12Rename all "Adlib" uses to "AdLib" to match the real name of the sound card ↵Johannes Schickel
/ 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-03Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is nullTorbjörn Andersson
before freeing it, which isn't necessary. svn-id: r46941
2009-11-22Add patch #2876221 - FBEAR: Fix for MIDI piano notes (DOS version), with ↵Travis Howell
minor change. svn-id: r46081
2009-05-31The error() and warning() functions add ! and newline automatically. (I didn'tTorbjörn Andersson
look at debug() and debugC(), since I'm really bored with this now. :-) svn-id: r41061
2007-09-19Merged common/stdafx.h into common/scummsys.h. All referencing files have ↵Nicola Mettifogo
been updated. svn-id: r28966
2007-05-30Updated legal headers in source files, based on what Pidgin (the IM client ↵Max Horn
formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots svn-id: r27024
2007-02-16Unified how we deal with (and how we generate) MIDI sysex messages -- in ↵Max Horn
particular, we now always do so w/o framing the message (documented this with a Doxygen comment in the MidiDriver class) svn-id: r25630
2006-11-12Replaced cryptic error() with an assertion.Torbjörn Andersson
svn-id: r24681
2006-11-12WhitespaceTorbjörn Andersson
svn-id: r24680
2006-09-23Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle ↵Max Horn
the linker dependency graph). Porters will have to update project files svn-id: r23974
2006-05-15Ignore unknown SysEx manufacturer IDs, rather than erroring on them. This doesTorbjörn Andersson
NOT fix bug #1481383, even if that's where I heard about this problem. svn-id: r22479
2006-03-14Remove unused vars, to prevent compiler warningsTravis Howell
svn-id: r21279
2006-03-12IMuse SysEx processing now handled by client-specified callbacks. This ↵Jamieson Christian
removes all game-specific references from the Player class. Bloodshed Dev-C++ project file updated. svn-id: r21241
2006-03-09Implemented SysEx command 1 for non-S&M SCUMM games, per the latest comment ↵Jamieson Christian
on Bug 1088045. svn-id: r21156
2006-03-05Restructured IMuse and IMuseInternal.Jamieson Christian
* IMuse is no longer a concurrency front-end. * IMuseInternal now derives from IMuse. * Common::StackLock used to protect thread-sensitive interface methods (same as IMuseDigital). * clear_queue() included in stopAllSounds() so it can be removed from the public interface. * Game ID now specified at init using property(). * Timer callbacks receive a struct containing IMuseInternal and MidiDriver refs, instead of just the latter. * OSystem pointer from init is now cached and used instead of global. All references to the g_system and g_scumm globals are now gone. BOOYAH! Tested with MI2, DOTT and S&M, under Windows, in Native MIDI, Adlib, and Mixed modes. No regressions or concurrency issues observed. Manifestations of the latter are the biggest concern at this point. svn-id: r21104
2006-03-03Partial fix for Bug 1088045. Additional configuration of Part parameters in ↵Jamieson Christian
response to iMuse SysEx command 0. Addresses Parts 2, 3 and 4 of the bug. (Part 4 not yet verified against referenced bug manifestation; awaiting testcase savegame.) svn-id: r21039
2006-02-27SysEx data now passed around with const pointers. Permits simplification of ↵Jamieson Christian
some SysEx client code. Testing on Windows. Developers on other platforms, please verify integrity of music handling in your respective MidiDrivers. svn-id: r20952
2006-02-26Removed deprecated IMUSE_DEBUG #define in favor of debugC calls using the ↵Jamieson Christian
runtime-selectable DEBUG_IMUSE category. svn-id: r20950
2006-02-20Moved iMUSE code to the new directory engines/scumm/imuse/Max Horn
svn-id: r20801
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:00:48 +0000