Commit Graph

1473 Commits

Author SHA1 Message Date
Florian Kagerer
7455c3ec39 AUDIO: fixed bug when device was set to default and only MDT_MIDI flags were passed to detectDevice()
svn-id: r50510
2010-06-29 21:56:04 +00:00
Johannes Schickel
36e583944f Return "0" in case no device was detected in MidiDriver::detectDevice.
svn-id: r50473
2010-06-29 00:38:06 +00:00
Johannes Schickel
a254d29741 Yet another slight fix for the fallback detection.
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-29 00:30:16 +00:00
Johannes Schickel
19abacc77a Fix fallback detection code in MidiDriver::detectDevice.
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-29 00:29:57 +00:00
Johannes Schickel
5c424cfb41 Fix detection of invalid music drivers specified via command line.
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-29 00:29:35 +00:00
Willem Jan Palenstijn
0eb128ee47 Add missing include for translations
svn-id: r50326
2010-06-26 15:55:53 +00:00
Jordi Vilalta Prat
063cef0c28 GUI: Add and improve some messages to translate
svn-id: r50324
2010-06-26 15:48:03 +00:00
Johannes Schickel
5ba7be88b8 Fix formatting again.
svn-id: r50296
2010-06-26 00:28:29 +00:00
Florian Kagerer
56c6907477 AUDIO: fix comments
svn-id: r50293
2010-06-25 22:37:19 +00:00
Florian Kagerer
c35e350531 AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM
svn-id: r50288
2010-06-25 20:51:57 +00:00
Johannes Schickel
784c655e82 Formatting fixes.
svn-id: r50285
2010-06-25 19:30:01 +00:00
Florian Kagerer
3962f8ba59 AUDIO: some fixes in the audio device code (no sound option, new GUIO flags)
svn-id: r50281
2010-06-25 18:47:52 +00:00
Florian Kagerer
78fb62bcdf LAUNCHER: hopefully fixed music driver selection via command line
svn-id: r50158
2010-06-22 18:27:00 +00:00
Johannes Schickel
0a757c185f Remove some trailing tabs.
svn-id: r50152
2010-06-22 16:42:49 +00:00
Florian Kagerer
46ec88f74d GUI/LAUNCHER: This should fix the regression concerning pc speaker / pcjr support caused by patch #1956501
svn-id: r50145
2010-06-22 15:30:41 +00:00
Max Horn
bbad3f333a Patch #1956501: "GUI/LAUNCHER: Midi device selection"
svn-id: r50128
2010-06-21 21:36:36 +00:00
Johannes Schickel
a451ffe268 Make MidiParser::sendToDriver protected.
The client code should never try to pass commands to
the output via the MidiParser API.

SCI currently does that though...
Actually that shows that either our MidiParser API becomes
more and more an MidiPlayer than just a parser or that the
SCI design has its flaws here.

svn-id: r49996
2010-06-18 02:25:11 +00:00
Martin Kiewitz
af65de6e1a SCI: implement channel remapping for SCI1
svn-id: r49905
2010-06-16 21:02:58 +00:00
Johannes Schickel
cf6a29e862 Some documentation cleanup to ease readability.
svn-id: r49867
2010-06-15 17:13:18 +00:00
Max Horn
d570e10b77 Modify makeAIFFStream to match the other sound decoder factories
svn-id: r49844
2010-06-15 12:33:54 +00:00
Max Horn
651e2760a3 Fix spelling, cleanup
svn-id: r49843
2010-06-15 12:33:20 +00:00
Eugene Sandulenko
67bc711580 GUI: Implement MIDI drivers as GUI options.
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-15 10:56:12 +00:00
Eugene Sandulenko
2bcafcb02d Sound: add PCJR as a pseudodriver.
Since AGI distinguishes between PCSPK and PCJR/Tandy, make it as a
pseudodriver.

svn-id: r49782
2010-06-15 10:55:31 +00:00
Eugene Sandulenko
859212df25 Implement translation support for ScummVM GUI.
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-06-15 10:44:51 +00:00
Filippos Karapetis
22e9fe8291 Since allNotesOff() is virtual and can be overriden, make its associated variables protected instead of private
svn-id: r49672
2010-06-14 22:31:38 +00:00
Johannes Schickel
5b2a60d049 Rewind the underlying audio stream on LoopingAudioStream creation.
Also mention in the documentation that both LoopingAudioStream and
SubLoopingAudioStream do rewind the underlying in their constructor.

svn-id: r49539
2010-06-09 13:34:15 +00:00
David Turner
641ffa5ee3 Modification to remove false positive "Possible divide by zero" warnings given by cppcheck-1.43.
These are incorrect as '/' operator has precedence over >>, but this does improve readability anyway.

This bug in cppcheck has already been corrected: http://sourceforge.net/apps/trac/cppcheck/ticket/1714

