Commit Graph

54 Commits

Author SHA1 Message Date
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
dhewg
948c97f31b QUEEN: Fix the journal's music volume slider
Another regression from b5af1568
2011-03-20 12:01:27 +01:00
dhewg
b5af156839 QUEEN: Init volume levels on startup
And cleanup syncSoundSettings()
Also, respect global mute settings
2011-03-19 16:04:55 +01:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
452048b271 QUEEN: Avoid hiding an overloaded virtual method
svn-id: r55819
2011-02-07 23:18:47 +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
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
2010-02-03 09:42:11 +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
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
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
68826c27da Get rid of Mixer::playRaw for good
svn-id: r47394
2010-01-19 22:19:43 +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
920dac2f9d Remove unsafe getTotalPlayTime from AudioStream.
svn-id: r47037
2010-01-05 20:14:28 +00:00
Jordi Vilalta Prat
3337be7b08 Fix indentation
svn-id: r43837
2009-08-30 20:50:23 +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
dcd52c1210 Merging more of the GSoC 2008 RTL branch: QUEEN
svn-id: r34247
2008-09-01 17:55:52 +00:00
Torbjörn Andersson
235ab94ef3 Refined the workaround for wrongly compressed audio. If the sample rate is given
as 11025 Hz, it should be 11840 Hz. However, a fixed version of compress_queen
won't necessarily produce files with that sample rate, since LAME will resample
the sounds to 12000 Hz. I.e. we can only override the rate if it's exactly 11025.

svn-id: r34169
2008-08-25 18:47:27 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Torbjörn Andersson
b79f069c58 Applied my patch #2030058 ("Workaround for incorrectly compressed FotAQ"), and
made a mention in NEWS that speech is played correctly now. Of course, we
should still provide a correctly compressed version at some point.

svn-id: r33471
2008-07-31 13:45:58 +00:00
Christopher Page
09f4fd946e Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
2008-07-21 22:46:39 +00:00
Christopher Page
45d24a58f9 QUEEN sound settings work with the GMM
svn-id: r33093
2008-07-18 01:46:33 +00:00
Gregory Montoir
cdade7eff3 fix bug #1876741: changed .SB playback rate to 11840Hz (matches dos game)
svn-id: r33079
2008-07-15 20:31:11 +00:00
Gregory Montoir
2bae0df17e fix bug #1995042: stop previous sfx playback when starting a new sfx (matches original dos code). Also removed the "sound skipping" hack in final bam scene.
svn-id: r33078
2008-07-15 20:26:12 +00:00
Christopher Page
6d1350638a Queen sound settings are now configurable through the GMM
svn-id: r32922
2008-07-05 22:04:15 +00:00
Gregory Montoir
13e9079e89 indentation
svn-id: r29671
2007-11-30 19:05:10 +00:00
Torbjörn Andersson
c1877ac20f Indentation.
svn-id: r29660
2007-11-30 04:10:28 +00:00
Gregory Montoir
c76c6e2256 added rjp1 module specific pattern playback
svn-id: r29559
2007-11-18 20:27:31 +00:00
Gregory Montoir
de750efced added support for Adlib tracks
svn-id: r29509
2007-11-15 20:21:33 +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
Chris Apers
500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +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
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
d4660cce55 Removing more semicola
svn-id: r26597
2007-04-26 19:08:53 +00:00
Gregory Montoir
a1d9bcd923 enabled music volume changes in Amiga version
svn-id: r26265
2007-03-20 23:24:54 +00:00
Gregory Montoir
00e85d9f57 fixed volume slidebar display in journal, removed unused var
svn-id: r26149
2007-03-16 22:28:25 +00:00
Gregory Montoir
a3c2c1f413 Since the amiga version handle music very differently than the PC version, the existing Music and MusicPlayer classes have been merged to a single MidiMusic class, simplifying code a bit.
svn-id: r26033
2007-03-08 22:15:20 +00:00
Gregory Montoir
82adbc025d some fixes for FOTAQ Amiga versions, cleanup
svn-id: r25886
2007-02-26 20:50:33 +00:00
Gregory Montoir
c5f5583ded added AmigaSound::playRandomPatternJungle, minor cleanup
svn-id: r25860
2007-02-25 19:01:59 +00:00
Gregory Montoir
4fbca85aef indentation
svn-id: r25787
2007-02-22 12:25:30 +00:00
Gregory Montoir
eec3543c7d some fixes with resource files handling for Amiga versions
svn-id: r25785
2007-02-22 12:12:45 +00:00
Gregory Montoir
948630c3b4 added initial support for FOTAQ amiga versions
svn-id: r25769
2007-02-21 20:27:48 +00:00
Max Horn
cc210d7512 cleanup
svn-id: r25753
2007-02-20 19:23:07 +00:00
Gregory Montoir
18cab2cc65 added basic support for playing FOTAQ amiga modules files (rjp1) instead of MIDI (code is currently #ifdef'ed out).
svn-id: r25707
2007-02-18 21:46:40 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
2007-02-03 19:05:53 +00:00
Gregory Montoir
28be8164ac simplification, removed some duplicated code
svn-id: r24783
2006-11-24 18:37:43 +00:00
Gregory Montoir
d47d545631 Fix for bug #1599393 - FOTAQ: clicks at the beginning of speech. English talkie version (and probably others) has 2 different .SB file formats, with a different size for the header data. Added code to detect that.
svn-id: r24775
2006-11-23 22:10:25 +00:00