thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
36170 commits 35 branches 0 tags 1.4 GiB
Commit graph

73 commits

Author SHA1 Message Date
Johannes Schickel
2e9d5a5f41 Mention in documentation of AudioStream::setNumLoops, that this function also resets the number of loops played counter. 
svn-id: r46862
 2010-01-01 22:56:18 +00:00
Johannes Schickel
bba2c8ce95 Fix getTotalPlayTime for MP3, FLAC, Vorbis and LinearMemoryStream after the latest loop related changes. 
svn-id: r46838
 2010-01-01 16:57:23 +00:00
Eugene Sandulenko
622dd0d16d Implemented setNumLoops() for common audio streams. 
Implemented getNumPlayedLoops() for common audio streams.

Requested by m_kriewitz.

svn-id: r46836
 2010-01-01 16:28:22 +00:00
Eugene Sandulenko
5ebadb10d4 Extend doxygen comment for setNumLoops() 
svn-id: r46832
 2010-01-01 15:35:12 +00:00
Martin Kiewitz
ea86c41cc5 Adding setNumLoops() to AudioStream class 
svn-id: r46819
 2010-01-01 13:11:34 +00:00
Max Horn
be4078823a cleanup 
svn-id: r45236
 2009-10-18 19:43:47 +00:00
Johannes Schickel
516dd5c9a4 Slight cleanup to makeLinearDiskStream interface. 
svn-id: r43481
 2009-08-17 13:49:56 +00:00
Neil Millstone
a135a7f938 Allow VOCs to stream from disk. Disabled by default, use symbol STREAM_AUDIO_FROM_DISK to enable. See patch #2834001. 
svn-id: r43357
 2009-08-13 21:46:41 +00:00
Max Horn
673a21b249 Added Audio::Timestamp class, based on SCI's sfx_timestamp_t; also provide a unit test for it, based on the old (and very outdated) timetest.cpp. To be used by Audio::Mixer one day... 
svn-id: r39112
 2009-03-04 06:58:28 +00:00
Johannes Schickel
af7bc93c46 Made AudioStream::getTotalPlayTime virtual (Ooops :-) 
svn-id: r32261
 2008-05-24 22:59:20 +00:00
Max Horn
68fd8b74b0 Patch #1970427: AudioStream play length querying 
svn-id: r32258
 2008-05-24 22:41:15 +00:00
Torbjörn Andersson
15b4b62fbb Fixed comments. 
svn-id: r31625
 2008-04-20 19:02:34 +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
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
8f5abc1924 Extended Audio::openStreamFile function with startTime, duration and numLoops parameters, and slightly cleaned up its code 
svn-id: r26471
 2007-04-14 17:12:43 +00:00
Max Horn
029b8c4323 Changed the order of the parameters of makeLinearInputStream to resemble Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly) 
svn-id: r25926
 2007-03-02 15:26:22 +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
Max Horn
6be027afab cleanup 
svn-id: r25906
 2007-02-28 12:54:59 +00:00
Torbjörn Andersson
2531fd5873 Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It 
could use some cleanup, and there are a couple of TODOs sprinkled throughout
the code, but it seems to work reasonably well. Until the Kyra 3 main menu is
implemented, it won't actually be used though.

It uses the appendable audio stream class, which I have moved out of the SCUMM
engine.

svn-id: r22526
 2006-05-18 21:46:07 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio 
svn-id: r22231
 2006-04-29 22:33:31 +00:00
Max Horn
ce13d8e946 cleanup 
svn-id: r21920
 2006-04-15 21:27:56 +00:00
Max Horn
406703148f Change CVS keywords to SVN keywords 
svn-id: r20515
 2006-02-11 10:05:31 +00:00
Eugene Sandulenko
ea42bad781 Update copyright notice 
svn-id: r20088
 2006-01-18 17:39:49 +00:00
Eugene Sandulenko
b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005 
svn-id: r19142
 2005-10-18 01:30:26 +00:00
Max Horn
7aa398a9d0 Clarify the AudioStream::readSample requirements 
svn-id: r18844
 2005-09-18 14:49:54 +00:00
Eugene Sandulenko
6b4484472b Remove trailing whitespaces. 
svn-id: r18604
 2005-07-30 21:11:48 +00:00
Max Horn
8b1d7b9166 When including files from common/, explicitly use the common/ prefix 
svn-id: r18444
 2005-06-24 15:23:51 +00:00
