ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
55 Commits
Author SHA1 Message Date
Willem Jan Palenstijn 09fc458f15 SCI: Report sound stream loading errors 2013-04-20 16:13:41 +02:00
Filippos Karapetis b19ccb9d1e SCI: Set the correct audio type for SCI1.1 sound effects, fixing bug #3554709 
Now, sound effects in SCI1.1 games will no longer be incorrectly using the speech
sound volume. This avoids them being silenced in floppy games that are flagged
as not having speech. Fixes bug #3554709 - "SCI: Digital SFX don't play when
Override Global Audio set"
 2012-08-20 03:22:56 +03: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
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +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
Filippos Karapetis 9149100629 SCI: Several changes related to robot files 
- Added WIP robot sound support (which has pops between each frame for some reason)
- Now handling a lot of previously ignored fields
- Now handling the chunk before the palette chunk properly. Fixes some v6 videos
- Added known robot related TODOs

svn-id: r55793
 2011-02-06 11:51:21 +00:00
Filippos Karapetis 512bcf8b90 SCI: Rewrote the robot playing code in a way similar to other video decoders 
- The code now streams videos instead of loading them in memory, without utilizing seeking
- Removed the sound-related robot code from the graphics classes
- Started implementing the code for the sound in robot videos (still not finished)

svn-id: r55772
 2011-02-04 17:51:59 +00:00
Matthew Hoops a6891a4372 SCI: Fix Mac sync resource support 
svn-id: r55716
 2011-02-02 02:20:25 +00:00