svn-id: r49517
2010-06-08 20:29:33 +00:00
Max Horn
46155b2c36 Add Android backend from patch #2603856
svn-id: r49449
2010-06-06 09:34:36 +00:00
David Turner
193d7df594 Correction for SCI valgrind uninit memory error in MIDI sound which occurs during LSL6 intro.
This may be "hiding" a bug in the use of sound/midiparser.cpp in SCI i.e. incorrect use of parseNextEvent(), so this should be reviewed, but this patch initialises _next_event at object construction, which corrects this, should not break anything else and is good practice.

svn-id: r49445
2010-06-06 00:27:56 +00:00
Yotam Barnoy
6884ffc291 PSP: added preliminary support for using ME hardware to play MP3 files. If the decoder fails to load, MAD is used instead. Disable with DISABLE_PSP_MP3.
svn-id: r49319
2010-05-30 09:47:00 +00:00
Neil Millstone
5143e7fff4 Fix typo(?) which prevents streaming code from compiling.
svn-id: r49314
2010-05-29 20:32:25 +00:00
Matthew Hoops
f2dda51943 Have makeADPCMStream use the entire stream if the size is 0 (as it says in the doxygen comment).
svn-id: r49236
2010-05-26 12:15:14 +00:00
Max Horn
7bbbaf7d8c Patch #3006178: "rjp1: calculate sample length correctly"
Fixes bug #3001110: "FOTAQ Amiga: crashes reporting assertion failure"
Added a NEWS entry to the patch.

svn-id: r49210
2010-05-25 11:35:16 +00:00
Matthew Hoops
b3bd797e01 Move the QDM2 code to the graphics module, removing the cyclic dependency.
svn-id: r49171
2010-05-23 21:41:13 +00:00
Matthew Hoops
5e90f66edc Hide the QDM2 implementation and only expose it via a factory method, hopefully fixing compilation on most systems at the same time.
svn-id: r49170
2010-05-23 19:54:17 +00:00
Matthew Hoops
2f31b05651 Move Mohawk's QuickTime code to graphics/ (and QDM2 to sound, disabled when Mohawk is not enabled) so SCI can use the code.
svn-id: r49165
2010-05-23 18:33:55 +00:00
Matthew Hoops
811fc0e7ec Add the Common::Rational class from patch #2963496 (VideoDecoder Rewrite)
svn-id: r49061
2010-05-17 20:53:04 +00:00
Ori Avtalion
0ae4fcd055 Fix comment to removed function
svn-id: r48965
2010-05-07 12:59:46 +00:00
Johannes Schickel
caf31ee5af Replace various strncpy usages by strlcpy.
svn-id: r48955
2010-05-05 17:54:12 +00:00
Johannes Schickel
c5436aebdd Cleanup.
svn-id: r48921
2010-05-03 18:32:26 +00:00
Johannes Schickel
e7f29db498 Check for read/seek errors of the underlying SeekableReadStream in RawStream.
svn-id: r48920
2010-05-03 18:28:05 +00:00
Johannes Schickel
df318c0ec3 Fix for bug #2961787 "HE SAM1: Music in kitchen slightly off (regression)".
Unlike in the branch-1-1-x I did not restore the old RawMemoryStream
code in the trunk. Instead I stripped out the pre-buffering of the
RawStream code. I still decided to add some in-place buffering
in RawStream::readBuffer to at least not rely on super-fast disk I/O.

This is currently an experimental change. There might be need to
reconsider the buffering (even though backends with slow disk I/O
should actually do buffering for file I/O on their own).

svn-id: r48919
2010-05-03 18:27:45 +00:00
Johannes Schickel
f2ee496c0e Paranoia change: Prevent possible assertion caused by MP3Stream.
Currently we have an assert checking that the framerate of an
Audio::Timestamp is always > 0. Since MAD might return "0"
(and maybe even other illegal values) in case the MP3 stream is
invalid we need to check that before we setup the _length
Timestamp of MP3Stream.

svn-id: r48904
2010-05-03 13:03:44 +00:00
Max Horn
df4400d223 Rename input -> stream
svn-id: r48869
2010-04-29 21:54:39 +00:00
Andre Heider
6329d96cef Fix the MT32 gfx output for 16bit compatiblity, cleanup, get rid of unnecessary buffers.
svn-id: r48753
2010-04-20 18:29:53 +00:00
Max Horn
bb26c04053 Fixing some warnings (with gcc 3.3.6)
svn-id: r48694
2010-04-17 23:19:52 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Ori Avtalion
f4d7bdc937 Add missing cases to switch statements, remove whitespace
svn-id: r48604
2010-04-09 19:25:05 +00:00
Johannes Schickel
e4f588ae4c Do not use a template parameter for stereo setting for RawStream but instead pass the constructor a boolean, this should save some binary size.
svn-id: r48496
2010-04-03 15:57:04 +00:00
Johannes Schickel
5412dac46f Cleanup.
svn-id: r48495
2010-04-03 15:56:40 +00:00