libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 03:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,473 Commits 5 Branches 5 Tags 1.8 GiB
5d419c2b58
Commit Graph

511 Commits

Author SHA1 Message Date
Matthew Hoops
54d4707edc AUDIO: Fix invalid free call 2013-04-16 12:05:42 -04:00
Filippos Karapetis
3f01f34b1f MT-32: Sync with the latest changes in munt 
This syncs our code with munt commit 15e9f65
 2013-03-27 23:01:47 +02:00
Filippos Karapetis
8a62471b21 MT-32: Sync with the latest changes in munt 2013-03-03 23:01:12 +02:00
Filippos Karapetis
7880323590 MT-32: Also replace cosf() (C99) with cos() 2013-03-03 22:59:33 +02:00
Filippos Karapetis
bb7930cf9c MT-32: Avoid using sinf() (which is C99) in favor of sin() 2013-03-03 16:10:02 +02:00
Filippos Karapetis
f4cc45d367 MT32: Sync with the latest changes in munt 
The major change is the addition of a refined wave generator based on
logarithmic fixed-point computations and LUTs
 2013-03-02 14:09:39 +02:00
Filippos Karapetis
8884c240fc MT32: Update copyright year 2013-03-02 13:46:11 +02:00
Dreammaster
bb3285d933 Merge branch 'master' into hopkins 2013-02-15 08:25:09 -05:00
Filippos Karapetis
059f5ee138 MT32: Also attempt to load roms named CM32L_CONTROL.ROM / CM32L_PCM.ROM 
This was accidentally removed in commit 5711d23
 2013-02-04 23:13:53 +02:00
Filippos Karapetis
e2a8c8ea86 MT32: Sync with the latest changes in munt 
This syncs our code with munt commit ee380de
 2013-02-04 23:13:53 +02:00
Torbjörn Andersson
a50c05f7d0 HOPKINS: Work around broken cadavre.mod in OS/2 and BeOS versions 
A large part of cadavre.mod is broken. No new notes play, and only
the old background sounds remain. It's possible, perhaps even
probable, that the original MOD player didn't have this problem,
but all standalone players I've tried do, so I'm assuming it's the
file that's broken. We work around it by changing the length of
the song after it's been loaded to only include the good parts.
 2013-01-27 18:18:04 +01:00
Johannes Schickel
354aa0f5f3 JANITORIAL: Use "End of anonymous namespace" as comment for anonymous namespaces. 2013-01-26 19:38:02 +01:00
Johannes Schickel
b4d0a8ba66 JANITORIAL: Enforce "} // End of namespace" with a single space after }. 2013-01-26 19:38:02 +01:00
Torbjörn Andersson
8bbb9a2bbd AUDIO: Mention that the Hopkins engine uses Protracker as well 2013-01-26 15:47:38 +01:00
Johannes Schickel
59dde54519 Merge pull request #301 from lordhoto/c++11-playground 
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
 2013-01-26 05:25:14 -08:00
Johannes Schickel
94edb3409f Merge branch 'eriktorbjorn-fluidsynth-settings' 
This is a manual merge of a slightly adapted pull request #296.
The changes made are:
- Each time the theme format changes, the version was increased
- default.inc has been regenerated in the same commit as the theme changes
 2013-01-26 14:00:04 +01:00
Torbjörn Andersson
a188a43da6 GUI: Make the FluidSynth settings dialog a bit more like Qsynth 
To help people familiar with Qsynth (I'm not, but it seems to be
one of the more polished FluidSynth front ends), use the same
presentation and terminology for the FluidSynth settings.

More to follow.
 2013-01-26 13:36:39 +01:00
Torbjörn Andersson
681f81211f FLUIDSYNTH: Add separate dialog for FluidSynth settings 
I don't really understand what these parameters do, or what the
sensible values are, so for now the sliders are limited only by
the allowed (or, in one case, "safe") values.
 2013-01-26 13:36:37 +01:00