Filippos Karapetis 401a8c355d SCI: Some initial work on the sound of robot videos (doesn't work yet, seems to be a problem with the encoding of the customized SOL audio files in robot videos) 
svn-id: r55023
 2010-12-23 13:11: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
Max Horn 059944e59c COMMON: Push #include audiocd.h in system.h out to .cpp files 
svn-id: r54148
 2010-11-08 23:07:42 +00:00
Alejandro Marzini fb4086cadb Merged from trunk, from Rev 50841 to HEAD 
svn-id: r51495
 2010-07-30 05:28:09 +00:00
Matthew Hoops 7a86204e5c SOUND: Move the Mac snd decoder from SCI to /sound 
For use with Kyra1 Mac instrument samples. T7G Mac and Loom Mac also use this format for their custom instrument samples.

svn-id: r51327
 2010-07-26 18:13:35 +00:00
Alejandro Marzini 609e08d5db Merged from trunk, from Rev 49499 to HEAD 
svn-id: r50840
 2010-07-13 04:31:15 +00:00
Filippos Karapetis a1dc56429c SCI: Removed duplicate warning for missing audio samples 
svn-id: r50560
 2010-07-01 17:42:39 +00:00
Max Horn b09996cb5c SCI: Rewrap yet more comments 
svn-id: r50505
 2010-06-29 20:50:52 +00:00
Matthew Hoops bb9f556c36 Add support for the QFG3 demo audio map and audio resources. Based on a patch by Walter. 
svn-id: r50144
 2010-06-22 15:18:55 +00:00
Filippos Karapetis 0e365131ac Fixed wPlayAudio, and added some documentation on the 3 new kDoAudio subops. Digital sounds in Pharkas work again 
svn-id: r49928
 2010-06-17 12:29:58 +00:00
Max Horn f936443252 SCI: Saner and simpler conversion from msecs to ticks 
svn-id: r49846
 2010-06-15 12:34:33 +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
Alejandro Marzini e1ef3cd9fc Renamed getAudioCD to getAudioCDManager. 
svn-id: r49678
 2010-06-15 04:13:12 +00:00
Filippos Karapetis f4739f9f68 Added debug output to kDoAudio and some music commands. Also added a warning when an audio stream can't be created. Finally, the debug level of the MIDI parser debug output has been raised to 4, as it's too verbose 
svn-id: r49605
 2010-06-12 11:41:22 +00:00
Matthew Hoops 9f907aac09 kSciAudioWPlay should not actually play the song, but 'pre-load' it. We fake the pre-loading with a flag that will return 0 if the song has been called with kSciAudioWPlay. Fixes the dream sequence sound in MUMG. 
svn-id: r49583
 2010-06-10 20:26:59 +00:00
Matthew Hoops 6ad04a4a96 Add support for AIFF sound in SCI32 Mac games and add support for AIFF/WAVE audio36 patches; minor cleanup. 
svn-id: r49576
 2010-06-10 15:06:25 +00:00
Alejandro Marzini e991cd8c53 - Revised abstract AudioCDManager. 
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548
 2010-06-09 20:09:57 +00:00
Filippos Karapetis ba11596572 SCI: Silenced warning when no audio decoder is compiled in 
svn-id: r49351
 2010-05-31 12:36:42 +00:00
Filippos Karapetis 67de5b1bd3 Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name 
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase

svn-id: r49317
 2010-05-29 23:37:15 +00:00
Matthew Hoops 3dda73d9a2 Add initial support for KQ6 Mac. Wrapper functions for read/writing to pointers are now used (found in util.*) for code that has different endianness in SCI1.1+ Mac games. Add support for Mac 'snd ' and 'CURS' resources. QFG1 Mac is not yet playable due to script compression. 
svn-id: r49070
 2010-05-18 04:17:58 +00:00
Martin Kiewitz 1060b82f18 SCI: copying over compressed audio (mp3/ogg/flac) buffers, because resourcemanager may free the memory at any time - fixes pseudo-random crashes - also added several assert()s after multiple malloc()s 
svn-id: r48912
 2010-05-03 15:10:25 +00:00
Martin Kiewitz b4d35b3279 SCI: calculate sampleLen for WAVEs as well 
svn-id: r48906
 2010-05-03 13:30:09 +00:00
Martin Kiewitz df679afe19 SCI: calculate sampleLen for compressed audio (mp3/ogg/flac) as well 
svn-id: r48903
 2010-05-03 11:58:45 +00:00
Martin Kiewitz e3ac8713e3 SCI: fix bugs in audio decompression (mp3, ogg, flac) 
svn-id: r48880
 2010-05-01 14:04:48 +00:00
Martin Kiewitz 13ee099090 SCI: audio compression support 
svn-id: r48856
 2010-04-29 15:54:59 +00:00
Max Horn a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Max Horn ee1110a114 SCI: Reduce header interdependencies 
svn-id: r48086
 2010-02-17 23:38:43 +00:00
Max Horn 86e34c3464 SCI: Rename some members of class Resource 
svn-id: r48085
 2010-02-17 23:37:59 +00:00
Max Horn f86618f92b SCI: Add a 'SELECTOR' macro 
svn-id: r47918
 2010-02-05 22:55:18 +00:00
Johannes Schickel a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream. 
svn-id: r47716
 2010-01-30 15:26:54 +00:00
Max Horn 4ffec28103 SCI: Move selector stuff to new header; reorder k_argc & k_argp param of invoke_selector 
svn-id: r47665
 2010-01-29 11:03:54 +00:00
Matthew Hoops 9f2a619c06 SCI2.1 and onwards uses the 'new' DPCM8 which differs only by order. This fixes sound in the GK2 demo slideshow. Also, fix a logic bug with endianness in the DPCM decoders. 
svn-id: r47590
 2010-01-27 05:10:38 +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
Johannes Schickel aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Max Horn 4b996e7de7 Reorder params to Audio::makeRawMemoryStream 
svn-id: r47492
 2010-01-23 23:55:35 +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 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 69be747621 Move raw audio streams to new header sound/raw.h 
svn-id: r47368
 2010-01-19 00:54:06 +00:00
Max Horn 349fcd1d71 Rename 'Linear' audio streams to 'raw' 
svn-id: r47367
 2010-01-19 00:52:41 +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 6ca0570fe3 - Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream. 
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.

svn-id: r47226
 2010-01-10 15:20:14 +00:00