Torbjörn Andersson
13e2c224c8 This is probably not the optimal fix, but at least ScummVM compiles again. 
svn-id: r16538
 2005-01-11 08:06:19 +00:00
Max Horn
ec79a9a768 A little more moving around #include's (last one for today ;-) 
svn-id: r16534
 2005-01-10 22:51:42 +00:00
Max Horn
0fb2bd30f4 cleanup 
svn-id: r16500
 2005-01-09 15:48:27 +00:00
Max Horn
32f0dbdcb2 Moving AppendableAudioStream into SCUMM engine, as it is only used there 
svn-id: r16494
 2005-01-09 03:15:59 +00:00
Max Horn
47280d9433 Updated copyright 
svn-id: r16398
 2005-01-01 16:09:25 +00:00
Max Horn
1a7ca2dc2a AudioStream::read() has been removed quite some time ago, now making sure that change is reflected everywhere 
svn-id: r15911
 2004-11-27 13:54:09 +00:00
Max Horn
96804652a2 cleanup 
svn-id: r15863
 2004-11-22 22:52:48 +00:00
Max Horn
f66960c4b9 Remove obsolete path param 
svn-id: r15278
 2004-09-25 23:33:34 +00:00
Max Horn
61b7e2155a Fix doxygen warnings 
svn-id: r15277
 2004-09-25 23:26:46 +00:00
James Brown
9756a420a3 Use extrapath in Sword1 engine (from 0.6.0 branch). More verbose errors to go with the forthcoming new manual. Sword1 CD swapping doesn't work as expected HERE, either :) 
svn-id: r14188
 2004-07-11 04:41:48 +00:00
Paweł Kołodziejski
c7133de879 getFreeSpace() is not longer used 
svn-id: r14136
 2004-07-01 04:43:32 +00:00
Max Horn
e0eab01e63 Make use of new File refcount code; also fixed long standing bug in vorbis code (ov_clear was not being called, resulting in a file not being closed) 
svn-id: r14107
 2004-06-28 22:35:22 +00:00
Paweł Kołodziejski
43979c9012 delete CustomProcInputStream and add getFreeSpace for appendable audiostream 
svn-id: r13629
 2004-04-25 18:43:46 +00:00
Paweł Kołodziejski
6680c5368d added CustomProcInputStream 
svn-id: r13570
 2004-04-13 05:57:52 +00:00
Max Horn
aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me 
svn-id: r12984
 2004-02-22 14:11:16 +00:00
Torbjörn Andersson
a8f8ceee0f Removed now obsolete getSamplesPlayed() function. It was only ever used for 
the Broken Sword cutscenes, where it didn't work very well, and was never
fully implemented.

svn-id: r12832
 2004-02-12 17:31:33 +00:00
James Brown
04f2bc0276 Update BS2 cutscene player with changes from roever: overlay support (default, 8bit backends should define BACKEND_8BIT for fast colour remapping) and sound syncronisation. 
svn-id: r12456
 2004-01-17 14:20:32 +00:00
Max Horn
033ff78ae9 updated copyright notice 
svn-id: r12176
 2004-01-06 12:45:34 +00:00
Max Horn
bfea71b0c4 renamed AudioInputStream -> AudioStream 
svn-id: r12110
 2004-01-03 14:10:13 +00:00
Max Horn
91f5f1687c logic fix: we must do wrap around *before* read, not after. otherwise eosIntern will in some border cases return wrong results; some cleanup 
svn-id: r11932
 2003-12-26 01:32:29 +00:00
Max Horn
c55652d4a6 Rewrote make*Stream factory functions to work around bug in MSVC6 (see bug report #860067); added some comments; LinearMemoryStream now can auto-dispose the data passed to it 
svn-id: r11798
 2003-12-21 00:26:36 +00:00
Max Horn
d8903123b0 distinguish between end of stream and end of data 
svn-id: r11756
 2003-12-19 01:30:19 +00:00
Max Horn
d21fc5845d o Moved MP3 and Vorbis input streams to mp3.* resp. vorbis.* 
o Added SoundMixer::playInputStream and made some of the other play* methods use it
o Added ProcInputStream stub (not working yet) which one day may allow us to replace the premix code, and allow other fancy stuff
o Remove AudioInputStream::readBuffer default implementation (subclasses should always provide it for max. performance)
o Some minor cleanup

svn-id: r11754
 2003-12-19 00:32:47 +00:00