Commit Graph

112 Commits

Author SHA1 Message Date
athrxx
d7f877b3ab KYRA: pause midi sounds while gmm is running 2011-05-29 01:04:08 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Johannes Schickel
607920c869 KYRA: Fix some code errors reported by ICC (i.e. subclasses not overwriting methods by missing a const.)
svn-id: r53911
2010-10-28 23:56:36 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +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
0e420431fd Adapt KYRA to use the new FLAC, Vorbis and MP3 factories.
svn-id: r47062
2010-01-06 00:00:25 +00:00
Johannes Schickel
920dac2f9d Remove unsafe getTotalPlayTime from AudioStream.
svn-id: r47037
2010-01-05 20:14:28 +00:00
Johannes Schickel
f5c3bd887e - Add a new SeekableAudioStream interface. Soon to be used to replace audio stream specific looping code by generic code in Mixer...
- Adapted some existing AudioStreams to implement that interface (not tested!)

svn-id: r47013
2010-01-05 02:27:24 +00:00
Johannes Schickel
780ede2e71 Formatting.
svn-id: r46195
2009-11-29 13:55:26 +00:00
Johannes Schickel
46cf13307d Cleanup.
svn-id: r46194
2009-11-29 13:52:02 +00:00
Florian Kagerer
4f84154875 KYRA/PC98: fixed regression
svn-id: r46190
2009-11-29 12:18:42 +00:00
Florian Kagerer
9bd5e07d90 KYRA: added kyra 1 pc98 static data to kyra.dat (intro forest sequence is still broken)
svn-id: r45906
2009-11-14 22:51:35 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Johannes Schickel
b6d33f1667 - Cleanup
- Fix mismatching new[]/delete

svn-id: r44075
2009-09-13 21:48:02 +00:00
Florian Kagerer
b73f9ab41e KYRA: - add sfx support for PC98-Version
svn-id: r44074
2009-09-13 21:41:29 +00:00
Norbert Lange
dbe300fc53 fixed retiring of external Notes
fixed/improved counting DMAs in Paula
added flag for looping songs
rearranged maxtrax.h a bit

svn-id: r42613
2009-07-19 14:02:19 +00:00
Johannes Schickel
c353e5389b - Moved SoundAdlibPC definition to new header file sound_adlib.h
- Made the future versions of sound.h GPL only
- sound_adlib.h is dual licensed under GPL and LGPL (so AdPlug can still benefit from future changes)

svn-id: r42564
2009-07-17 13:50:59 +00:00
Johannes Schickel
51fc019a9b Implement "loadSfxFile" and "stopAllSoundEffects" for "MixedSoundDriver".
svn-id: r41011
2009-05-29 17:21:00 +00:00
Johannes Schickel
95d11e6e37 - Add new method "isVoicePresent" to "Sound".
- Change LoL character selection to use it.
- Allow quitting ScummVM in LoL character selection.

svn-id: r41008
2009-05-29 17:12:45 +00:00
Johannes Schickel
2bcf5c0552 - Moved Sound implementation declarations to the newly added file sound_intern.h
- Added support for PC Speaker sound in all Kyra1, Kyra2 and Lands of Lore
- Slight cleanup

svn-id: r40939
2009-05-27 14:40:37 +00:00
Johannes Schickel
7c1eb05714 Strip trailing whitespaces.
svn-id: r40866
2009-05-24 15:06:28 +00:00
Johannes Schickel
c0302661ed Cleanup.
svn-id: r40850
2009-05-24 01:37:51 +00:00
Johannes Schickel
344caa88fc Make various Sound functionality SoundHandle instead of filename based.
- This fixes multiple sounds being played at once in Lands of Lore

