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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
123 Commits
Author SHA1 Message Date
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 0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company. 
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
 2010-01-12 21:07:56 +00:00
Johannes Schickel 0447a7f9f8 Fix a memory leak. 
svn-id: r47227
 2010-01-10 15:23:35 +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
Johannes Schickel 616e4626f5 Since AudioStream looping is no longer handled by the Mixer, drop Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream). 
svn-id: r47160
 2010-01-08 16:27:29 +00:00
Johannes Schickel 84f3034406 - Move openStreamFile from AudioStream to SeekableAudioStream. 
- Fix documentation of openStreamFile.

svn-id: r47080
 2010-01-06 15:23:33 +00:00
Johannes Schickel fb9017c51e Adapt SAGA to use Mixer::playAudioStreamLooping instead of relying the depracted in AudioStream looping support. 
svn-id: r47063
 2010-01-06 00:00:50 +00:00
Andrew Kurushin aa147a2f5a refactor resource module: 
- struct ResourceContext => class ResourceContext
- replace "*alloc","free" with array templates
- simplify createContexts routines

svn-id: r46254
 2009-12-04 17:52:42 +00:00
Max Horn 51933629d1 Changed foo(void) to foo() in almost all non-backend source files 
svn-id: r45616
 2009-11-02 21:54:57 +00:00
Filippos Karapetis 4a4ae33825 Put back the code for playing external digital music, used by the MIDI enhancement project, which was removed in rev. #43480 
svn-id: r43485
 2009-08-17 18:25:51 +00:00
Johannes Schickel 516dd5c9a4 Slight cleanup to makeLinearDiskStream interface. 
svn-id: r43481
 2009-08-17 13:49:56 +00:00
