Commit Graph

53 Commits

Author SHA1 Message Date
Max Horn
341bc64aaf do not include common/debug.h from common/util.h
svn-id: r36143
2009-01-30 05:25:17 +00:00
Jordi Vilalta Prat
b1999a2a16 Fixed indentation and removed whitespaces at the end of line
svn-id: r35481
2008-12-22 11:22:15 +00:00
Nicola Mettifogo
12106a1599 Removed useless dependencies from common/file.h in common code. When complete removal was not possibile, dependency has been pushed to the cpp files from the headers.
svn-id: r34343
2008-09-05 11:41:39 +00:00
Johannes Schickel
d2ce912989 Fixed getTotalPlayTime implementation for MP3InputStream.
svn-id: r32755
2008-06-22 13:26:22 +00:00
Johannes Schickel
9d13d90d4f - Cleanup code for FlacInputStream::getTotalPlayTime
- Reset input stream position in MP3InputStream after calculating total play time

svn-id: r32323
2008-05-27 13:28:47 +00:00
Johannes Schickel
e82295daa3 Implemented getTotalPlayTime for MP3InputStream.
svn-id: r32322
2008-05-27 13:15:51 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Max Horn
11b2806741 Removed the old (obsolete) audiostream factories for MP3/Vorbis/FLAC data which took a File pointer and a size (these were only implemented as brain-dead wrapper around the newer factory methods anyway)
svn-id: r28110
2007-07-15 18:29:05 +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
2aeb84f12a Got rid of the last traces of DigitalTrackInfo
svn-id: r26477
2007-04-14 18:51:38 +00:00
Max Horn
f069c5e8ff Changed the MP3 playback code again, this time hopefully fixing the problems in the MI Amiga demo
svn-id: r26392
2007-04-06 17:16:49 +00:00
Max Horn
0df4d74ae6 Fixed looping of MP3 tracks (same problem as with the FLAC tracks)
svn-id: r26389
2007-04-06 13:28:33 +00:00
Max Horn
65b30d84a8 Added numLoops parameter to DigitalTrackInfo::play
svn-id: r25836
2007-02-24 23:19:53 +00:00
Max Horn
4dae49e75a cleanup
svn-id: r25794
2007-02-22 18:35:57 +00:00
Max Horn
f16ab37698 Added looping support and an enhanced factory function to the Vorbis code
svn-id: r25789
2007-02-22 14:30:12 +00:00
Max Horn
1c02ed60d0 cleanup
svn-id: r25788
2007-02-22 14:07:12 +00:00
Max Horn
2c1445056d Rewrote Ogg Vorbis code to be more flexible when it comes to seeking; also now playback from arbitrary SeekableReadStream data sources is possible
svn-id: r25784
2007-02-22 10:51:47 +00:00
Max Horn
cb40356a7b Revamed the Ogg Vorbis & FLAC DigitalTrackInfo subclasses to work similar to the MP3 one (i.e. only open the data file when about to play)
svn-id: r25757
2007-02-20 23:40:46 +00:00
Max Horn
42745b188e Added looping to the MP3 streams (currently virtually untested, so watch out)
svn-id: r25756
2007-02-20 22:18:48 +00:00
Max Horn
acdb32d84d Remove some leftover comments I made while writing the new MP3 code; make use of the new ReadStream::readStream() method in makeMP3Stream()
svn-id: r25755
2007-02-20 21:53:22 +00:00
Max Horn
91f088bb8b Rewrote MP3InputStream mostly from scratch:
- added support for  proper time-based seeking (for now internally only)
- this should permit VBR encoded MP3 audio CD tracks to be used (not tested)
- Symbian specific hacks were removed, as they hopefully aren't needed anymore
  (not tested))

This change will is likely to introduce regressions, everybody please test all
cases where we allow using MP3 encoded data

svn-id: r25750
2007-02-20 17:57:49 +00:00
Max Horn
0b2602e424 So far we only accepted track1.* as name for audio tracks -- now we also accept track01.* (we still only document the former naming scheme, intentionally)
svn-id: r25728
2007-02-19 18:17:38 +00:00
Torbjörn Andersson
612ba0c2be Some whitespace changes to see if the CIA bot is still silent.
svn-id: r23491
2006-07-13 14:01:48 +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
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
Johannes Schickel
3a9bd3c18c Fixed (wrongly) changed address in the header.
svn-id: r19733
2005-12-03 13:31:09 +00:00
Lars Persson
47ad571e0c Updated to follow ScummVM coding standards i.e spaces, indents & "studpid" things fixed.
svn-id: r19728
2005-12-02 18:36:21 +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
Eugene Sandulenko
6b4484472b Remove trailing whitespaces.
svn-id: r18604
2005-07-30 21:11:48 +00:00
Max Horn
48a00b6846 Fix warning
svn-id: r18469
2005-06-26 23:47:19 +00:00
Lars Persson
f001a43830 Updated Scummvm MP3 implementation with patch so it works with Symbian multithreading. This openingen/closing the file for each chunk to read. This does only affect the Symbian build and the other ports should work as normal.
svn-id: r18466
2005-06-26 19:44:55 +00:00
Max Horn
2de46dc8eb Moved some more stuff to namespace Audio (enough for tonight)
svn-id: r18040
2005-05-11 00:01:44 +00:00
Max Horn
1a615346ab Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
2005-05-10 23:48:48 +00:00
Max Horn
b75c969e66 Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
2005-05-10 22:56:25 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +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
Paweł Kołodziejski
c10cce6af1 fixed warnings
svn-id: r15665
2004-10-23 13:39:03 +00:00
Max Horn
9f4bf02c1e Fix playback of MP3 files till EOF in some cases
svn-id: r15587
2004-10-17 13:49:11 +00:00
Max Horn
cebd4a24cb Remove orphaned TODO
svn-id: r14517
2004-08-08 15:22:47 +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
Max Horn
aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me
svn-id: r12984
2004-02-22 14:11:16 +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
81481ad6da more MAD MP3 / Ogg Vorbis cleanup: try not to expose anything about the libs used for MP3/Vorbis support -> this eases changing the implementations, and reduces header dependencies (and thus compile time) :-)
svn-id: r12097
2004-01-03 01:25:45 +00:00
Max Horn
96e2c239c4 removed SoundMixer::playMP3CDTrack; simplified makeMP3Stream (special variant with mad_timer_t was really only needed for MP3TrackInfo class)
svn-id: r12095
2004-01-03 00:55:28 +00:00
Max Horn
ec0ebf5380 o Make use of the new LinearMemoryStream feature which allows auto-disposing the sound data
o This allows us to get rid of the ChannelRaw class
o Removed the sound index return value from several methods
o Removed all methods dealing with sound indices (i.e. stopChannel and pauseChannel)

svn-id: r11801
2003-12-21 00:44:31 +00:00