aboutsummaryrefslogtreecommitdiff
path: root/sound/mididrv.cpp
AgeCommit message (Collapse)Author
2010-10-24GUI/LAUNCHER: improved MIDI device selection (also #3088438)Florian Kagerer
This fixes an issue with the <default> setting in the GM and MT-32 device tabs that has caused some complaints and discussions on -devel. It might also be what bug #3088438 is about. With a <default> setting ScummVM would just use the first available MIDI device (even if this is the not really well working MT-32 emulator). This <default> setting was also indeed set by default - making it even more annoying. Now there is a new setting for both the GM and MT-32 device tabs ("Don't use GM/MT-32 music"). This will cause MIDI device detection to be skipped and the best of the other devices (Adlib etc.) to be used. This new setting is used as default. So users who haven't specified anything will get Adlib, PC Speaker etc. (if supported by the engine) even if the engine prefers Midi. There is a new "Use first available device" setting which will have the same effect as the "<default>" setting we had before. svn-id: r53771
2010-10-12JANITORAL: Clean trailing whitespaces.Jordi Vilalta Prat
svn-id: r53160
2010-10-10MIDIDRV: Prefer PCjr over PC SpeakerTorbjörn Andersson
If I understand this correctly, if the player's desired music driver isn't supported (e.g. if you have MIDI as default, and haven't said anything specifically for Maniac Mansion), it tries to pick the "best" supported music driver instead. In this case, check if PCjr is supported before picking PC Speaker. svn-id: r53105
2010-09-17SOUND: Properly add CMS as plugin.Johannes Schickel
svn-id: r52779
2010-09-15MIDI: Send a reset MIDI device signal on startup.Johannes Schickel
This is currently done in the engine code. I adapted AGI, AGOS, DRACI, GROOVIE, LURE, MADE, QUEEN, SAGA, SKY, TINSEL and TOUCHE to send a reset device on startup. The sound output still works fine (started up a game from every engine), so this should hopefully not introduce any regressions. As far as I can tell it seems that SCUMM does send a proper device reset, so I did not touch it. KYRA only sends a proper reset for MT-32 currently. I am not sure about SCI though. This fixes bug #3066826 "SIMON: MIDI notes off when using RTL after SCI". svn-id: r52736
2010-08-11Use tabs instead of spaces for indentation.Eugene Sandulenko
svn-id: r51997
2010-08-11GUI: add music devices for c64, amiga and apple II gsFlorian Kagerer
These devices are not able to create appropriate drivers. The only purpose for now is having proper gui options and flags and music types for the device detector. The corresponding GUIO flags for the new devices have been added, too. svn-id: r51995
2010-07-26MIDI: Make it possible to specify MIDI device by music driver idTorbjörn Andersson
If getDeviceHandle() gets a music driver id it will pick the driver's first device, which should hopefully be a sensible default. E.g. it's once again possible to use "-e alsa" rather than the much more cumbersome "-e 'alsa_Emu10k1 WaveTable'". svn-id: r51297
2010-07-26Janitorial: Fix punctuation in error/warningTorbjörn Andersson
svn-id: r51296
2010-07-21Strip trailing whitespaces in our common code base.Johannes Schickel
svn-id: r51094
2010-06-29AUDIO: fixed bug when device was set to default and only MDT_MIDI flags ↵Florian Kagerer
were passed to detectDevice() svn-id: r50510
2010-06-29Return "0" in case no device was detected in MidiDriver::detectDevice.Johannes Schickel
svn-id: r50473
2010-06-29Yet another slight fix for the fallback detection.Johannes Schickel
Before in case MDT_PREFER_MT32 nor MDT_PREFER_GM was specified the code used "auto" as key name for ConfMan.get, instead of passing "auto" directly to getDeviceHandle. svn-id: r50472
2010-06-29Fix fallback detection code in MidiDriver::detectDevice.Johannes Schickel
It formerly only used the global "mt32_device" and "gm_device" values, but we also allow game specific values, thus we take that into account now. Also formerly the the check for the first available MT32/GM device only used the device handle of the mt32_device/gm_device instead of the list of devices it iterates over. Fixed that too. Last but not least that whole detection code looks strange to me, it seems we only use mt32_device and gm_device for fallback detection, at least when the music_driver matches it will always be used. So I wonder why we have those at all? svn-id: r50471
2010-06-29Fix detection of invalid music drivers specified via command line.Johannes Schickel
Along with it documented that "0" is a special device handle for the invalid device. Now getDeviceHandle returns 0, when the identified device could not be found. Also getMusicType now returns MT_INVALID (newly introduced), when a non existing device was specified. svn-id: r50470
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-25AUDIO: some fixes in the audio device code (no sound option, new GUIO flags)Florian Kagerer
svn-id: r50281
2010-06-22LAUNCHER: hopefully fixed music driver selection via command lineFlorian Kagerer
svn-id: r50158
2010-06-22Remove some trailing tabs.Johannes Schickel
svn-id: r50152
2010-06-22GUI/LAUNCHER: This should fix the regression concerning pc speaker / pcjr ↵Florian Kagerer
support caused by patch #1956501 svn-id: r50145
2010-06-21Patch #1956501: "GUI/LAUNCHER: Midi device selection"Max Horn
svn-id: r50128
2010-06-15GUI: Implement MIDI drivers as GUI options.Eugene Sandulenko
Proper version of patch #2988641: "GSoC: Select drivers in GUI based on output types". So far only SCUMM engine supports this feature. svn-id: r49783
2010-06-15Sound: add PCJR as a pseudodriver.Eugene Sandulenko
Since AGI distinguishes between PCSPK and PCJR/Tandy, make it as a pseudodriver. svn-id: r49782
2010-06-15Implement translation support for ScummVM GUI.Eugene Sandulenko
Based on patch #2903830: "Updated Translation Prototype" by alexbevi which in turn is based on patch #1739965 by jvprat. Currently it builds all translations right into ScummVM. Once the feature will be accepted more widely, i.e. more translations will pop up, it will be trivial to move translation strings to external file. Finished translation: Russian Unfinished translation: Hungarian Things which are nice to do: - Language code -> language mapping for more user friendness - Specifying fonts to be used with language - Updating of interface language without restart. It will require moving of much code to reflowLayout() methods for each dialog The .po files must be in single byte encodings. I.e. no support for Unicode. svn-id: r49759
2010-01-25Change some comments to use "AdLib" instead of "adlib".Johannes Schickel
svn-id: r47534
2009-12-09Changed MidiDriver::createMidi to take a MidiDriverType instead of an intMax Horn
svn-id: r46316
2009-12-09Remove the Audio::Mixer parameter from the midi/music pluginsMax Horn
svn-id: r46315
2009-12-07Rename the MT-32 emulator driver name from "MT-32" to "MT-32 Emulation to ↵Johannes Schickel
avoid confusion. svn-id: r46271
2009-09-27Removed Mac OS X QuickTime MIDI backend. It breaks on OS X 10.6, and it's ↵Max Horn
not as good as the CoreAudio backend anyway svn-id: r44428
2009-06-06Patch #1365914: "SCUMM: CMS support." Disabled by default. Still plenty to do.Eugene Sandulenko
svn-id: r41282
2009-05-13Fix spelling of AdLib (it's AdLib not Adlib).Johannes Schickel
svn-id: r40533
2009-03-27Fix regression from r39702: look up music_driver in configWillem Jan Palenstijn
svn-id: r39707
2009-03-26MidiDriver cleanup: findMusicDriver now returns a pointer (makes it possible ↵Max Horn
to distinguish 'no match found' from other results); updated parseMusicDriver accordingly; some methods now return MidiDriverType instead of int svn-id: r39702
2008-12-22Fixed indentation and removed whitespaces at the end of lineJordi Vilalta Prat
svn-id: r35481
2008-08-27Partial commit of patch #2012839: Atari Patch for adding Native MIDI and Fix ↵Max Horn
Compile svn-id: r34194
2008-05-14- Added more information (ID and capabilities) to the MIDI driversJordi Vilalta Prat
- Added the MidiPlugin interface to the remaining MIDI drivers - Added an initial MidiManager to handle the MIDI plugins (just static plugins by now) svn-id: r32117
2008-05-11Added the MidiPlugin interface (first step towards the MIDI plugins)Jordi Vilalta Prat
svn-id: r31993
2008-05-06Allow static and dynamic plugins to be used at the same timeJordi Vilalta Prat
svn-id: r31888
2008-04-14typoMax Horn
svn-id: r31500
2008-03-12Removed remaining traces of the dead MorphOS backend, which itself was ↵Max Horn
removed about one year ago svn-id: r31114
2008-02-20Added CAMD MIDI driver for AmigaOS4Jordi Vilalta Prat
svn-id: r30910
2007-11-02Patch #1815526: Add TiMidity++ MIDI server supportMax Horn
svn-id: r29377
2007-10-29Add DMedia MIDI driver just to the list of MIDI drivers if on IRIX, since at ↵Johannes Schickel
least the code for it is just build on IRIX and not on every UNIX system. svn-id: r29316
2007-09-30Patch #1804801: DMedia MIDI driver for IRIXMax Horn
svn-id: r29142
2007-09-19Merged common/stdafx.h into common/scummsys.h. All referencing files have ↵Nicola Mettifogo
been updated. svn-id: r28966
2007-06-25Patch #1742574: "GUI: Unify "Default" options text"Eugene Sandulenko
svn-id: r27698
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
2006-10-21cleanupMax Horn
svn-id: r24407
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-07-14More whitespace changes.Torbjörn Andersson
svn-id: r23496