Commit Graph
62 Commits
Author SHA1 Message Date
Torbjörn Andersson 1e23d43006 SCUMM: Silence GCC memset() warnings
Recent GCC versions complain if you memset() a class or struct that
contain non-POD data types. Get around that by either initializing
the object when created, or by adding a reset() method.
2019-07-14 14:58:19 +03:00
Colin Snover 2e061d95c5 COMMON: Move VER macro for serializer into common code 2018-01-31 17:58:01 +01:00
Colin Snover 9916b26383 SCUMM: Replace UB-triggering serialization code with Common::Serializer
Fixes Trac#10342.
2018-01-31 17:58:01 +01:00
Matthew Hoops 1d45e08889 SCUMM: Do not reverse stereo for digital iMuse sounds 2015-09-04 23:48:40 -04:00
Johannes Schickel 3847465163 SCUMM: Make GPL headers consistent in themselves. 2014-02-18 02:39:38 +01:00
Torbjörn Andersson 08be916049 SCUMM: Verify sample width in Digital iMUSE callback. CID 1002112
Verify that 'bits' really is one of 8, 12 or 16 before decoding
the data. It's probably always the case (unless the data files are
damaged) but if it isn't we'll either try to queue NULL to the
audio stream, or queue the same buffer more than once, or free the
buffer more than once. All of which are bad, though Coverity only
noticed the last of these cases.
2013-06-04 06:11:41 +02:00
Eugene Sandulenko 78f1ea7690 OSYSTEM: extended installTimerProc() with timer ID parameter 2011-08-06 11:28:35 +01:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn b52b6b8d2b SCUMM: Resolve some code duplication 2011-04-13 11:49:25 +02:00
Max Horn 42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Max Horn 1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
2010-01-26 22:48:45 +00:00
Max Horn 7ab85cd035 SCUMM: Get rid of some redundant enum vals in iMuse digitial
svn-id: r47436
2010-01-22 14:11:33 +00:00
Max Horn dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Max Horn f0a0ed8f9e Get rid of Mixer::FLAG_REVERSE_STEREO; also change SCUMM's iMuse Digital emulation to reverse stereo again, as it once seems to have been intended
svn-id: r47374
2010-01-19 11:19:53 +00:00
Max Horn 557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn c489259353 Switch SCUMM from AppendableAudioStream to QueuingAudioStream
svn-id: r47183
2010-01-08 22:10:19 +00:00
Max Horn 432e7917a5 SCUMM: Switched opcode tables to use Common::Functor0 (a bit like Kyra does it)
svn-id: r39956
2009-04-16 09:26:37 +00:00
Max Horn 6f4b567124 SCUMM: Split intern.h into multiple headers
svn-id: r39567
2009-03-20 16:33:58 +00:00
Paweł Kołodziejski cffe7b8379 fixed radio chatter sfx
svn-id: r35804
2009-01-10 17:08:29 +00:00
Paweł Kołodziejski 5fc53e262e - added initial radio chatter sfx, still not fully correct
- remove obsolete mixerStreamRunning track variable

svn-id: r35801
2009-01-10 13:04:33 +00:00
Max Horn 6837416556 Made Engine::_timer protected
svn-id: r35543
2008-12-25 20:53:59 +00:00
Paweł Kołodziejski b422f0ba73 shutup valgrind warning
svn-id: r33206
2008-07-22 15:24:39 +00:00
Paweł Kołodziejski fec313a1ac final fix for bug #1757010
svn-id: r30604
2008-01-21 22:06:14 +00:00
Paweł Kołodziejski 77838d91e6 fix/workaround for bug #1624464, as we do not support game playing on two different CDs
svn-id: r30588
2008-01-20 17:02:28 +00:00
Paweł Kołodziejski 35fb2055b0 moved fadeDelay
svn-id: r30567
2008-01-19 17:30:49 +00:00
Paweł Kołodziejski 62d4b44502 revert code to fade out first region if jump hit
svn-id: r30566
2008-01-19 17:13:53 +00:00
Paweł Kołodziejski 72d59da6cb missed setting trackId while starSound,
added more debug output,
verification of jump code, it might have regressions