Filippos Karapetis 77689a05a2 - Removed the custom DigitalMusicInputStream used in SAGA for the digital music in ITE CD and replaced it with the common LinearDiskStream class 
- Removed leftover code which plays standalone tracks (it's not used anywhere)

svn-id: r43480
 2009-08-17 13:25:44 +00:00
Filippos Karapetis 9d7111006d - Reworked the different file types a bit 
- Some initial work on Dinotopia's intro sequence

svn-id: r39234
 2009-03-08 15:39:19 +00:00
Filippos Karapetis 80832ffb8f Got rid of explicit game sound info 
svn-id: r35727
 2009-01-04 15:44:33 +00:00
Filippos Karapetis 203358bcb7 Improved handling of sound resources 
svn-id: r35724
 2009-01-04 14:38:03 +00:00
Eugene Sandulenko 696897b058 Whoa! Removing trailing spaces. 
svn-id: r35648
 2009-01-01 15:06:43 +00:00
Max Horn 6837416556 Made Engine::_timer protected 
svn-id: r35543
 2008-12-25 20:53:59 +00:00
Filippos Karapetis 437384a838 - Split the SAGA resource manager in 3 different ones, depending on the resource type (RSC for ITE, RES for IHNM and HRS for DINO/FTA2). The SAGA 2 HRS resource manager is still a stub 
- Added detection for the voice file of FTA2

svn-id: r35484
 2008-12-22 14:13:15 +00:00
Filippos Karapetis d0f4f97ea9 Cleaned up the mess with game IDs and game types: removed game types, reduced the game IDs and added game features where necessary 
svn-id: r35467
 2008-12-21 15:59:05 +00:00
Robin Watts 8f3b2e9b4d Remove warnings from NDS build. 
svn-id: r35172
 2008-11-29 18:01:16 +00:00
Filippos Karapetis 113a83c0da Implemented pauseEngineIntern() for the SAGA engine 
svn-id: r35007
 2008-11-11 17:34:52 +00:00
Max Horn 6aa12974bd SAGA: Some code cleanup 
svn-id: r34703
 2008-09-30 12:58:27 +00:00
Max Horn 7c0b2cfd27 Added multiple new open() methods to Common::File, which make it possible to use this class as a generic convenience wrapper around all kinds of SeekableReadStream; also renamed the name() method to the less confusing getName() 
svn-id: r34696
 2008-09-30 09:12:02 +00:00
Filippos Karapetis 6d4900ad06 Hopefully fixed the chaos with the SAGA volume values. This also fixes the broken volume introduced with the introduction of the RTL code in the engine 
svn-id: r34349
 2008-09-05 13:02:03 +00:00
Max Horn 2a06141644 Merging more of the GSoC 2008 RTL branch: SAGA 
svn-id: r34252
 2008-09-01 20:19:28 +00:00
Torbjörn Andersson eb35835f5e I believe the setVolume() function has to be guarded by a mutex. (I added this to 
the Tinsel engine a while back to fix mysterious problems, but forgot to add it
elsewhere.) Maybe this will fix the mysterious IHNM crashes, as well?

svn-id: r34048
 2008-08-20 09:12:11 +00:00
Christopher Page 9c60fd183c Sound settings for Saga can be configured from the GMM 
svn-id: r32863
 2008-07-01 03:01:11 +00:00
Filippos Karapetis 966239fc52 Code cleanup: 
- Removed sagaresnames.h
- Moved all special scenes to scene.h, and named them consistently (e.g. RID_ITE_OVERMAP_SCENE -> ITE_SCENE_OVERMAP)
- Moved all resources which were used by the ITE intro into ite_introproc.cpp
- Removed several defines which were only used once (e.g. the SFX names)
- Reordered the GameResourceDescription resources so that ITE and IHNM specific resources are placed in the end
- Updated the comment about the IHNM Mac music
- Changed the callocs in loadPalAnim to mallocs, like in the rest of the code
- Removed the MEM error

svn-id: r32282
 2008-05-26 11:10:46 +00:00
Eugene Sandulenko c8061850ed Simplify code 
svn-id: r31409
 2008-04-05 14:18:32 +00:00
Filippos Karapetis a52c6e0ba2 Added code to load (but NOT play) the external music files in the Macintosh version of IHNM. I believe that the music in the Mac version is in TFMX format, which is not supported yet 
svn-id: r31408
 2008-04-05 14:06:50 +00:00
Eugene Sandulenko 7a0c61c440 Added detection for IHNM Mac. Gampe plays, but sound and music is a big TODO 
svn-id: r31403
 2008-04-05 07:43:54 +00:00
Filippos Karapetis d9e3daae8f Removed 2 unnecessary calls to File::exists() 
svn-id: r30952
 2008-02-24 14:30:56 +00:00
Jordi Vilalta Prat 66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Paul Gilbert 6eb64102a4 Fix to remove a tab character from the GPL header 
svn-id: r30238
 2008-01-05 12:45:14 +00:00
Filippos Karapetis 063f7df4d3 Slight cleanup 
svn-id: r30217
 2008-01-04 13:34:38 +00:00
Filippos Karapetis 1e483cc857 Use CLIP template for clipping in the SAGA engine 
svn-id: r29855
 2007-12-13 20:10:13 +00:00
Filippos Karapetis 5add473048 Fix for bug #1800147 - "ITE: Scummvm exits with Audio warnings" 
svn-id: r29345
 2007-10-31 20:26:57 +00:00
Eugene Sandulenko 9a9e9d21a8 Moved MemoryStreamEndian from Saga to Common. 
svn-id: r29038
 2007-09-23 09:59:10 +00:00
Filippos Karapetis 7538fcbaef Removed a variable initialization out of a while loop 
svn-id: r28959
 2007-09-19 01:43:49 +00:00
Torbjörn Andersson 243a48138d I believe this fixes part of the music fading glitch in IHNM, but there's still 
a slight problem when the intro fades the music down. Just before starting the
new music, the old music is briefly set back to normal volume again. This could
be a script bug, but I haven't investigated it any further.

svn-id: r28833
 2007-09-02 21:40:09 +00:00
Torbjörn Andersson c51430f1d1 Remove the timer callback when the Music object is deleted. 
svn-id: r28783
 2007-09-01 11:13:57 +00:00
Filippos Karapetis 30148e505d Compressed digital music in the ITE demo versions is played correctly now 
svn-id: r28752
 2007-08-26 19:14:18 +00:00
Filippos Karapetis d4d255cd6d Implemented music pause and resume 
svn-id: r28698
 2007-08-22 16:00:45 +00:00
Filippos Karapetis cd3f8577c1 Mutexes are now used in the MIDI music playing code 
svn-id: r28697
 2007-08-22 15:28:31 +00:00
Filippos Karapetis 02e0d144e8 Implemented Music::stop 
svn-id: r28695
 2007-08-22 11:28:11 +00:00
Filippos Karapetis cd20f09a9d Cleanup: removed dead code, fixed some comments and did some layout changes 
svn-id: r28362
 2007-07-31 18:08:40 +00:00
Filippos Karapetis 2707e3a7e8 Music should not be played after changing scene if it's disabled from the options 
svn-id: r28347
 2007-07-31 00:52:00 +00:00
Filippos Karapetis 2b2af8ab5e Music works now in the IHNM demo 
svn-id: r28332
 2007-07-30 18:26:56 +00:00
Filippos Karapetis 332f74486e Possible fix for bug 1754613, part 2: changed the way compressed digital music is detected 
svn-id: r28127
 2007-07-17 18:18:50 +00:00