Commit Graph
57 Commits
Author SHA1 Message Date
Torbjörn Andersson 4fb0d1e56f JANITORIAL: Increase buffer size to fix potential overflow
Caught by GCC 7 (though the warning seemed misleading to me). Since
SoundDesc->name can potentially be 14 characters "%s_reg%03d.fla"
can be 25 characters, plus the terminating \0.
2017-08-06 12:00:32 +02:00
Ori Avtalion 3564032330 JANITORIAL: Reduce audio header dependencies 2016-04-14 16:10:21 +03:00
Johannes Schickel 3847465163 SCUMM: Make GPL headers consistent in themselves. 2014-02-18 02:39:38 +01:00
Eugene Sandulenko 2362498d54 SCUMM: Fix potential memory leak. CID 1003586 2013-11-03 01:28:03 +02:00
Rodrigo Rebello be2f292457 SCUMM: Fix unused variable warnings 2013-10-03 01:47:02 -03:00
Max Horn b37463fe59 SCUMM: Move class ResourceManager to its own header 2011-05-13 11:47:08 +02:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn 9c2ff87db7 SCUMM: Fix bug #3187622 (COMI: incorrect decoding of audio codec 13/15) 2011-04-13 11:49:25 +02:00
Max Horn b52b6b8d2b SCUMM: Resolve some code duplication 2011-04-13 11:49:25 +02:00
Max Horn 0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
Max Horn 42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn 54e0390752 SCUMM: Replace Common::File uses by SeekableReadStream and SearchMan
svn-id: r54434
2010-11-23 22:25:10 +00:00
Max Horn 2180b2d6b5 COMMON: Split common/stream.h into several headers
svn-id: r54385
2010-11-19 17:03:07 +00:00
Johannes Schickel ef70f6996b Fix another mismatching new[] call (note that this needs to be replaced by malloc, since else MemoryReadStream will try to use free on an new[] allocated block.)
svn-id: r48162
2010-03-04 17:46:18 +00:00
Johannes Schickel fe35d372da - Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
2010-02-03 09:42:11 +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 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 7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +00:00
Johannes Schickel 5243157eb1 Adapt digital iMuse to use SeekableAudioStream::seek, instead of ryling on the deprecated FLAC, Vorbis and MP3 interface.
svn-id: r47064
2010-01-06 00:01:27 +00:00
Johannes Schickel 81a94a0644 - Put the new factories for MP3, Vorbis and FLAC in place.
- Marked the loop factories with loop related parameters as deprecated.

svn-id: r47061
2010-01-05 23:59:28 +00:00
Travis Howell 122ff32d75 Remove excess spaces.
svn-id: r44029
2009-09-11 10:13:54 +00:00
Torbjörn Andersson 0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn a49a3c6aaa cleanup
svn-id: r33135
2008-07-20 16:27:12 +00:00
Paweł Kołodziejski ec66f6765c added experimental hack to code to prevent the same start music again if old one didn't have chance finish. it's fix bug #1861704, it may fix other similiar things when seq is to null. added few changes to debug logs.
svn-id: r30590
2008-01-20 19:30:48 +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 2671e5083c malloc -> new, free -> delete, added few asserts
svn-id: r30561
2008-01-19 11:14:28 +00:00
Paweł Kołodziejski f0e131c9c3 fixed, it might overflow int32
svn-id: r30560
2008-01-19 10:58:43 +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 6b33041172 ops
svn-id: r30519
2008-01-16 20:03:54 +00:00
Paweł Kołodziejski bb2c102cbb clarify warning
svn-id: r30518
2008-01-16 20:01:35 +00:00
Torbjörn Andersson fe12cf8096 Fixed bad memory access. (Wrong index variable when reading sound->marker[].)
svn-id: r30506
2008-01-15 21:56:53 +00:00
Torbjörn Andersson 08f1357451 Use scumm_stricmp() instead of plain stricmp().
svn-id: r30505
2008-01-15 21:46:12 +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 d0e5df5bfa ops
svn-id: r30500
2008-01-15 20:11:28 +00:00
Paweł Kołodziejski c3d4abe4b7 fix last commit to release, and add version 2 fallback for compressed files
svn-id: r30499
2008-01-15 20:09:56 +00:00
Paweł Kołodziejski 75099c6c20 forgot release string in the 'marker'
svn-id: r30495
2008-01-15 19:34:35 +00:00
Paweł Kołodziejski 4b9d2e9370 implement loading markers "exit". dumped version 3 for compressed bun files, compress tools are not ready
svn-id: r30494
2008-01-15 12:51:26 +00:00
Max Horn 84e5398b1c store the disk sounds/music were actually *loaded* from, instead of the 'current' disk
svn-id: r30310
2008-01-06 16:02:38 +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
Sven Hesse 2dd1dd5300 Fixing Full Throttle. If I understand the code correctly, this *should* be correct not break anything else. ;)
svn-id: r28338
2007-07-30 19:54:51 +00:00
Travis Howell de29c28483 Only set soundMode, if compressed segment exists.
svn-id: r28227
2007-07-27 01:33:05 +00:00
Filippos Karapetis 533ebe13d2 Fix for bug #1761530 - "COMI: iMUSE-related crash on startup"
svn-id: r28226
2007-07-27 00:59:12 +00:00
Travis Howell e243dc8e36 Add support for FLAC compression of sound bundles in The Dig and COMI.
svn-id: r28173
2007-07-23 02:34:21 +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 f4c0b853cc Fixed sound factory messup caused by my previous commit
svn-id: r28111
2007-07-15 19:24:00 +00:00
Paweł Kołodziejski e51845f053 rename some imuse variables
svn-id: r27039
2007-06-01 11:22:49 +00:00
Max Horn 218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn 8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Gregory Montoir 7fa8e652a0 added missing MKID_BE macros
svn-id: r25560
2007-02-13 20:58:20 +00:00