svn-id: r30565
2008-01-19 16:06:20 +00:00
Paweł Kołodziejski 00de511335 fixed support for compressed streams in dimuse
svn-id: r30564
2008-01-19 13:26:53 +00:00
Max Horn eb03de63bc iMuse Digital: Moved track & table definition from dimuse.h into separate header files
svn-id: r30550
2008-01-18 17:08:53 +00:00
Paweł Kołodziejski d85e148f4f restore TrackId meaning
svn-id: r30541
2008-01-17 22:55:22 +00:00
Paweł Kołodziejski bd32e7a6b0 experimental seek in compressed streams in dimuse in time ms resolution
svn-id: r30521
2008-01-16 22:20:34 +00:00
Paweł Kołodziejski 552353663d ops
svn-id: r30504
2008-01-15 21:38:06 +00:00
Paweł Kołodziejski 6bb2f44472 implement dimuse transition 12, not tested yet
svn-id: r30503
2008-01-15 21:35:03 +00:00
Torbjörn Andersson 5dc2caa307 Since the mixer uses 'delete' to free memory, we should allocate it with 'new'.
I don't know if I got all cases, but I no longer get any Valgrind warnings at
the beginning of CoMI when using the original sound/music files.

svn-id: r30501
2008-01-15 20:30:48 +00:00
Paweł Kołodziejski 6b34fcc2b4 added missing stoppingSequence to music transitions. still i'm not sure if it trigger properly in our imuse implementation
svn-id: r30463
2008-01-13 00:10:30 +00:00
Max Horn 690d38cfc4 Unify mixer pan/vol setting code
svn-id: r30308
2008-01-06 14:59:46 +00:00
Max Horn 79ba9686eb Fix bug #1864932: COMI: Game crashes on difficulty selection screen
svn-id: r30298
2008-01-06 13:54:19 +00:00
Max Horn 1194495ad3 cleanup
svn-id: r30284
2008-01-06 00:09:05 +00:00
Max Horn 1d34ce3baa Let the audio mixer take care of (i.e. dispose) the Track::stream object, too
svn-id: r30277
2008-01-05 23:53:28 +00:00
Max Horn 56ad5f493e Play SOU data instantly, not slightly delayed -> allows us to get rid of Track::streamSou & Track::mixerStreamRunning (have not yet removed the latter to avoid introducing a new savegame version)
svn-id: r30268
2008-01-05 22:57:36 +00:00
Max Horn f68d84b54f Moved some code which was being duplicated to methods of class Track
svn-id: r30266
2008-01-05 22:44:39 +00:00
Max Horn 923ad313dc Let the audio mixer delete the streamSou object
svn-id: r30265
2008-01-05 22:35:30 +00:00
Max Horn 3f6b2c97b7 When loading and before starting an iMuse Digitial track, reset it completely to zero
svn-id: r30262
2008-01-05 20:59:33 +00:00
Max Horn 8b12998c72 Use souStreamUsed to distinguish between 'stream' and 'streamSou' usage
svn-id: r30257
2008-01-05 20:49:18 +00:00
Paweł Kołodziejski cd84daf7f8 experimental change to prevent play first region with fade out if jump opcode is attached
svn-id: r30117
2008-01-01 15:05:27 +00:00
Max Horn 305f60e0db Patch #1839861 (Possible workaround for bugs related to cloneToFadeOutTrack): Fixes bug #1848399 and apparently also #1527274 & #1763227
svn-id: r30111
2008-01-01 11:27:29 +00:00
Nicola Mettifogo 258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn 425e6e278b cleanup (in particular, don't call something 'soundHandle' which is not a Mixer::SoundHandle)
svn-id: r28162
2007-07-22 09:17:23 +00:00
Max Horn 7a6f0b7460 SCUMM/iMuse Digital: Pause sounds after loading them
svn-id: r28158
2007-07-21 19:53:18 +00:00