Einar Johan Trøan Sømåen
5d4d65d6d9 JANITORIAL: Fix ){ -> ) { 2013-01-24 20:15:13 +01:00
Filippos Karapetis
a81ff52088 MT32: Sync with the latest changes in munt 
This syncs our code with munt commits 535bf96, 934c116, 1643d07 and 2eac585
 2013-01-19 15:53:54 +02:00
Johannes Schickel
cc0b8594ce AUDIO: Silence C++11 narrowing warnings. 2013-01-09 07:24:37 +01:00
Filippos Karapetis
7058daaed1 MT32: Remove the screen drawing code of the MUNT debug messages (bug #3599702) 
The MUNT debug messages are called from an audio callback, which is not allowed to
update the screen, as per the OSystem documentation in common/system.h:401
 2013-01-06 22:24:27 +02:00
Filippos Karapetis
05bf234b26 MT-32: Only show MUNT debug messages for debug level 4 and above (bug #3599702) 
This avoids showing warnings in the intro of FOTAQ when using the MT-32 emulator
 2013-01-06 21:54:40 +02:00
Strangerke
3cacade68d COPYRIGHT: After a discussion it with KingGuppy, revert copyright modification in some Munt files (thanks LordHoto for pointing it) 2013-01-02 18:48:22 +01:00
Strangerke
88add32e3b JANITORIAL: Update copyright year 2013-01-02 18:32:15 +01:00
Filippos Karapetis
98ec267543 MT-32: Sync with the latest changes in munt 
This syncs our code with munt commits 3f0db2d and 2c5f314
 2013-01-02 12:42:54 +02:00
Filippos Karapetis
f3ccc38e8d MT32: Add missing initialization code 
This code wasn't added when syncing with the official munt codebase
 2012-12-27 17:12:27 +02:00
Filippos Karapetis
bf62205c73 MT32: Move the ROM file deletion code to the ScummVM MT32 driver 
This removes the custom ScummVM file deletion code in the munt code
 2012-12-27 17:12:26 +02:00
Filippos Karapetis
5711d23231 MT32: Update the MT32 emulator and adapt to its new API 
Previous munt commit was 84b2819 (Dec 22, 2012)
Current munt commit is 6afddaf (Dec 23, 2012)

This commit also updates the MT32 driver code to the latest munt API
 2012-12-26 21:28:34 +02:00
Filippos Karapetis
d9e555afd5 MT32: Update the MT32 emulator to a newer munt commit 
Previous munt commit was f969d20 (Nov 15, 2012)
Current munt commit is 84b2819 (Dec 22, 2012)

We are still missing the changes from commit 788f7b1 onwards (Dec 22,
2012). There are bigger ROM access-related changes from that point,
which we'll have to integrate as well.
 2012-12-25 23:48:25 +02:00
clone2727
91317c3630 Merge pull request #293 from clone2727/qtmidi 
Add support for QuickTime Music playback
 2012-12-13 15:49:40 -08:00
Matthew Hoops
17f9235325 AUDIO: Add some general documentation on MidiParser_QT 2012-12-13 18:30:05 -05:00
D G Turner
62d87e30f4 AUDIO: Fix MS ADPCM to work with Mono streams using odd sized buffers. 2012-12-10 16:29:16 +00:00
Matthew Hoops
a396e18097 AUDIO: Finish comment 2012-12-03 09:07:33 -05:00
Torbjörn Andersson
8881f71ac5 AUDIO: Fix AdLib volume when ENABLE_OPL3 is not defined 
This should ensure that when ENABLE_OPL3 is not defined, the old
code (using a lookup table) is used for calculating vol1 and vol2
(unless, of course, _scummSmallHeader is true). I hope I got it
right this time.
 2012-12-01 11:48:51 +01:00
Torbjörn Andersson
5cd7e5d777 AUDIO: Fix AdLib volume regression in pre-iMUSE SCUMM games 
This assumes that _scummSmallHeader = 1 means we don't care about
what _opl3Mode is when calculating the volume in mcKeyOn(). I hope
this is correct.
 2012-12-01 11:43:51 +01:00
Matthew Hoops
3399b5662f AUDIO: Fix AIFF comment about supporting IMA ADPCM 2012-11-24 17:25:39 -05:00
D G Turner
d654057a98 AUDIO: Fix spurious compiler warnings about use-before-set variable. 2012-11-23 19:01:38 +00:00
Johannes Schickel
7c2f5e2d0e Merge pull request #283 from lordhoto/scumm-opl3 
SCUMM: Support OPL3 in Sam&Max
 2012-11-22 17:28:31 -08:00
Johannes Schickel
1f69192f7d AUDIO: Remove two extra commas. 2012-11-22 02:29:57 +01:00
Johannes Schickel
761a98997c AUDIO: Disallow custom percussion instruments in MIDI->AdLib code. 2012-11-22 02:22:25 +01:00
Johannes Schickel
689497f06e AUDIO: Only enable OPL3 code in MIDI->AdLib, when we have the DOSBox emulator builtin. 2012-11-22 02:18:51 +01:00
Johannes Schickel
be60a641bf AUDIO: Slight cleanup and typo fix in S&M OPL3 code. 2012-11-20 03:27:12 +01:00
Matthew Hoops
b285db4db3 AUDIO: Cleanup MidiParser_QT a bit 2012-11-18 14:43:35 -05:00
Matthew Hoops
ca6fdb0807 AUDIO: Ignore QT MIDI control change 0 
QuickTime docs don't list it, and we shouldn't treat it as a bank select
 2012-11-18 14:20:24 -05:00
Filippos Karapetis
2c8cd2d653 MT32: Make all constant tables in the MT32Emu namespace static 
Added in munt commit d4f8ebf54be0a8255af08bb24f1962afa8378096
 2012-11-15 14:40:04 +02:00
Filippos Karapetis
3233edf9b8 MT32: Update the MT32 emulator to the latest munt revision 
Previous munt revision was 189f607c88e7404ad99abcf4b90f23b103003ed1
(Feb 09, 2012).
Current munt revision is f969d2081d41b669c1bfebd0026b5419c09517ae
(Nov 15, 2012)
 2012-11-15 14:30:41 +02:00
athrxx
17ed912ed5 AUDIO: remove unused variables in FM-TOWNS imuse driver 2012-11-11 19:14:26 +01:00
Matthew Hoops
f0091af6b5 AUDIO: Don't allow skipping negative times in skipSamples() 2012-10-03 10:45:43 -04:00
Johannes Schickel
abe637b0f5 AUDIO: Add support for Sam&Max's OPL3 output in our SCUMM AdLib driver. 
This is an initial implementation and does not implement the differences
in voice allocation.
 2012-10-01 03:10:44 +02:00
Johannes Schickel
1c024519d5 AUDIO: Add easy way to write to OPL3's secondary register set. 2012-10-01 01:50:23 +02:00
Johannes Schickel
04baadcf7a AUDIO: Switch MidiDriver_ADLIB to new OPL API. 2012-09-30 21:36:52 +02:00
Johannes Schickel
78e8b9dd59 AUDIO: Properly handle AdLibPercussionChannel::noteOff. 2012-09-30 21:28:18 +02:00
Johannes Schickel
e5c41cbf9a AUDIO: Comment out unused member in AdLibPart. 2012-09-30 21:22:03 +02:00
Johannes Schickel
8eeb3f2bf9 AUDIO: Give AdLibSetParam's members more descriptive names. 2012-09-30 21:17:04 +02:00
Johannes Schickel
c2d39e9152 AUDIO: Enforce method naming guidelines in adlib.cpp. 2012-09-30 21:13:07 +02:00
Johannes Schickel
2d01b7de43 AUDIO: Enforce variable naming guidelines in adlib.cpp. 2012-09-30 21:13:05 +02:00
Johannes Schickel
b63950f40d AUDIO: Fix formatting in adlib.cpp. 
Powered by astyle.cpp.
 2012-09-30 21:12:05 +02:00
Johannes Schickel
a222e0640f AUDIO: Rename global variables in SCUMM AdLib code. 
This does give them slightly nicer names and also adds a "g_" prefix to them.
 2012-09-30 21:11:15 +02:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces. 
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
 2012-09-26 04:17:55 +02:00
Matthew Hoops
d5ed8b1901 Merge remote branch 'upstream/master' into pegasus 
Conflicts:
	AUTHORS
 2012-09-12 20:18:13 -04:00
Matthew Hoops
bb45b24f88 AUDIO: Implement simple dynamic QuickTime MIDI channel remapping 
Needed for IHNM Mac sounds
 2012-09-12 14:36:17 -04:00
Matthew Hoops
c023651cb3 AUDIO: Implement QuickTime MIDI channel remapping 
Needed to support channels with a drum kit
 2012-09-10 08:23:11 -04:00
Matthew Hoops
cfe6a2b640 AUDIO: Fix QuickTime MIDI with extra info in the header 
The 11th Hour Mac MIDI's now play
 2012-09-09 14:59:05 -04:00
Matthew Hoops
4a458236f6 COMMON: Make QuickTimeParser::readSampleDesc take the desc size 2012-09-09 13:47:40 -04:00
Matthew Hoops
2cb301337a AUDIO: Fix QuickTime MIDI pitch bend 2012-09-08 11:05:47 -04:00
Matthew Hoops
8259d3cd9e Merge remote branch 'upstream/master' into qtmidi 2012-09-07 19:03:01 -04:00
Alyssa Milburn
f08978a075 JANITORIAL: Remove underscores from MidiParser variable names. 2012-09-07 23:04:34 +02:00
Alyssa Milburn
763c052c67 AUDIO: Remove unused members of MidiParser_XMIDI. 2012-09-07 22:22:43 +02:00
Matthew Hoops
c50d40b7bf AUDIO: Add some documentation to MidiParser_QT 2012-09-07 14:50:21 -04:00
Matthew Hoops
c882ef9dab AUDIO: Make MidiParser_QT::loadMusic() detect the file type 2012-09-07 14:47:30 -04:00
Matthew Hoops
342cc027c4 AUDIO: Fix QuickTime MIDI tempo 2012-09-07 14:41:54 -04:00
Matthew Hoops
f333e63397 AUDIO: Fix QuickTime MIDI end of track 
The end marker is used for editing only
 2012-09-07 14:33:39 -04:00
Matthew Hoops
c01dfba093 AUDIO: Begin basic playback of QuickTime MIDI files 
Sounds almost correct, but too fast
 2012-09-07 11:48:22 -04:00
Matthew Hoops
7e2f7099c8 AUDIO: Keep track of the QuickTime MIDI time scale 2012-09-07 09:49:33 -04:00
Matthew Hoops
c22f76dbbc AUDIO: Fill in _tracks from MidiParser_QT 2012-09-06 16:27:06 -04:00
Matthew Hoops
cc309f4d16 AUDIO: Read in all QuickTime MIDI track data 2012-09-06 14:23:15 -04:00
Matthew Hoops
834ca0e045 AUDIO: Allow for parsing QuickTime 'Tune' files 2012-09-06 09:38:13 -04:00
Matthew Hoops
c5ab2fc95f AUDIO: Clean up note request list reading 2012-09-05 23:20:12 -04:00
Matthew Hoops
ac4c8cd335 AUDIO: Add parsing of the QuickTime MIDI sample description 2012-09-05 23:04:29 -04:00
Littleboy
751f5be785 AUDIO: Silence MSVC warning about un-initialized newIncrement variable 2012-09-05 20:18:25 -04:00
Matthew Hoops
2f9b1b67b0 ALL: Mark off some things as used by Pegasus 2012-08-31 22:26:02 -04:00
Matthew Hoops
857b92f8ff Merge pull request #268 from clone2727/video-rewrite 
VideoDecoder upgrade & partial rewrite
 2012-08-26 15:41:56 -04:00
Matthew Hoops
813689d68c AUDIO: Move LimitingAudioStream to audio/ 2012-08-12 00:08:13 -04:00
Johannes Schickel
84426c6355 AUDIO: Fix "if" formatting in QDM2 code. 2012-08-09 03:25:14 +02:00
D G Turner
43e2c6ee1e AUDIO: Correct ADPCM Fixes to ensure internal buffers are drained. 
This also adds an omitted _decodedSampleCount initialization in Oki
ADPCM decoder.
 2012-08-04 20:29:37 +01:00
D G Turner
9c47fdae29 AUDIO: Fix Oki ADPCM to work with Mono streams using odd sized buffers. 2012-08-04 18:38:12 +01:00
D G Turner
b79221729b AUDIO: Fix DVI ADPCM to work with Mono streams using odd sized buffers. 2012-08-04 18:36:13 +01:00
D G Turner
d2c510b886 AUDIO: Update Mixer class doxygen comment on balance to be consistent. 2012-06-24 22:34:49 +01:00
Matthew Hoops
5230a0d617 AUDIO: Make sure maxtrax and tfmx are compiled in with dynamic modules 2012-06-15 22:48:26 -04:00
Sven Hesse
230a0edc2d AUDIO: gob uses protracker too 2012-06-16 04:29:57 +02:00
Sven Hesse
90999d8f8c AUDIO: Implement a missing Protracker feature 
When a row has a new period, but no new sample, restart the track's
last sample (except when we're doing portamento).
 2012-06-15 03:06:14 +02:00
Johannes Schickel
9c14f4419b AUDIO: Make VOC decoder a bit more failsafe by still playing parts of invalid VOC files. 
Formerly when an unsupported block was found the opening would fail. Instead
now all the valid blocks till that occasion will be played.

This fixes an missing sound in Full Throttle (thanks to clone2727 for
reporting), which is using a VOC file which fails to specify the proper block
length for its sound block.
 2012-06-11 20:37:04 +02:00
Matthew Hoops
a3832ecd5d AUDIO: Fix seeking to the end of a QuickTime audio track 2012-05-21 22:38:32 -04:00
Matthew Hoops
acb127c2d2 AUDIO: Fix seeking in QuickTime files with multiple edit lists 2012-04-28 15:22:42 -04:00
D G Turner
8a5b08341e AUDIO: Remove now unused Sin/Cos table and FFT code from QDM2 Codec. 
This was only used by the RDFT code, now replaced by Common::RDFT.
 2012-04-13 07:37:31 +01:00
D G Turner
7f930dfae3 AUDIO: Migrate QDM2 Codec to using Common::RDFT class. 2012-04-13 07:37:30 +01:00
D G Turner
ce1f805212 AUDIO: Fixes to restore QDM2 Codec function. 
The Bitstream format is changed to 32LELSB and an error in the getVlc2()
function bitstream reading needed to be corrected to fix operation.
 2012-04-13 07:37:29 +01:00
D G Turner
50a9c6429d AUDIO: Update to QDM2 codec fixing pointer to stream buffer usage. 
This should allow the QDM2 codec to work again with Common::Bitstream
instead of the older getBits() reader, but this aborts with a reading
past end of stream error...
 2012-04-13 07:37:28 +01:00
D G Turner
b5f5cbe5fa AUDIO: Removed qdm2_decode_sub_packet_header() function from QDM2. 
This is to allow modification of the code which needs to assign the
data member of the sub_packet structure to an offset in the input
byte readStream.
 2012-04-13 07:37:27 +01:00
D G Turner
845812f12e AUDIO: Fix skipping in QDM2 BitStream usage. 
getBits(n) would cause a runtime error if n is greater than 32,
but using getBits() to skip is no longer necessary as the newer
BitStream class has a skip method, which is used instead.
 2012-04-13 07:37:26 +01:00
D G Turner
220f60fd60 AUDIO: Clean up QDM2 getVlc2() function. 2012-04-13 07:37:25 +01:00
D G Turner
fa44707028 AUDIO: Initial Refactoring of QDM2 to use Common::BitStream. 
This removes the internal getBitContext bitwise reading code and
replaces with Common::BitStream.

However, this breaks the codec as in one location, the internal buffer
of getBitContext reader is used and this can't be directly replaced.
This will need to be understood and rewritten.
 2012-04-13 07:37:24 +01:00
Matthew Hoops
3e47203d64 AUDIO: Force QuickTime stereo samples to mono if needed 
The number of channels in AAC can differ from the actual number of channels needed making us require this. The channel count inside the container is always the correct one.
 2012-04-10 16:44:41 -04:00
Matthew Hoops
68e1a04183 AUDIO: Fix QDM2 extra data parsing 2012-03-30 14:40:14 -04:00
Matthew Hoops
be8c557645 AUDIO: Add support for multiple QuickTime audio tracks 
This also cleans up the QuickTime audio code to make it a bit more manageable too
 2012-03-19 12:04:46 -04:00
Johannes Schickel
223794fb38 ALL: Make use of defined() for the preprocessor consistent. 
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
 2012-03-17 22:02:44 +01:00
Christoph Mallon
75efdd2d84 JANITORIAL: Replace (x ? false : true) by !(x). 2012-03-13 15:43:36 +01:00
Max Horn
215b41b244 COMMON: Move RenderMode and GUIOptions functionality into separate files 2012-02-26 15:19:31 +01:00
athrxx
9f19bace44 COMMON: remove unnecessary commas 2012-02-21 21:48:34 +01:00
Tarek Soliman
a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00
Tarek Soliman
921f602ab8 JANITORIAL: Fix whitespace in pointer template arg 2012-02-15 10:07:08 -06:00
Alyssa Milburn
cd1ea99f0e MT32: Replace OS X specific exp2f call with exp2. 
Suggested by clone2727 to fix the build, since buildbot's ppc
headers don't have exp2f.
 2012-02-11 22:41:21 +01:00
Eugene Sandulenko
40b6b3a3af MT32: Turn off accurate WG as suggested by KingGuppy 2012-02-10 13:16:27 +02:00
Willem Jan Palenstijn
0864edea54 MT32: Fix warning 
The workaround for the unused parameter warning caused a warning:
parameter 'patchNum' set but not used
 2012-02-09 23:07:58 +01:00
Bastien Bouclet
577635acf2 AUDIO: Add support for RAW PCM wave stream with an incomplete packet 
The last incomplete packet is ignored
 2012-02-09 16:10:50 +01:00
Eugene Sandulenko
22ea849cad MT32: Hooked up ScummVM MIDI gain 2012-02-09 11:31:09 +02:00
Eugene Sandulenko
030e155eeb MT32: Update MT-32 emulator to latest Munt code 
Several changes against original code were made. They were intentionally
kept to the minimum
 2012-02-09 11:31:03 +02:00
Johannes Schickel
163d57ba93 AUDIO: Return 0 instead of false in Tfmx::loadSampleFile. 
This should "fix" a g++ warning.
 2012-01-29 16:32:44 +01:00
Johannes Schickel
86a4bbbd9b AUDIO: Add more warnings in case invalid VOC data is encountered. 2012-01-26 02:43:58 +01:00
Johannes Schickel
d620dd90bd AUDIO: Fix missing sounds in Simon 1 Amiga CD32. 
It seems the VOC files used by Simon 1 Amiga CD32 use 128 as terminator block.
Added this as a special case with a debug output when it's caught.
 2012-01-26 02:36:51 +01:00
Johannes Schickel
b89e63798a AUDIO: Remove outdated comment about RawStream. Thanks to clone2727 for noticing. 2011-12-31 06:29:56 +01:00
Matthew Hoops
df88a1f2a7 AUDIO: Fix M4A seeking with multiple time->sample chunks 2011-12-29 14:50:05 -05:00
Matthew Hoops
5b1095a400 AUDIO: Only warn about audio edit lists when the count is > 1 
MPEG-4 files don't contain any elst atom
 2011-12-29 12:47:53 -05:00
Johannes Schickel
c6599ea5ee AUDIO: Remove obsolete loadVOCFromStream. 2011-12-24 18:23:47 +01:00
Matthew Hoops
42bb9a2264 AUDIO: SAGA now uses the Mac snd code too 2011-12-24 11:09:54 -05:00
Matthew Hoops
b367772b5f VIDEO: Add support for QuickTime video track edit lists 2011-12-12 12:28:48 -05:00
Matthew Hoops
6bbff58314 VIDEO: Rewrite VMD audio streaming 
Audio is now decoded in AudioStream classes instead of being decoded ahead of time and then queued.
 2011-11-27 15:52:05 +01:00
Johannes Schickel
b9d1718fe1 ALL: unrecognised -> unrecognized. 2011-11-26 17:40:00 +01:00
Johannes Schickel
dd42278373 AUDIO: Fix type 9 sound blocks in VOC code. 
This should fix missing sound in Touche.
 2011-11-24 22:55:25 +01:00
Johannes Schickel
0affcfed9e AUDIO: Very small formatting fix. 2011-11-20 04:37:21 +01:00
Paul Gilbert
b0611f3189 M4: Removed the M4/MADS engine from trunk 2011-11-20 12:14:10 +11:00
Johannes Schickel
38164ba66a AUDIO: Simplify RawStream code. 
This drops the (unused) ability to play based on a list of input blocks. This
was formely only used by the NDS specific VOC streaming code, which has been
removed in 9fa9f68789.
 2011-11-06 14:19:17 +01:00
Johannes Schickel
408d119a11 AUDIO: Remove unused makeRawDiskStream_OLD factory. 2011-11-06 13:57:05 +01:00
Johannes Schickel
9fa9f68789 AUDIO: Implement a basic VocStream class. 
Now all VOCs are streamed rather than preloaded. This deprecates the
STREAM_AUDIO_FROM_DISK define, which was previously used to stream VOCs from
disk.

This might very well break some engines which relied on the stream not being
changed after makeVOCStream! I adapted all engines which had a check for
STREAM_AUDIO_FROM_DISK in their code.

It would be wise to check all other engines using VOC to see if this might
cause any problems for them.
 2011-11-06 13:30:34 +01:00
Filippos Karapetis
e4d1a5da3d QDM2: Removed superfluous parentheses 2011-11-04 00:42:40 +02:00
athrxx
4eab4f931f AUDIO: remove 2 superfluous lines in Kyra1/Kyra2/LoL FM-Towns/PC-98 sound driver 2011-11-03 23:05:03 +01:00
athrxx
ced0fcf054 FM-TOWNS AUDIO: make constructor of TownsAudioInterfaceInternal private 2011-11-01 20:29:55 +01:00
Willem Jan Palenstijn
66a013d1f7 AUDIO: Fix some comments and whitespace 2011-10-31 23:28:53 +01:00
Willem Jan Palenstijn
99307acf0a AUDIO: Fix reverse stereo volumes on ARM 
This commit re-converts the stereo rate converters to
reverse stereo since they had drifted apart during the last few
refactoring steps.

In the process it makes vol_l/vol_r behave the same as in the C++.
 2011-10-31 23:28:53 +01:00
Alyssa Milburn
bf39e60ff7 AUDIO: Fix reverse stereo (LinearRate_R) on ARM. 
Fixes the issues I can reproduce, and presumably fixes bug #2998862.
(cherry picked from commit 797406fe4c77b6a56cc4f8a50c15d639cd440ce4)
 2011-10-31 21:47:37 +01:00
Johannes Schickel
38aa82a4f5 AUDIO: Fix conditional compilation of maxtrax and tfmx code. 
This is a regression from 3ddb6c0c90.
 2011-10-28 12:32:14 +02:00
Johannes Schickel
3ddb6c0c90 AUDIO: Adapt include guard names to the "new" directory name. 2011-10-28 12:27:50 +02:00
Johannes Schickel
0e8110d3db AUDIO: Slight adaptions of SID code to our guidelines. 
This only touches #include usages and the include guard of sid.h.
 2011-10-28 12:23:50 +02:00
Johannes Schickel
3a196478c6 ALL: Reduce assignment of "" to Common::String. 
When clearing an existant object clear() should be used.

When constructing objects (or using default values for parameters) the
constructor of String without any argument should be used.

This changes only a few instances I noticed while looking over some recent
commit logs.
 2011-10-23 20:04:03 +02:00
Eugene Sandulenko
77c65648b1 AD: Swtich GUI options to a char array. 
This eliminates nasty limitation of caping number of flags to 31.
Current code has limitation of 255 flags, though.

Only SCUMM engine is converted, rest do not even compile.
Detection of fan talkie MI is broken as it has to be implemented
differently.
 2011-10-23 17:53:13 +01:00
D G Turner
a293bbbbb4 DRASCULA: Remove unecessary VOC header dependency. 
Also, remove two engines not using VOC from voc.h header.
 2011-10-09 22:13:30 +01:00
Johannes Schickel
3e1405b939 AUDIO: Add default disposeAfterUse value to makeVOCStream again. 2011-10-09 21:24:06 +02:00
Johannes Schickel
d4f54a2c97 AUDIO: Strip out some unused VOC code. 2011-10-09 21:24:00 +02:00
Johannes Schickel
221434a83f AUDIO: Remove unused makeVOCStream interface. 2011-10-09 21:23:29 +02:00
Johannes Schickel
36ce418854 AUDIO: Sync DOSBox OPL code a bit. 
This only touches a line which is not used in the current setup.
 2011-09-23 20:32:16 +02:00
athrxx
867f2887e8 SCUMM FM-TOWNS: fix invalid mem accesses 
- handle some invalid sound resources that come up when starting LOOM
- fix typo in midi driver code (causing invalid mem reads)
 2011-09-17 21:15:41 +02:00
Matthew Hoops
9a79a336aa AUDIO: Don't abuse rewind() for looping in XA 
Thanks to LordHoto for pointing out my stupidity :P
 2011-08-25 11:16:58 -04:00
Matthew Hoops
64d2e2db11 AUDIO: Cleanup the XA code 
endOfData() will not return true if the eos flag is encountered. Flag handling is a bit stricter than before (flags == 1 does not necessarily mean eos). Also removed some dead code, fixed wrong code, and fixed formatting.
 2011-08-25 11:02:08 -04:00
Matthew Hoops
37a401a172 AUDIO: Properly handle XA flags 2011-08-25 10:14:17 -04:00
Matthew Hoops
4e849092d2 AUDIO: Add a DisposeAfterUse parameter to makeXAStream 2011-08-24 09:54:19 -04:00
Matthew Hoops
40fd9ce27c AUDIO: Remove default rate parameter from xa 2011-08-24 09:54:19 -04:00
Matthew Hoops
adb69a5a39 AUDIO: Rename Vag to XA 
Vag is really an XA container, and one that we do not have a decoder for (nor need)
 2011-08-24 09:54:19 -04:00
Jordi Vilalta Prat
c72f31f5c8 I18N: Split some original messages to allow translation reusability. 2011-08-18 11:08:00 +02:00
Johannes Schickel
bb3d1f2738 AUDIO: Replace macro in emumidi code with enum. 2011-08-12 03:22:01 +02:00
Johannes Schickel
3635efd92c CMS: Simplify code a tiny bit. 2011-08-10 00:00:12 +02:00
Johannes Schickel
b95bbb2ace CMS: Do proper clipping of the sound data on generation. 
This fixes some overflows/underflows which resulted in crackling.
 2011-08-10 00:00:12 +02:00
Christoph Mallon
d1688d22d4 AUDIO: Simplify iterating backwards over an array. 2011-08-07 15:19:08 +02:00
Christoph Mallon
ab80b20a30 COMMON: Replace x + ARRAYSIZE(x) by the simpler ARRAYEND(x). 2011-08-07 15:19:08 +02:00
Christoph Mallon
e3e0a317e7 AUDIO: Simplify complicated loop condition. 
- The loop is exited with break; when stream gets assigned, so stream == NULL is always true.
- When iterating using the length of an array a terminator element is unnecessary.
 2011-08-07 15:19:08 +02:00
Christoph Mallon
a5a8833c05 COMMON: Add DisposablePtr<T>, which replaces many repeated implementations of a dispose flag. 2011-08-07 15:19:08 +02:00
Christoph Mallon
97a6ee2e64 AUDIO: #define OV_EXCLUDE_STATIC_CALLBACKS to not get unnecessary static data, which causes warnings. 2011-08-07 15:19:07 +02:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Eugene Sandulenko
2fa17c44ed JANITORIAL: Remove SVN keywords 2011-08-06 11:30:47 +01:00
Eugene Sandulenko
78f1ea7690 OSYSTEM: extended installTimerProc() with timer ID parameter 2011-08-06 11:28:35 +01:00
D G Turner
54f25aa843 COMMON: Renamed Integer Log2 function from log2 to intLog2. 
This avoids naming collisions with system libraries on some platforms
i.e. DS, DC where the log2 is realised by macro.
 2011-07-19 02:29:13 +01:00
Sven Hesse
1f3ccd4eed AUDIO: Fix stereo MS IMA ADPCM decoding 2011-07-19 03:10:10 +02:00
D G Turner
765813f750 CODECS: Replaced Integer log2 in QDM2 with Common::Math implementation. 2011-07-19 02:07:15 +01:00
athrxx
b8f6257dde SCUMM: minor bug fix in FM-Towns midi driver 2011-07-10 22:19:32 +02:00
Johannes Schickel
f1d3b35cc4 JANITORIAL: Remove svn keywords from audio/decoders/codec.h 2011-07-10 22:10:43 +02:00
Matthew Hoops
46aabed3f5 AUDIO: Fix QDM2 sound in QuickTime files 2011-07-10 15:50:47 -04:00
Matthew Hoops
c46aa548d6 AUDIO: Fix remaining AAC bugs by decoding with the same AAC context 
This introduces a new Audio::Codec class, based on DrMcCoy's solution for WMA in eos.
 2011-07-10 15:50:47 -04:00
athrxx
6c1e565db9 AUDIO: fix issue in detectDevice when config manager setting is missing 2011-07-04 08:32:20 +02:00
Julien
3ece07b14b AUDIO: Replace assignment in return call by separate assignment and return call. 2011-06-23 15:11:36 +08:00
Julien
c52cc84912 AUDIO/BACKENDS/GRAPHICS: Add error checks after allocating memory with malloc 2011-06-23 15:11:36 +08:00
Julien
2f200ac493 ANALYSIS: Fix potential memory leak when using realloc 
When reallocation is unsuccessful, the passed buffer is not freed. In this case, assigning the result (NULL) will result in a leak of the original memory buffer.
See http://msdn.microsoft.com/en-us/library/kkedhy7c.aspx
 2011-06-23 15:11:36 +08:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces 
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-06-20 00:59:48 +02:00
Eugene Sandulenko
eb13803709 AUDIO: Add complementary functions for getting channel volume and balance 2011-06-11 14:12:19 +03:00
Max Horn
55e1b08e22 AUDIO: Small cleanup in MidiParser_XMIDI::loadMusic 2011-06-10 22:15:39 +02:00
Max Horn
bdad493f3f AUDIO: Remove dead code 2011-06-10 22:15:39 +02:00
athrxx
d6e23ac67b AUDIO: improved warnings in detectDevice() 
Silent fallback would occur if the user expressly selected a formerly available audio device which now has become unavailable (switched off, disconnected, no longer compiled in, etc.). A warning dialogue will now be displayed, before the fallback takes place.
 2011-06-07 18:28:28 +02:00
Matthew Hoops
b6a9901e0a AUDIO: Remove tabs from comment spacing 2011-06-07 10:09:16 -04:00
Matthew Hoops
41e332a80d AUDIO: Clarify makeAACStream() usage 
So we don't have anyone calling the function or attempting to make the AAC code seekable or anything crazy like that.
 2011-06-07 09:52:42 -04:00
Thierry Crozat
592cca5402 GRAPHICS: Get rid of kSODFont (ScummFont) 
OSD is now using the kGUIFont instead. The main advantage is that
the kGUIFont can be used for translated text while only ASCII
characters were present in ScummFont.
 2011-06-06 23:20:08 +01:00
athrxx
40422441af AUDIO: some more text tweaks 2011-06-06 17:26:36 +02:00
Alyssa Milburn
4af3045188 I18N: Make MidiDriver detection errors translatable. 2011-06-06 12:44:28 +02:00
Willem Jan Palenstijn
5da1427d0c AUDIO: Tweak warning text 2011-06-06 12:39:06 +02:00
athrxx
506bd3c3a6 AUDIO: cleanup MidiDriver::detectDevice() 
(wrong enum usage)
 2011-06-06 01:15:59 +02:00
athrxx
8d23f692f2 AUDIO: replaced kDriverName in MidiDriver::detectDevice() 
(This is irrelevant for the MT-32 emulator, but makes sense for plugins which really have more than one device)
 2011-06-06 00:20:05 +02:00
athrxx
6d80255cec AUDIO: replace GUIErrorMessage() 
GUIErrorMessage() shouldn't be used since it changes the window caption and resets the graphics mode.
 2011-06-05 22:05:37 +02:00
athrxx
43075248aa AUDIO: fix device detection (missing rom files for MT-32 emu) 
This is an attempt to fix the problem Max described in his devel mail.
The presence of the rom files will now be checked in detectDevice().
In case of failure there will be fallback attempts.
The user will get notified of the detection failure if he has expressly selected the device that failed.

Please test with your platform / engine (with or without rom files).
 2011-06-05 18:29:13 +02:00
athrxx
85f7a01d2a FM-TOWNS AUDIO: some cleanup in midi driver code 2011-06-03 22:08:22 +02:00
Matthew Hoops
547fd1bdca COMMON: Cleanup QuickTime variable and struct naming 2011-06-03 00:58:29 -04:00
Matthew Hoops
2e06681698 COMMON: Begin objectifying QuickTimeParser::SampleDesc further 
This is preparation for multiple video and audio tracks
 2011-06-02 23:44:40 -04:00
Alyssa Milburn
eb9ea8fee6 AUDIO: Fix custom AdLib percussion instruments. 
The struct wasn't being zeroed out, a regression from b22ca4ff.
 2011-06-03 00:06:02 +02:00
athrxx
c1f00b1e8b FM-TOWNS AUDIO: fix regression 2011-06-02 16:56:01 +02:00
athrxx
4b77a5a12e FM-TOWNS AUDIO: cleanup 
(move some stuff from TownsAudioInterfaceInternal to TownsAudio_PcmChannel)
 2011-06-02 12:10:51 +02:00
athrxx
d61dc2574b AUDIO: fix some typos in comments 2011-06-02 12:10:51 +02:00
clone2727
49a8f7675f Merge pull request #20 from scott-t/t7g-ios 
T7G iOS support
 2011-06-01 07:04:05 -07:00
Max Horn
a4610df482 Merge branch 'branch-1-3-0' into master 
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
 2011-06-01 15:15:31 +02:00
Matthew Hoops
aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios 
Conflicts:
	engines/groovie/script.cpp
 2011-05-31 14:16:29 -04:00
Matthew Hoops
bf8cfcb6b7 AUDIO: Plug MPEG-4/QuickTime audio into openStreamFile 2011-05-31 13:58:05 -04:00
D G Turner
bea6858953 AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth. 2011-05-31 12:06:14 +01:00
athrxx
7f8a69d6fc FM-TOWNS AUDIO: fix destructors (thread safety) 2011-05-30 01:48:59 +02:00
athrxx
c60807cbb9 FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc. 2011-05-29 01:04:01 +02:00
Matthew Hoops
9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
Matthew Hoops
0104d56444 ALL: recognise -> recognize 2011-05-25 10:50:47 -04:00
Max Horn
e7c642b010 AUDIO: Explicitly instantiate & name RandomSource used by MAME OPL 2011-05-23 12:13:01 +02:00
md5
5838ef6719 SWORD25: Fix compilation when libvorbis is not present 
(cherry picked from commit 2d3ad096ab)
 2011-05-21 18:03:47 +02:00
agent-q
a9b5d5e2bb DS: Fix some OPL data which was incorrectly freed from the main heap on the DS port 2011-05-21 15:46:59 +01:00
athrxx
2ef8e9a202 FM-TOWNS AUDIO: fix gcc warnings 2011-05-20 20:28:18 +02:00
athrxx
2d1fa6c3f8 FM-TOWNS AUDIO: fix thread lockups and cleanup 
- fixed lockup situation in imuse destructor (only concerning the fm-towns driver)
- fixed lockup situation when AudioCDManager functions get called
(in both cases both the main thread and the mixer thread would get locked in different mutex belonging to the other thread)
 2011-05-20 20:28:15 +02:00
Johannes Schickel
ffc2a93daa AUDIO: Remove leftover "forward" declaration after real declaration in the TOWNS midi code. 2011-05-20 19:30:22 +02:00
Johannes Schickel
582827df40 AUDIO: Remove SVN Id/URL keywords from a few newly added files. 2011-05-17 23:23:44 +02:00
athrxx
7804afd4cb FM-TOWNS AUDIO: hopefully fix ps2 port compile 2011-05-17 21:43:07 +02:00
Willem Jan Palenstijn
d2d002bcc2 AUDIO: Fix warning 2011-05-17 21:24:00 +02:00
athrxx
726a7f3b1a FM-TOWNS AUDIO: Fix GCC warnings 2011-05-17 20:36:32 +02:00
athrxx
d3e92f0b81 FM-TOWNS AUDIO: Fix several CppCheck warnings 2011-05-17 20:36:32 +02:00
athrxx
b3476fc801 FM-TOWNS AUDIO: Some fixes and renaming 
- renamed some stuff in the new midi driver code
- fixed minor bug in midi driver code
- fixed minor bug in euphony driver code
- add some functionality to towns audio interface
 2011-05-17 20:36:32 +02:00
athrxx
15610b56db FM-TOWNS AUDIO: Fix some bugs and rename some stuff in the midi driver code 2011-05-17 20:36:32 +02:00
athrxx
95c059598d FM-TOWNS AUDIO: Fix note off event in midi driver 2011-05-17 20:36:32 +02:00
athrxx
c6f13d187e FM-TOWNS AUDIO: Fix some midi driver bugs 2011-05-17 20:36:32 +02:00
athrxx
8fb5906117 FM-TOWNS AUDIO: Some midi code fixes and some renaming 2011-05-17 20:36:31 +02:00
athrxx
90a300d86c FM-TOWNS AUDIO: Improve thread safety 2011-05-17 20:36:31 +02:00
athrxx
88896117da FM-TOWNS AUDIO: Some more midi driver code 2011-05-17 20:36:31 +02:00
athrxx
75770ae691 FM-TOWNS AUDIO: Fix mod wheel setting 2011-05-17 20:36:31 +02:00
athrxx
ca0e9cca3d FM-TOWNS AUDIO: Start fixing midi driver tempo 2011-05-17 20:36:31 +02:00
athrxx
9fa1b9aa36 FM-TOWNS AUDIO: More midi driver code 2011-05-17 20:36:26 +02:00
athrxx
d9772ff88f FM-TOWNS AUDIO: Some renaming in the euphony driver code 2011-05-17 20:33:03 +02:00
athrxx
bd2c84be89 FM-TOWNS AUDIO: More midi driver code (effect processing) 2011-05-17 20:33:03 +02:00
athrxx
25814e64ac FM-TOWNS AUDIO: Implement some midi commands 2011-05-17 20:33:03 +02:00
athrxx
8fe9e89c6c FM-TOWNS AUDIO: Some more midi driver code 2011-05-17 20:33:03 +02:00
athrxx
d4325a0411 FM-TOWNS AUDIO: Implement some more midi driver code 2011-05-17 20:32:53 +02:00
athrxx
2f9c5de7be FM-TOWNS AUDIO: Implement some midi driver functions 2011-05-17 20:24:30 +02:00
athrxx
6845f25f54 SCUMM: Adapt code to latest FM-TOWNS audio driver changes 2011-05-17 20:24:30 +02:00
athrxx
63a7859351 FM-TOWNS AUDIO: Change internal interface layout 2011-05-17 20:24:28 +02:00
athrxx
5c34e33c2c FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4 2011-05-17 20:24:24 +02:00
Max Horn
9b2ef340dc COMMON: Forbid use of some more symbols 2011-05-17 12:58:34 +02:00
Max Horn
a03ed0a3f7 AUDIO: Fix typo 2011-05-17 12:57:46 +02:00
Alyssa Milburn
ed1739f419 AUDIO: Clarify required parameters for mixCallback. 
Also, add an assert() to make invalid lengths obvious.
 2011-05-16 15:09:05 +02:00
md5
2d3ad096ab SWORD25: Fix compilation when libvorbis is not present 2011-05-13 21:09:31 +03:00
Matthew Hoops
bc7ff27828 AUDIO: Fix QuickTime stereo audio seeking 2011-05-13 02:22:11 -04:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Matthew Hoops
d2f5b91a9a AUDIO: Fix usage of Timestamp::convertToFramerate 2011-05-11 14:48:13 -04:00
Matthew Hoops
a1d41da096 Merge remote branch 'upstream/master' into t7g-ios 
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
 2011-05-11 00:30:28 -04:00