svn-id: r40848
2009-05-24 01:29:09 +00:00
Johannes Schickel
b28279accc Cleanup.
svn-id: r40841
2009-05-23 23:58:40 +00:00
Florian Kagerer
5a4b3c5441 KYRA/LOL: restructured voice playing code so that audio compression can be supported
svn-id: r40839
2009-05-23 23:33:31 +00:00
Florian Kagerer
dd84aaf648 LOL: - added some spell casting (spark, heal, swarm)
- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420
2009-05-10 13:40:28 +00:00
Florian Kagerer
ccb64ad81e LOL: - Started implementing the fighting system. The damage inflicted is wrong, however (at least the damage inflicted by the monsters). I'm sowewhat clueless about that bug atm.
- added support for monsters with distance attacks (like those orcs in front of roland's house)
- lots of small bug fixes
- Some startup support for the pc-98 16 color version. The intro will run, but the font drawing/coloring is still wrong.

svn-id: r40144
2009-04-25 13:15:05 +00:00
Florian Kagerer
6cb3f665af LOL: some more work on the text displayer so that it handles longer texts (needed for some library books)
svn-id: r39249
2009-03-08 23:28:19 +00:00
Johannes Schickel
574a7924df Implemented per voice volume control. (Used for example in LoL intro)
svn-id: r36184
2009-02-01 20:35:51 +00:00
Florian Kagerer
784c99b3da svn-id: r36178 2009-02-01 19:27:01 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Johannes Schickel
2f1babd370 Whoops changed integer size of variables storing volume information, now volume of 256 should work as expected.
svn-id: r35303
2008-12-11 13:54:18 +00:00
Johannes Schickel
c7c074895a Prevent MIDI files from being load, when they are already loaded.
svn-id: r35272
2008-12-07 13:12:09 +00:00
Johannes Schickel
c517045349 Fixed some looping MIDI sound effects.
svn-id: r35193
2008-11-30 15:15:14 +00:00
Johannes Schickel
17a699a438 Cleanup.
svn-id: r35179
2008-11-30 02:54:39 +00:00
Johannes Schickel
1fc33dbae5 - Fix some valgrind warnings
- Added MIDI SFX support for Kyra2

svn-id: r35178
2008-11-30 02:47:20 +00:00
Johannes Schickel
8142873c6a Implement fade out support for MIDI.
svn-id: r35177
2008-11-30 02:38:08 +00:00
Johannes Schickel
893a79b01d Initial version of proper MIDI support for KYRA.
svn-id: r35174
2008-11-30 01:53:32 +00:00
Florian Kagerer
807bfe5079 - KYRA: FM-Towns/PC-98 Audio: fixed several bugs and got rid of some floating point arithmetic (or at least replaced some doubles with floats)
- Improved support for PC-98 music: HOF tracks seem to be fine, KYRA should be okay, too (I can't compare with an emulator since I am missing the floppy boot disk with the executable)
- There are still tempo issues. Some tracks play way too slow, others way too fast
- PC-98 sound effects in Kyra 1 don't work (I would need the floppy disk with the executable for that)

svn-id: r33938
2008-08-16 12:38:37 +00:00
Johannes Schickel
64fe71fed3 Added a member function loadSoundFile to Sound which accepts a filename string instead of a filename list id.
svn-id: r33527
2008-08-02 15:05:19 +00:00
Florian Kagerer
b0e22db7a8 - some more work on the Hof FM-Towns/PC98 music driver
- move channels to a separate class

svn-id: r32841
2008-06-29 15:25:45 +00:00
Florian Kagerer
7b30081be2 - improved hof music support for fm-towns (driver for *.twn tracks) (still needs quite some work)
- some PC-98 music support since it uses a very similar driver, but this can't be considered working yet)
- Kyra 1 PC-98 music doen't work at all since I haven't figured out yet how to turn track numbers into the corresponding music file names (might require a hard coded track map)

svn-id: r32807
2008-06-26 19:42:59 +00:00
Johannes Schickel
3be34f071f Added support for compressed kyra3 audio files.
svn-id: r32516
2008-06-03 18:12:21 +00:00
Johannes Schickel
335eb1bf08 Committed my fix for bug #1497437 "KYRA1: Subtitles glitch during 'Speech of the Land'".
svn-id: r32260
2008-05-24 22:47:08 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
4b21c2958d Implemented helium mode support for Kyra3.
svn-id: r32028
2008-05-11 17:50:13 +00:00
Johannes Schickel
a83d79bafd Fixed typos.
svn-id: r31965
2008-05-09 13:33:31 +00:00
Johannes Schickel
b53fe83695 Silenced some g++ 4.3 warnings.
svn-id: r31956
2008-05-08 21:23:14 +00:00