Merge remote-tracking branch 'upstream/master' into zvision
Conflicts: engines/zvision/animation/rlf_animation.cpp engines/zvision/animation_control.h engines/zvision/core/console.cpp engines/zvision/core/events.cpp engines/zvision/cursors/cursor.cpp engines/zvision/cursors/cursor_manager.cpp engines/zvision/cursors/cursor_manager.h engines/zvision/fonts/truetype_font.cpp engines/zvision/graphics/render_manager.cpp engines/zvision/graphics/render_manager.h engines/zvision/inventory/inventory_manager.h engines/zvision/inventory_manager.h engines/zvision/meta_animation.h engines/zvision/module.mk engines/zvision/scripting/actions.cpp engines/zvision/scripting/control.h engines/zvision/scripting/controls/animation_control.cpp engines/zvision/scripting/controls/animation_control.h engines/zvision/scripting/controls/input_control.cpp engines/zvision/scripting/controls/lever_control.cpp engines/zvision/scripting/controls/timer_node.cpp engines/zvision/scripting/controls/timer_node.h engines/zvision/scripting/puzzle.h engines/zvision/scripting/scr_file_handling.cpp engines/zvision/scripting/script_manager.cpp engines/zvision/scripting/script_manager.h engines/zvision/sidefx.cpp engines/zvision/sound/zork_raw.cpp engines/zvision/sound/zork_raw.h engines/zvision/video/video.cpp engines/zvision/video/zork_avi_decoder.h engines/zvision/zvision.cpp engines/zvision/zvision.h
This commit is contained in:
Marisa-Chan
commit
45589950c0
4226 changed files with 252007 additions and 79644 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -105,6 +105,9 @@ project.xcworkspace
|
||||||
|
|
||||||
/plugins
|
/plugins
|
||||||
|
|
||||||
|
/engines/plugins_table.h
|
||||||
|
/engines/engines.mk
|
||||||
|
|
||||||
/test/runner
|
/test/runner
|
||||||
/test/runner.cpp
|
/test/runner.cpp
|
||||||
/test/*.dSYM
|
/test/*.dSYM
|
||||||
|
|
@ -171,6 +174,9 @@ ipch/
|
||||||
LLVM32/
|
LLVM32/
|
||||||
LLVM64/
|
LLVM64/
|
||||||
|
|
||||||
|
#Ignore gettext generated files
|
||||||
|
/messages.mo
|
||||||
|
|
||||||
#Ignore Qt Creator project files
|
#Ignore Qt Creator project files
|
||||||
ScummVM.config
|
ScummVM.config
|
||||||
ScummVM.creator
|
ScummVM.creator
|
||||||
|
|
@ -182,3 +188,7 @@ ScummVM.includes
|
||||||
|
|
||||||
#Ignore Mac DS_Store files
|
#Ignore Mac DS_Store files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
#Ignore MS Visual C++ temporary files/subdirectories (except create_project.bat)
|
||||||
|
dists/msvc*/**
|
||||||
|
!dists/msvc*/create_project.bat
|
||||||
|
|
|
||||||
401
AUTHORS
401
AUTHORS
|
|
@ -6,9 +6,9 @@ ScummVM Team
|
||||||
|
|
||||||
PR Office
|
PR Office
|
||||||
---------
|
---------
|
||||||
Arnaud Boutonne - Public Relations Officer, Project
|
Arnaud Boutonne - Public Relations Officer, Project
|
||||||
Administrator
|
Administrator
|
||||||
Eugene Sandulenko - Project Leader
|
Eugene Sandulenko - Project Leader
|
||||||
|
|
||||||
Core Team
|
Core Team
|
||||||
---------
|
---------
|
||||||
|
|
@ -19,30 +19,30 @@ ScummVM Team
|
||||||
Retired Project Leaders
|
Retired Project Leaders
|
||||||
-----------------------
|
-----------------------
|
||||||
James Brown
|
James Brown
|
||||||
Vincent Hamm - ScummVM co-founder, Original Cruise/CinE
|
Vincent Hamm - ScummVM co-founder, Original Cruise/CinE
|
||||||
author
|
author
|
||||||
Max Horn
|
Max Horn
|
||||||
Ludvig Strigeus - Original ScummVM and SimonVM author
|
Ludvig Strigeus - Original ScummVM and SimonVM author
|
||||||
|
|
||||||
Engine Teams
|
Engine Teams
|
||||||
------------
|
------------
|
||||||
SCUMM:
|
SCUMM:
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
James Brown - (retired)
|
James Brown - (retired)
|
||||||
Jonathan Gray - (retired)
|
Jonathan Gray - (retired)
|
||||||
Vincent Hamm - (retired)
|
Vincent Hamm - (retired)
|
||||||
Max Horn - (retired)
|
Max Horn - (retired)
|
||||||
Travis Howell
|
Travis Howell
|
||||||
Pawel Kolodziejski - Codecs, iMUSE, Smush, etc.
|
Pawel Kolodziejski - Codecs, iMUSE, Smush, etc.
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
Eugene Sandulenko - FT INSANE, MM NES, MM C64, game detection,
|
Eugene Sandulenko - FT INSANE, MM NES, MM C64, game
|
||||||
Herc/CGA
|
detection, Herc/CGA
|
||||||
Ludvig Strigeus - (retired)
|
Ludvig Strigeus - (retired)
|
||||||
|
|
||||||
HE:
|
HE:
|
||||||
Jonathan Gray - (retired)
|
Jonathan Gray - (retired)
|
||||||
Travis Howell
|
Travis Howell
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
|
|
||||||
AGI:
|
AGI:
|
||||||
|
|
@ -50,19 +50,19 @@ ScummVM Team
|
||||||
Matthew Hoops
|
Matthew Hoops
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
Pawel Kolodziejski
|
Pawel Kolodziejski
|
||||||
Walter van Niftrik - (retired)
|
Walter van Niftrik - (retired)
|
||||||
Kari Salminen
|
Kari Salminen
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
David Symonds - (retired)
|
David Symonds - (retired)
|
||||||
|
|
||||||
AGOS:
|
AGOS:
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
Travis Howell
|
Travis Howell
|
||||||
Oliver Kiehl - (retired)
|
Oliver Kiehl - (retired)
|
||||||
Ludvig Strigeus - (retired)
|
Ludvig Strigeus - (retired)
|
||||||
|
|
||||||
AVALANCHE:
|
Avalanche:
|
||||||
Peter Bozso
|
Peter Bozso
|
||||||
Arnaud Boutonne
|
Arnaud Boutonne
|
||||||
|
|
||||||
|
|
@ -71,9 +71,9 @@ ScummVM Team
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
|
|
||||||
Cine:
|
Cine:
|
||||||
Vincent Hamm - (retired)
|
Vincent Hamm - (retired)
|
||||||
Pawel Kolodziejski
|
Pawel Kolodziejski
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
Kari Salminen
|
Kari Salminen
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
|
|
||||||
|
|
@ -82,7 +82,7 @@ ScummVM Team
|
||||||
|
|
||||||
CruisE:
|
CruisE:
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
Vincent Hamm - (retired)
|
Vincent Hamm - (retired)
|
||||||
|
|
||||||
Draci:
|
Draci:
|
||||||
Denis Kasak
|
Denis Kasak
|
||||||
|
|
@ -96,7 +96,7 @@ ScummVM Team
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
Bertrand Augereau
|
Bertrand Augereau
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
Vladimir Menshakov - (retired)
|
Vladimir Menshakov - (retired)
|
||||||
Willem Jan Palenstijn
|
Willem Jan Palenstijn
|
||||||
|
|
||||||
Gob:
|
Gob:
|
||||||
|
|
@ -120,10 +120,10 @@ ScummVM Team
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
|
|
||||||
Kyra:
|
Kyra:
|
||||||
Torbjorn Andersson - VQA Player
|
Torbjorn Andersson - VQA Player
|
||||||
Oystein Eftevaag
|
Oystein Eftevaag
|
||||||
Florian Kagerer
|
Florian Kagerer
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
Johannes Schickel
|
Johannes Schickel
|
||||||
|
|
||||||
Lastexpress:
|
Lastexpress:
|
||||||
|
|
@ -138,6 +138,11 @@ ScummVM Team
|
||||||
Benjamin Haisch
|
Benjamin Haisch
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
|
|
||||||
|
MADS:
|
||||||
|
Arnaud Boutonne
|
||||||
|
Paul Gilbert
|
||||||
|
Filippos Karapetis
|
||||||
|
|
||||||
Mohawk:
|
Mohawk:
|
||||||
Bastien Bouclet
|
Bastien Bouclet
|
||||||
Matthew Hoops
|
Matthew Hoops
|
||||||
|
|
@ -161,14 +166,14 @@ ScummVM Team
|
||||||
Matthew Hoops
|
Matthew Hoops
|
||||||
|
|
||||||
Queen:
|
Queen:
|
||||||
David Eriksson - (retired)
|
David Eriksson - (retired)
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
Joost Peters
|
Joost Peters
|
||||||
|
|
||||||
SAGA:
|
SAGA:
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
Daniel Balsom - Original engine reimplementation author
|
Daniel Balsom - Original engine reimplementation author
|
||||||
(retired)
|
(retired)
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
Andrew Kurushin
|
Andrew Kurushin
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
|
|
@ -176,46 +181,46 @@ ScummVM Team
|
||||||
SCI:
|
SCI:
|
||||||
Greg Frieger
|
Greg Frieger
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
Max Horn - (retired)
|
Max Horn - (retired)
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
Martin Kiewitz
|
Martin Kiewitz
|
||||||
Walter van Niftrik - (retired)
|
Walter van Niftrik - (retired)
|
||||||
Willem Jan Palenstijn
|
Willem Jan Palenstijn
|
||||||
Jordi Vilalta Prat
|
Jordi Vilalta Prat
|
||||||
Lars Skovlund
|
Lars Skovlund
|
||||||
|
|
||||||
Sky:
|
Sky:
|
||||||
Robert Goeffringmann - (retired)
|
Robert Goeffringmann - (retired)
|
||||||
Oliver Kiehl - (retired)
|
Oliver Kiehl - (retired)
|
||||||
Joost Peters
|
Joost Peters
|
||||||
|
|
||||||
Sword1:
|
Sword1:
|
||||||
Fabio Battaglia - PSX version support
|
Fabio Battaglia - PSX version support
|
||||||
Thierry Crozat - Mac version support
|
Thierry Crozat - Mac version support
|
||||||
Robert Goeffringmann - (retired)
|
Robert Goeffringmann - (retired)
|
||||||
|
|
||||||
Sword2:
|
Sword2:
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
Fabio Battaglia - PSX version support
|
Fabio Battaglia - PSX version support
|
||||||
Jonathan Gray - (retired)
|
Jonathan Gray - (retired)
|
||||||
|
|
||||||
Sword25:
|
Sword25:
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
Max Horn - (retired)
|
Max Horn - (retired)
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
|
|
||||||
TeenAgent:
|
TeenAgent:
|
||||||
Robert Megone - Help with callback rewriting
|
Robert Megone - Help with callback rewriting
|
||||||
Vladimir Menshakov - (retired)
|
Vladimir Menshakov - (retired)
|
||||||
|
|
||||||
Tinsel:
|
Tinsel:
|
||||||
Torbjorn Andersson
|
Torbjorn Andersson
|
||||||
Fabio Battaglia - PSX version support
|
Fabio Battaglia - PSX version support
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
Sven Hesse
|
Sven Hesse
|
||||||
Max Horn - (retired)
|
Max Horn - (retired)
|
||||||
Filippos Karapetis
|
Filippos Karapetis
|
||||||
Joost Peters
|
Joost Peters
|
||||||
|
|
||||||
|
|
@ -232,14 +237,18 @@ ScummVM Team
|
||||||
Sylvain Dupont
|
Sylvain Dupont
|
||||||
|
|
||||||
Touche:
|
Touche:
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
|
|
||||||
TsAGE:
|
TsAGE:
|
||||||
Arnaud Boutonne
|
Arnaud Boutonne
|
||||||
Paul Gilbert
|
Paul Gilbert
|
||||||
|
|
||||||
Tucker:
|
Tucker:
|
||||||
Gregory Montoir - (retired)
|
Gregory Montoir - (retired)
|
||||||
|
|
||||||
|
Voyeur:
|
||||||
|
Arnaud Boutonne
|
||||||
|
Paul Gilbert
|
||||||
|
|
||||||
Wintermute:
|
Wintermute:
|
||||||
Einar Johan T. Somaaen
|
Einar Johan T. Somaaen
|
||||||
|
|
@ -266,26 +275,26 @@ ScummVM Team
|
||||||
Lubomyr Lisen
|
Lubomyr Lisen
|
||||||
|
|
||||||
Maemo:
|
Maemo:
|
||||||
Frantisek Dufka - (retired)
|
Frantisek Dufka - (retired)
|
||||||
Tarek Soliman
|
Tarek Soliman
|
||||||
|
|
||||||
Nintendo 64:
|
Nintendo 64:
|
||||||
Fabio Battaglia
|
Fabio Battaglia
|
||||||
|
|
||||||
Nintendo DS:
|
Nintendo DS:
|
||||||
Bertrand Augereau - HQ software scaler
|
Bertrand Augereau - HQ software scaler
|
||||||
Neil Millstone
|
Neil Millstone
|
||||||
|
|
||||||
OpenPandora:
|
OpenPandora:
|
||||||
John Willis
|
John Willis
|
||||||
|
|
||||||
PocketPC / WinCE:
|
PocketPC / WinCE:
|
||||||
Nicolas Bacca - (retired)
|
Nicolas Bacca - (retired)
|
||||||
Ismail Khatib
|
Ismail Khatib
|
||||||
Kostas Nakos - (retired)
|
Kostas Nakos - (retired)
|
||||||
|
|
||||||
PlayStation 2:
|
PlayStation 2:
|
||||||
Robert Goeffringmann - (retired)
|
Robert Goeffringmann - (retired)
|
||||||
Max Lingua
|
Max Lingua
|
||||||
|
|
||||||
PSP (PlayStation Portable):
|
PSP (PlayStation Portable):
|
||||||
|
|
@ -293,8 +302,8 @@ ScummVM Team
|
||||||
Joost Peters
|
Joost Peters
|
||||||
|
|
||||||
SDL (Win/Linux/OS X/etc.):
|
SDL (Win/Linux/OS X/etc.):
|
||||||
Max Horn - (retired)
|
Max Horn - (retired)
|
||||||
Eugene Sandulenko - Asm routines, GFX layers
|
Eugene Sandulenko - Asm routines, GFX layers
|
||||||
|
|
||||||
SymbianOS:
|
SymbianOS:
|
||||||
Jurgen Braam
|
Jurgen Braam
|
||||||
|
|
@ -312,9 +321,9 @@ ScummVM Team
|
||||||
Other subsystems
|
Other subsystems
|
||||||
----------------
|
----------------
|
||||||
Infrastructure:
|
Infrastructure:
|
||||||
Max Horn - Backend & Engine APIs, file API, sound
|
Max Horn - Backend & Engine APIs, file API, sound
|
||||||
mixer, audiostreams, data structures, etc.
|
mixer, audiostreams, data structures,
|
||||||
(retired)
|
etc. (retired)
|
||||||
Eugene Sandulenko
|
Eugene Sandulenko
|
||||||
Johannes Schickel
|
Johannes Schickel
|
||||||
|
|
||||||
|
|
@ -324,33 +333,35 @@ ScummVM Team
|
||||||
Johannes Schickel
|
Johannes Schickel
|
||||||
|
|
||||||
Miscellaneous:
|
Miscellaneous:
|
||||||
David Corrales-Lopez - Filesystem access improvements (GSoC 2007
|
David Corrales-Lopez - Filesystem access improvements (GSoC
|
||||||
task) (retired)
|
2007 task) (retired)
|
||||||
Jerome Fisher - MT-32 emulator
|
Jerome Fisher - MT-32 emulator
|
||||||
Benjamin Haisch - Heavily improved de-/encoder for DXA videos
|
Benjamin Haisch - Heavily improved de-/encoder for DXA
|
||||||
Jochen Hoenicke - Speaker & PCjr sound support, AdLib work
|
videos
|
||||||
(retired)
|
Jochen Hoenicke - Speaker & PCjr sound support, AdLib
|
||||||
Daniel ter Laan - Restoring original Drascula tracks, and
|
work (retired)
|
||||||
writing convert_dxa.bat
|
Daniel ter Laan - Restoring original Drascula tracks, and
|
||||||
Chris Page - Return to launcher, savestate improvements,
|
writing convert_dxa.bat
|
||||||
leak fixes, ... (GSoC 2008 task) (retired)
|
Chris Page - Return to launcher, savestate
|
||||||
Robin Watts - ARM assembly routines for nice speedups on
|
improvements, leak fixes, ... (GSoC
|
||||||
several ports; improvements to the sound
|
2008 task) (retired)
|
||||||
mixer
|
Robin Watts - ARM assembly routines for nice speedups
|
||||||
|
on several ports; improvements to the
|
||||||
|
sound mixer
|
||||||
|
|
||||||
Website (code)
|
Website (code)
|
||||||
--------------
|
--------------
|
||||||
Fredrik Wendel - (retired)
|
Fredrik Wendel - (retired)
|
||||||
|
|
||||||
Website (maintenance)
|
Website (maintenance)
|
||||||
---------------------
|
---------------------
|
||||||
James Brown - IRC Logs maintainer
|
James Brown - IRC Logs maintainer
|
||||||
Thierry Crozat - Wiki maintainer
|
Thierry Crozat - Wiki maintainer
|
||||||
Andre Heider - Buildbot maintainer
|
Andre Heider - Buildbot maintainer
|
||||||
Joost Peters - Doxygen Project Documentation maintainer
|
Joost Peters - Doxygen Project Documentation maintainer
|
||||||
Jordi Vilalta Prat - Wiki maintainer
|
Jordi Vilalta Prat - Wiki maintainer
|
||||||
Eugene Sandulenko - Forum, IRC channel, Screen Shots and Mailing
|
Eugene Sandulenko - Forum, IRC channel, Screen Shots and
|
||||||
list maintainer
|
Mailing list maintainer
|
||||||
John Willis
|
John Willis
|
||||||
|
|
||||||
Website (content)
|
Website (content)
|
||||||
|
|
@ -359,31 +370,31 @@ ScummVM Team
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
Thierry Crozat - Numerous contributions to documentation
|
Thierry Crozat - Numerous contributions to documentation
|
||||||
Joachim Eberhard - Numerous contributions to documentation
|
Joachim Eberhard - Numerous contributions to documentation
|
||||||
(retired)
|
(retired)
|
||||||
Matthew Hoops - Wiki editor
|
Matthew Hoops - Wiki editor
|
||||||
|
|
||||||
Retired Team Members
|
Retired Team Members
|
||||||
--------------------
|
--------------------
|
||||||
Chris Apers - Former PalmOS porter
|
Chris Apers - Former PalmOS porter
|
||||||
Ralph Brorsen - Help with GUI implementation
|
Ralph Brorsen - Help with GUI implementation
|
||||||
Jamieson Christian - iMUSE, MIDI, all things musical
|
Jamieson Christian - iMUSE, MIDI, all things musical
|
||||||
Felix Jakschitsch - Zak256 reverse engineering
|
Felix Jakschitsch - Zak256 reverse engineering
|
||||||
Mutwin Kraus - Original MacOS porter
|
Mutwin Kraus - Original MacOS porter
|
||||||
Peter Moraliyski - Port: GP32
|
Peter Moraliyski - Port: GP32
|
||||||
Jeremy Newman - Former webmaster
|
Jeremy Newman - Former webmaster
|
||||||
Lionel Ulmer - Port: X11
|
Lionel Ulmer - Port: X11
|
||||||
Won Star - Former GP32 porter
|
Won Star - Former GP32 porter
|
||||||
|
|
||||||
Other contributions
|
Other contributions
|
||||||
*******************
|
*******************
|
||||||
Packages
|
Packages
|
||||||
--------
|
--------
|
||||||
AmigaOS 4:
|
AmigaOS 4:
|
||||||
Hans-Joerg Frieden - (retired)
|
Hans-Joerg Frieden - (retired)
|
||||||
Hubert Maier
|
Hubert Maier
|
||||||
Juha Niemimaki - (retired)
|
Juha Niemimaki - (retired)
|
||||||
|
|
||||||
Atari/FreeMiNT:
|
Atari/FreeMiNT:
|
||||||
Keith Scroggins
|
Keith Scroggins
|
||||||
|
|
@ -393,22 +404,22 @@ Other contributions
|
||||||
Luc Schrijvers
|
Luc Schrijvers
|
||||||
|
|
||||||
Debian GNU/Linux:
|
Debian GNU/Linux:
|
||||||
Tore Anderson - (retired)
|
Tore Anderson - (retired)
|
||||||
David Weinehall
|
David Weinehall
|
||||||
|
|
||||||
Fedora / RedHat:
|
Fedora / RedHat:
|
||||||
Willem Jan Palenstijn
|
Willem Jan Palenstijn
|
||||||
|
|
||||||
Mac OS X:
|
Mac OS X:
|
||||||
Max Horn - (retired)
|
Max Horn - (retired)
|
||||||
Oystein Eftevaag
|
Oystein Eftevaag
|
||||||
|
|
||||||
Mandriva:
|
Mandriva:
|
||||||
Dominik Scherer - (retired)
|
Dominik Scherer - (retired)
|
||||||
|
|
||||||
MorphOS:
|
MorphOS:
|
||||||
Fabien Coeurjoly
|
Fabien Coeurjoly
|
||||||
Ruediger Hanke - (retired)
|
Ruediger Hanke - (retired)
|
||||||
|
|
||||||
OS/2:
|
OS/2:
|
||||||
Paul Smedley
|
Paul Smedley
|
||||||
|
|
@ -426,12 +437,12 @@ Other contributions
|
||||||
Travis Howell
|
Travis Howell
|
||||||
|
|
||||||
Win64:
|
Win64:
|
||||||
Chris Gray - (retired)
|
Chris Gray - (retired)
|
||||||
Johannes Schickel
|
Johannes Schickel
|
||||||
|
|
||||||
Translations
|
GUI Translations
|
||||||
------------
|
----------------
|
||||||
Thierry Crozat - Translation Lead
|
Thierry Crozat - Translation Lead
|
||||||
|
|
||||||
Basque:
|
Basque:
|
||||||
Mikel Iturbe Urretxa
|
Mikel Iturbe Urretxa
|
||||||
|
|
@ -459,7 +470,7 @@ Other contributions
|
||||||
|
|
||||||
German:
|
German:
|
||||||
Simon Sawatzki
|
Simon Sawatzki
|
||||||
Lothar Serra Mari - (retired)
|
Lothar Serra Mari - (retired)
|
||||||
|
|
||||||
Hungarian:
|
Hungarian:
|
||||||
Alex Bevilacqua
|
Alex Bevilacqua
|
||||||
|
|
@ -493,98 +504,118 @@ Other contributions
|
||||||
Ukrainian:
|
Ukrainian:
|
||||||
Lubomyr Lisen
|
Lubomyr Lisen
|
||||||
|
|
||||||
|
Game Translations
|
||||||
|
-----------------
|
||||||
|
CGE:
|
||||||
|
Dan Serban - Soltys English translation
|
||||||
|
Victor Gonzalez - Soltys Spanish translation
|
||||||
|
Alejandro Gomez de la Munoza - Soltys Spanish translation
|
||||||
|
|
||||||
|
Drascula:
|
||||||
|
Thierry Crozat - Improve French translation
|
||||||
|
|
||||||
|
Mortevielle:
|
||||||
|
Hugo Labrande - Improve English translation
|
||||||
|
Thierry Crozat - Improve English translation
|
||||||
|
|
||||||
Websites (design)
|
Websites (design)
|
||||||
-----------------
|
-----------------
|
||||||
Dobo Balazs - Website design
|
Dobo Balazs - Website design
|
||||||
William Claydon - Skins for doxygen, buildbot and wiki
|
William Claydon - Skins for doxygen, buildbot and wiki
|
||||||
Yaroslav Fedevych - HTML/CSS for the website
|
Yaroslav Fedevych - HTML/CSS for the website
|
||||||
Jean Marc Gimenez - ScummVM logo
|
Jean Marc Gimenez - ScummVM logo
|
||||||
David Jensen - SVG logo conversion
|
David Jensen - SVG logo conversion
|
||||||
Raina - ScummVM forum buttons
|
Raina - ScummVM forum buttons
|
||||||
|
|
||||||
Code contributions
|
Code contributions
|
||||||
------------------
|
------------------
|
||||||
Ori Avtalion - Subtitle control options in the GUI; BASS GUI
|
Ori Avtalion - Subtitle control options in the GUI; BASS
|
||||||
fixes
|
GUI fixes
|
||||||
Stuart Caie - Decoders for Amiga and AtariST data files
|
Stuart Caie - Decoders for Amiga and AtariST data files
|
||||||
(AGOS engine)
|
(AGOS engine)
|
||||||
Paolo Costabel - PSP port contributions
|
Paolo Costabel - PSP port contributions
|
||||||
Martin Doucha - CinE engine objectification
|
Martin Doucha - CinE engine objectification
|
||||||
Thomas Fach-Pedersen - ProTracker module player, Smacker video
|
Thomas Fach-Pedersen - ProTracker module player, Smacker video
|
||||||
decoder
|
decoder
|
||||||
Tobias Gunkel - Sound support for C64 version of MM/Zak, Loom
|
Tobias Gunkel - Sound support for C64 version of MM/Zak,
|
||||||
PCE support
|
Loom PCE support
|
||||||
Janne Huttunen - V3 actor mask support, Dig/FT SMUSH audio
|
Janne Huttunen - V3 actor mask support, Dig/FT SMUSH audio
|
||||||
Kovacs Endre Janos - Several fixes for Simon1
|
Kovacs Endre Janos - Several fixes for Simon1
|
||||||
Jeroen Janssen - Numerous readability and bugfix patches
|
Jeroen Janssen - Numerous readability and bugfix patches
|
||||||
Keith Kaisershot - Several Pegasus Prime patches
|
Keith Kaisershot - Several Pegasus Prime patches
|
||||||
Andreas Karlsson - Initial port for SymbianOS
|
Andreas Karlsson - Initial port for SymbianOS
|
||||||
Claudio Matsuoka - Daily Linux builds
|
Claudio Matsuoka - Daily Linux builds
|
||||||
Thomas Mayer - PSP port contributions
|
Thomas Mayer - PSP port contributions
|
||||||
Sean Murray - ScummVM tools GUI application (GSoC 2007 task)
|
Sean Murray - ScummVM tools GUI application (GSoC 2007
|
||||||
n0p - Windows CE port aspect ratio correction scaler
|
task)
|
||||||
and right click input method
|
n0p - Windows CE port aspect ratio correction
|
||||||
Mikesch Nepomuk - MI1 VGA floppy patches
|
scaler and right click input method
|
||||||
Nicolas Noble - Config file and ALSA support
|
Mikesch Nepomuk - MI1 VGA floppy patches
|
||||||
Tim Phillips - Initial MI1 CD music support
|
Nicolas Noble - Config file and ALSA support
|
||||||
Quietust - Sound support for Amiga SCUMM V2/V3 games, MM
|
Tim Phillips - Initial MI1 CD music support
|
||||||
NES support
|
Quietust - Sound support for Amiga SCUMM V2/V3
|
||||||
Robert Crossfield - Improved support for Apple II/C64 versions of
|
games, MM NES support
|
||||||
MM
|
Robert Crossfield - Improved support for Apple II/C64
|
||||||
Andreas Roever - Broken Sword I & II MPEG2 cutscene support
|
versions of MM
|
||||||
Edward Rudd - Fixes for playing MP3 versions of MI1/Loom
|
Andreas Roever - Broken Sword I & II MPEG2 cutscene
|
||||||
audio
|
support
|
||||||
Daniel Schepler - Final MI1 CD music support, initial Ogg Vorbis
|
Edward Rudd - Fixes for playing MP3 versions of
|
||||||
support
|
MI1/Loom audio
|
||||||
Andre Souza - SDL-based OpenGL renderer
|
Daniel Schepler - Final MI1 CD music support, initial Ogg
|
||||||
Tom Frost - WebOS port contributions
|
Vorbis support
|
||||||
|
Andre Souza - SDL-based OpenGL renderer
|
||||||
|
Tom Frost - WebOS port contributions
|
||||||
|
|
||||||
FreeSCI Contributors
|
FreeSCI Contributors
|
||||||
--------------------
|
--------------------
|
||||||
Francois-R Boyer - MT-32 information and mapping code
|
Francois-R Boyer - MT-32 information and mapping code
|
||||||
Rainer Canavan - IRIX MIDI driver and bug fixes
|
Rainer Canavan - IRIX MIDI driver and bug fixes
|
||||||
Xiaojun Chen
|
Xiaojun Chen
|
||||||
Paul David Doherty - Game version information
|
Paul David Doherty - Game version information
|
||||||
Vyacheslav Dikonov - Config script improvements
|
Vyacheslav Dikonov - Config script improvements
|
||||||
Ruediger Hanke - Port to the MorphOS platform
|
Ruediger Hanke - Port to the MorphOS platform
|
||||||
Matt Hargett - Clean-ups, bugfixes, Hardcore QA, Win32
|
Matt Hargett - Clean-ups, bugfixes, Hardcore QA, Win32
|
||||||
Max Horn - SetJump implementation
|
Max Horn - SetJump implementation
|
||||||
Ravi I. - SCI0 sound resource specification
|
Ravi I. - SCI0 sound resource specification
|
||||||
Emmanuel Jeandel - Bugfixes and bug reports
|
Emmanuel Jeandel - Bugfixes and bug reports
|
||||||
Dmitry Jemerov - Port to the Win32 platform, numerous bugfixes
|
Dmitry Jemerov - Port to the Win32 platform, numerous
|
||||||
Chris Kehler - Makefile enhancements
|
bugfixes
|
||||||
Christopher T. Lansdown - Original CVS maintainer, Alpha compatibility
|
Chris Kehler - Makefile enhancements
|
||||||
fixes
|
Christopher T. Lansdown - Original CVS maintainer, Alpha
|
||||||
Sergey Lapin - Port of Carl's type 2 decompression code
|
compatibility fixes
|
||||||
Rickard Lind - MT-32->GM MIDI mapping magic, sound research
|
Sergey Lapin - Port of Carl's type 2 decompression code
|
||||||
Hubert Maier - AmigaOS 4 port
|
Rickard Lind - MT-32->GM MIDI mapping magic, sound
|
||||||
Johannes Manhave - Document format translation
|
research
|
||||||
Claudio Matsuoka - CVS snapshots, daily builds, BeOS and cygwin
|
Hubert Maier - AmigaOS 4 port
|
||||||
ports
|
Johannes Manhave - Document format translation
|
||||||
Dark Minister - SCI research (bytecode and parser)
|
Claudio Matsuoka - CVS snapshots, daily builds, BeOS and
|
||||||
Carl Muckenhoupt - Sources to the SCI resource viewer tools that
|
cygwin ports
|
||||||
started it all
|
Dark Minister - SCI research (bytecode and parser)
|
||||||
Anders Baden Nielsen - PPC testing
|
Carl Muckenhoupt - Sources to the SCI resource viewer tools
|
||||||
Walter van Niftrik - Ports to the Dreamcast and GP32 platforms
|
that started it all
|
||||||
Rune Orsval - Configuration file editor
|
Anders Baden Nielsen - PPC testing
|
||||||
Solomon Peachy - SDL ports and much of the sound subsystem
|
Walter van Niftrik - Ports to the Dreamcast and GP32 platforms
|
||||||
Robey Pointer - Bug tracking system hosting
|
Rune Orsval - Configuration file editor
|
||||||
Magnus Reftel - Heap implementation, Python class viewer,
|
Solomon Peachy - SDL ports and much of the sound subsystem
|
||||||
bugfixes
|
Robey Pointer - Bug tracking system hosting
|
||||||
Christoph Reichenbach - UN*X code, VM/Graphics/Sound/other
|
Magnus Reftel - Heap implementation, Python class viewer,
|
||||||
infrastructure
|
bugfixes
|
||||||
George Reid - FreeBSD package management
|
Christoph Reichenbach - UN*X code, VM/Graphics/Sound/other
|
||||||
Lars Skovlund - Project maintenance, most documentation,
|
infrastructure
|
||||||
bugfixes, SCI1 support
|
George Reid - FreeBSD package management
|
||||||
Rink Springer - Port to the DOS platform, several bug fixes
|
Lars Skovlund - Project maintenance, most documentation,
|
||||||
Rainer De Temple - SCI research
|
bugfixes, SCI1 support
|
||||||
|
Rink Springer - Port to the DOS platform, several bug
|
||||||
|
fixes
|
||||||
|
Rainer De Temple - SCI research
|
||||||
Sean Terrell
|
Sean Terrell
|
||||||
Hugues Valois - Game selection menu
|
Hugues Valois - Game selection menu
|
||||||
Jordi Vilalta - Numerous code and website clean-up patches
|
Jordi Vilalta - Numerous code and website clean-up
|
||||||
Petr Vyhnak - The DCL-INFLATE algorithm, many Win32
|
patches
|
||||||
improvements
|
Petr Vyhnak - The DCL-INFLATE algorithm, many Win32
|
||||||
Bas Zoetekouw - Man pages, debian package management, CVS
|
improvements
|
||||||
maintenance
|
Bas Zoetekouw - Man pages, debian package management, CVS
|
||||||
|
maintenance
|
||||||
|
|
||||||
Special thanks to Prof. Dr. Gary Nutt for allowing the FreeSCI VM
|
Special thanks to Prof. Dr. Gary Nutt for allowing the FreeSCI VM
|
||||||
extension as a course project in his Advanced OS course.
|
extension as a course project in his Advanced OS course.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
ScummVM
|
ScummVM
|
||||||
Copyright (C) 2001-2013 by the following:
|
Copyright (C) 2001-2014 by the following:
|
||||||
|
|
||||||
If you have contributed to this project then you deserve to be on this
|
If you have contributed to this project then you deserve to be on this
|
||||||
list. Contact us (see: AUTHORS) and we'll add you.
|
list. Contact us (see: AUTHORS) and we'll add you.
|
||||||
|
|
|
||||||
16
Makefile
16
Makefile
|
|
@ -33,8 +33,9 @@ ifeq "$(HAVE_GCC)" "1"
|
||||||
#CXXFLAGS+= -Wmissing-format-attribute
|
#CXXFLAGS+= -Wmissing-format-attribute
|
||||||
|
|
||||||
ifneq "$(BACKEND)" "tizen"
|
ifneq "$(BACKEND)" "tizen"
|
||||||
# Disable RTTI and exceptions. These settings cause tizen apps to crash
|
# Disable exceptions. This setting causes tizen apps to crash
|
||||||
CXXFLAGS+= -fno-rtti -fno-exceptions
|
# TODO: Does this still apply after enabling RTTI again?
|
||||||
|
CXXFLAGS+= -fno-exceptions
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq "$(HAVE_CLANG)" "1"
|
ifneq "$(HAVE_CLANG)" "1"
|
||||||
|
|
@ -82,7 +83,8 @@ EXECUTABLE := $(EXEPRE)scummvm$(EXEEXT)
|
||||||
include $(srcdir)/Makefile.common
|
include $(srcdir)/Makefile.common
|
||||||
|
|
||||||
# check if configure has been run or has been changed since last run
|
# check if configure has been run or has been changed since last run
|
||||||
config.h config.mk: $(srcdir)/configure $(srcdir)/engines/configure.engines
|
ENGINE_SUBDIRS_CONFIGURE := $(wildcard $(srcdir)/engines/*/configure.engine)
|
||||||
|
config.h: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE)
|
||||||
ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
|
ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
|
||||||
@echo "Running $(srcdir)/configure with the last specified parameters"
|
@echo "Running $(srcdir)/configure with the last specified parameters"
|
||||||
@sleep 2
|
@sleep 2
|
||||||
|
|
@ -94,6 +96,14 @@ else
|
||||||
$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
|
$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
config.mk engines/plugins_table.h engines/engines.mk: config.h
|
||||||
|
@if test -f $@; then \
|
||||||
|
touch $@; \
|
||||||
|
else \
|
||||||
|
rm -f config.h; \
|
||||||
|
$(MAKE) config.h; \
|
||||||
|
fi
|
||||||
|
|
||||||
ifneq ($(origin port_mk), undefined)
|
ifneq ($(origin port_mk), undefined)
|
||||||
include $(srcdir)/$(port_mk)
|
include $(srcdir)/$(port_mk)
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ all: $(EXECUTABLE) plugins
|
||||||
PLUGINS :=
|
PLUGINS :=
|
||||||
MODULES := test devtools base $(MODULES)
|
MODULES := test devtools base $(MODULES)
|
||||||
|
|
||||||
-include $(srcdir)/engines/engines.mk
|
-include engines/engines.mk
|
||||||
|
|
||||||
# After the game specific modules follow the shared modules
|
# After the game specific modules follow the shared modules
|
||||||
MODULES += \
|
MODULES += \
|
||||||
|
|
@ -25,6 +25,7 @@ MODULES += \
|
||||||
engines \
|
engines \
|
||||||
video \
|
video \
|
||||||
graphics \
|
graphics \
|
||||||
|
image \
|
||||||
audio \
|
audio \
|
||||||
common \
|
common \
|
||||||
po
|
po
|
||||||
|
|
@ -61,6 +62,7 @@ endif
|
||||||
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
||||||
ifneq ($(VERBOSE_BUILD),1)
|
ifneq ($(VERBOSE_BUILD),1)
|
||||||
ifneq ($(VERBOSE_BUILD),yes)
|
ifneq ($(VERBOSE_BUILD),yes)
|
||||||
|
QUIET_CC = @echo ' ' C ' ' $@;
|
||||||
QUIET_CXX = @echo ' ' C++ ' ' $@;
|
QUIET_CXX = @echo ' ' C++ ' ' $@;
|
||||||
QUIET_AS = @echo ' ' AS ' ' $@;
|
QUIET_AS = @echo ' ' AS ' ' $@;
|
||||||
QUIET_NASM = @echo ' ' NASM ' ' $@;
|
QUIET_NASM = @echo ' ' NASM ' ' $@;
|
||||||
|
|
@ -79,7 +81,7 @@ $(EXECUTABLE): $(OBJS)
|
||||||
$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
|
$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
|
||||||
|
|
||||||
distclean: clean clean-devtools
|
distclean: clean clean-devtools
|
||||||
$(RM) config.h config.mk config.log
|
$(RM) config.h config.mk config.log engines/engines.mk engines/plugins_table.h
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM_REC) $(DEPDIRS)
|
$(RM_REC) $(DEPDIRS)
|
||||||
|
|
@ -94,6 +96,9 @@ ifdef CXX_UPDATE_DEP_FLAG
|
||||||
|
|
||||||
# Build rule for C++ files. Makes use of CXX_UPDATE_DEP_FLAG for advanced
|
# Build rule for C++ files. Makes use of CXX_UPDATE_DEP_FLAG for advanced
|
||||||
# dependency tracking.
|
# dependency tracking.
|
||||||
|
%.o: %.c
|
||||||
|
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
|
||||||
|
$(QUIET_CC)$(CC) $(CXX_UPDATE_DEP_FLAG) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
|
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
|
||||||
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
|
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
|
||||||
|
|
@ -147,7 +152,7 @@ endif
|
||||||
# recreate them (which it can't), and in particular from looking for potential
|
# recreate them (which it can't), and in particular from looking for potential
|
||||||
# source files. This can save quite a bit of disk access time.
|
# source files. This can save quite a bit of disk access time.
|
||||||
.PHONY: $(wildcard $(addsuffix /*.d,$(DEPDIRS))) $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES))) \
|
.PHONY: $(wildcard $(addsuffix /*.d,$(DEPDIRS))) $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES))) \
|
||||||
$(srcdir)/$(port_mk) $(srcdir)/rules.mk $(srcdir)/engines/engines.mk
|
$(srcdir)/$(port_mk) $(srcdir)/rules.mk
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Get the current version information
|
# Get the current version information
|
||||||
|
|
|
||||||
61
NEWS
61
NEWS
|
|
@ -2,17 +2,66 @@ For a more comprehensive changelog of the latest experimental code, see:
|
||||||
https://github.com/scummvm/scummvm/commits/
|
https://github.com/scummvm/scummvm/commits/
|
||||||
|
|
||||||
1.7.0 (????-??-??)
|
1.7.0 (????-??-??)
|
||||||
General:
|
New Games:
|
||||||
- Updated MT-32 emulation code to version 1.3.0.
|
- Added support for Chivalry is Not Dead.
|
||||||
|
- Added support for Return to Ringworld.
|
||||||
|
- Added support for The Neverhood.
|
||||||
|
- Added support for Mortville Manor.
|
||||||
|
- Added support for Voyeur
|
||||||
|
|
||||||
Gob:
|
General:
|
||||||
- Improved video quality in Urban Runner
|
- Updated Munt MT-32 emulation code to version 1.3.0.
|
||||||
|
- Switched from our custom JPEG and PNG decoders to libjpeg(-turbo) and
|
||||||
|
libpng, which are faster and can handle more images.
|
||||||
|
(NOTE: The change to libpng was done in version 1.6.0, but it was not
|
||||||
|
added to the NEWS file).
|
||||||
|
|
||||||
|
AGOS:
|
||||||
|
- Added mouse wheel support for inventory and save game lists.
|
||||||
|
- Enabled verb name display in Simon the Sorcerer 2.
|
||||||
|
- Fixed the Feeble Files loyalty rating in the English 4CD version. (This
|
||||||
|
was apparently a bug in the original game. It is currently unknown if
|
||||||
|
other versions still have the same problem.)
|
||||||
|
|
||||||
Broken Sword 1:
|
Broken Sword 1:
|
||||||
- Added back support for MPEG-2 videos
|
- Added back support for MPEG-2 videos.
|
||||||
|
|
||||||
Broken Sword 2:
|
Broken Sword 2:
|
||||||
- Added back support for MPEG-2 videos
|
- Added back support for MPEG-2 videos.
|
||||||
|
|
||||||
|
CGE:
|
||||||
|
- Added an option to enable "Color Blind Mode" to the ScummVM GUI.
|
||||||
|
|
||||||
|
Gob:
|
||||||
|
- Improved video quality in Urban Runner.
|
||||||
|
|
||||||
|
Hopkins:
|
||||||
|
- Added an option to toggle "Gore Mode" from the ScummVM GUI.
|
||||||
|
- Fixed bug that could cause the music to stop prematurely.
|
||||||
|
|
||||||
|
SCI:
|
||||||
|
- Added support for the more detailed RAVE lip syncing data in the Windows
|
||||||
|
version of King's Quest 6. Portraits should now be much more expressive
|
||||||
|
when talking.
|
||||||
|
- Added support for simultaneous speech and subtitles in the CD versions
|
||||||
|
of Laura Bow 2 and King's Quest 6 (toggled either in-game with the new
|
||||||
|
"Dual" audio state, or via the ScummVM audio options).
|
||||||
|
- Fixed music fading.
|
||||||
|
- Fixed several script bugs in Camelot, Crazy Nick's, Hoyle 3, QFG1VGA, KQ5,
|
||||||
|
KQ6, LB2, LSL2, LSL5, Pharkas, PQ1VGA, SQ4, SQ5.
|
||||||
|
- Improved the MIDI parser so that music event processing is done more
|
||||||
|
properly.
|
||||||
|
|
||||||
|
SCUMM:
|
||||||
|
- Changed the saved game naming scheme of HE games to always contain
|
||||||
|
the target name.
|
||||||
|
- Fixed having multiple coaches in Backyard Football.
|
||||||
|
- Improved AdLib support for Loom and Indiana Jones and the Last Crusade.
|
||||||
|
This makes sound effects like, for example, the typewriter and waterfall
|
||||||
|
in Indiana Jones and the Last Crusade sound like in the original.
|
||||||
|
|
||||||
|
Tinsel:
|
||||||
|
- Discworld 1 and 2 no longer crash on big-endian systems.
|
||||||
|
|
||||||
1.6.0 (2013-05-31)
|
1.6.0 (2013-05-31)
|
||||||
New Games:
|
New Games:
|
||||||
|
|
|
||||||
69
README
69
README
|
|
@ -33,7 +33,8 @@ Table of Contents:
|
||||||
* 3.17 Winnie the Pooh notes
|
* 3.17 Winnie the Pooh notes
|
||||||
* 3.18 Troll's Tale notes
|
* 3.18 Troll's Tale notes
|
||||||
* 3.19 Dragon History notes
|
* 3.19 Dragon History notes
|
||||||
* 3.20 Known Problems
|
* 3.20 Simultaneous speech and subtitles in Sierra SCI games
|
||||||
|
* 3.21 Known Problems
|
||||||
4.0) Supported Platforms
|
4.0) Supported Platforms
|
||||||
5.0) Running ScummVM
|
5.0) Running ScummVM
|
||||||
* 5.1 Command Line Options
|
* 5.1 Command Line Options
|
||||||
|
|
@ -815,7 +816,55 @@ All game files and the walkthrough can be downloaded from
|
||||||
http://www.ucw.cz/draci-historie/index-en.html
|
http://www.ucw.cz/draci-historie/index-en.html
|
||||||
|
|
||||||
|
|
||||||
3.20) Known Problems:
|
3.20) Simultaneous speech and subtitles in Sierra SCI games:
|
||||||
|
----- ------------------------------------------------------
|
||||||
|
Certain CD versions of Sierra SCI games had both speech and text
|
||||||
|
resources. Some have an option to toggle between the two, but there are
|
||||||
|
some cases where there wasn't any option to enable both simultaneously.
|
||||||
|
In ScummVM, it is possible to enjoy a combined mode, where both speech
|
||||||
|
and text are shown at the same time. This mode can be toggled in the
|
||||||
|
ScummVM audio options, but each game has different behavior in-game
|
||||||
|
regarding speech and text toggling.
|
||||||
|
|
||||||
|
The CD games where speech and subtitles can be shown simultaneously
|
||||||
|
are:
|
||||||
|
EcoQuest 1 CD
|
||||||
|
Freddy Pharkas CD
|
||||||
|
King's Quest 6 CD
|
||||||
|
Laura Bow 2 CD
|
||||||
|
Leisure Suit Larry 6 CD
|
||||||
|
Space Quest 4 CD
|
||||||
|
|
||||||
|
EcoQuest 1 CD:
|
||||||
|
Speech and text can be toggled via the game's "Mode" option in the
|
||||||
|
options dialog, or via ScummVM's audio options.
|
||||||
|
|
||||||
|
Freddy Pharkas CD:
|
||||||
|
There is no in-game option to toggle speech and text. Only ScummVM's
|
||||||
|
audio options can be used to toggle this feature. Note that some
|
||||||
|
spoken dialog is missing from the game texts.
|
||||||
|
|
||||||
|
King's Quest 6 CD:
|
||||||
|
Speech and text can be toggled via the "Mode" button in the options
|
||||||
|
dialog (with an extra "Dual" setting added in ScummVM), or via
|
||||||
|
ScummVM's audio options.
|
||||||
|
|
||||||
|
Laura Bow 2 CD:
|
||||||
|
Speech and text can be toggled via the "Mode" button in the options
|
||||||
|
dialog (with an extra "Dual" setting added in ScummVM), or via
|
||||||
|
ScummVM's audio options.
|
||||||
|
|
||||||
|
Leisure Suit Larry 6 CD:
|
||||||
|
Either speech only or speech and text can be selected. There is no
|
||||||
|
in-game option to toggle text only. Only ScummVM's audio options can
|
||||||
|
be used to enable the text only mode.
|
||||||
|
|
||||||
|
Space Quest 4 CD:
|
||||||
|
Speech and text can be toggled via the "Display Mode" button in the
|
||||||
|
options dialog, or via ScummVM's audio options.
|
||||||
|
|
||||||
|
|
||||||
|
3.21) Known Problems:
|
||||||
----- ---------------
|
----- ---------------
|
||||||
This release has the following known problems. There is no need to
|
This release has the following known problems. There is no need to
|
||||||
report them, although patches to fix them are welcome. If you discover a
|
report them, although patches to fix them are welcome. If you discover a
|
||||||
|
|
@ -2110,6 +2159,9 @@ Flight of the Amazon Queen adds the following non-standard keywords:
|
||||||
music_mute bool If true, music is muted
|
music_mute bool If true, music is muted
|
||||||
sfx_mute bool If true, sound effects are muted
|
sfx_mute bool If true, sound effects are muted
|
||||||
|
|
||||||
|
Hopkins FBI adds the following non-standard keyword:
|
||||||
|
enable_gore bool If true, enable some optional gore content in the game
|
||||||
|
|
||||||
Jones in the Fast Lane adds the following non-standard keyword:
|
Jones in the Fast Lane adds the following non-standard keyword:
|
||||||
|
|
||||||
music_mute bool If true, CD audio is used, if available,
|
music_mute bool If true, CD audio is used, if available,
|
||||||
|
|
@ -2143,6 +2195,9 @@ Simon the Sorcerer 1 and 2 add the following non-standard keywords:
|
||||||
music_mute bool If true, music is muted
|
music_mute bool If true, music is muted
|
||||||
sfx_mute bool If true, sound effects are muted
|
sfx_mute bool If true, sound effects are muted
|
||||||
|
|
||||||
|
Soltys adds the following non-standard keyword:
|
||||||
|
enable_color_blind bool If true, original colors are replaced by a set of greys
|
||||||
|
|
||||||
The Legend of Kyrandia adds the following non-standard keyword:
|
The Legend of Kyrandia adds the following non-standard keyword:
|
||||||
|
|
||||||
walkspeed number The walk speed (0-4)
|
walkspeed number The walk speed (0-4)
|
||||||
|
|
@ -2164,6 +2219,16 @@ keywords:
|
||||||
helium_mode bool If true, people sound like they've inhaled
|
helium_mode bool If true, people sound like they've inhaled
|
||||||
Helium
|
Helium
|
||||||
|
|
||||||
|
The Neverhood adds the following non-standard keywords:
|
||||||
|
|
||||||
|
originalsaveload bool If true, the original save/load screens are
|
||||||
|
used instead of the enhanced ScummVM ones
|
||||||
|
skiphallofrecordsscenes bool
|
||||||
|
If true, allows the player to skip
|
||||||
|
past the Hall of Records storyboard scenes
|
||||||
|
scalemakingofvideos bool If true, the making of videos are scaled, so that
|
||||||
|
they use the whole screen
|
||||||
|
|
||||||
The 7th Guest adds the following non-standard keyword:
|
The 7th Guest adds the following non-standard keyword:
|
||||||
|
|
||||||
fast_movie_speed bool If true, movies are played at an increased
|
fast_movie_speed bool If true, movies are played at an increased
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -585,7 +585,7 @@ bool QuickTimeAudioDecoder::AudioSampleDesc::isAudioCodecSupported() const {
|
||||||
|
|
||||||
if (_codecTag == MKTAG('m', 'p', '4', 'a')) {
|
if (_codecTag == MKTAG('m', 'p', '4', 'a')) {
|
||||||
Common::String audioType;
|
Common::String audioType;
|
||||||
switch (_parentTrack->objectTypeMP4) {
|
switch (_objectTypeMP4) {
|
||||||
case 0x40: // AAC
|
case 0x40: // AAC
|
||||||
#ifdef USE_FAAD
|
#ifdef USE_FAAD
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -643,13 +643,13 @@ void QuickTimeAudioDecoder::AudioSampleDesc::initCodec() {
|
||||||
switch (_codecTag) {
|
switch (_codecTag) {
|
||||||
case MKTAG('Q', 'D', 'M', '2'):
|
case MKTAG('Q', 'D', 'M', '2'):
|
||||||
#ifdef AUDIO_QDM2_H
|
#ifdef AUDIO_QDM2_H
|
||||||
_codec = makeQDM2Decoder(_parentTrack->extraData);
|
_codec = makeQDM2Decoder(_extraData);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
case MKTAG('m', 'p', '4', 'a'):
|
case MKTAG('m', 'p', '4', 'a'):
|
||||||
#ifdef USE_FAAD
|
#ifdef USE_FAAD
|
||||||
if (_parentTrack->objectTypeMP4 == 0x40)
|
if (_objectTypeMP4 == 0x40)
|
||||||
_codec = makeAACDecoder(_parentTrack->extraData);
|
_codec = makeAACDecoder(_extraData);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
@ -559,7 +559,7 @@ SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, byte flag
|
||||||
|
|
||||||
SeekableAudioStream *audioStream = new VocStream(stream, (flags & Audio::FLAG_UNSIGNED) != 0, disposeAfterUse);
|
SeekableAudioStream *audioStream = new VocStream(stream, (flags & Audio::FLAG_UNSIGNED) != 0, disposeAfterUse);
|
||||||
|
|
||||||
if (audioStream && audioStream->endOfData()) {
|
if (audioStream->endOfData()) {
|
||||||
delete audioStream;
|
delete audioStream;
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/fmopl.h"
|
#include "audio/fmopl.h"
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AUDIO_FMOPL_H
|
#ifndef AUDIO_FMOPL_H
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
@ -214,13 +214,16 @@ void MidiParser::onTimer() {
|
||||||
activeNote(info.channel(), info.basic.param1, true);
|
activeNote(info.channel(), info.basic.param1, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
processEvent(info);
|
// Player::metaEvent() in SCUMM will delete the parser object,
|
||||||
|
// so return immediately if that might have happened.
|
||||||
|
bool ret = processEvent(info);
|
||||||
|
if (!ret)
|
||||||
|
return;
|
||||||
|
|
||||||
if (_abortParse)
|
if (!_abortParse) {
|
||||||
break;
|
_position._lastEventTime = eventTime;
|
||||||
|
parseNextEvent(_nextEvent);
|
||||||
_position._lastEventTime = eventTime;
|
}
|
||||||
parseNextEvent(_nextEvent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_abortParse) {
|
if (!_abortParse) {
|
||||||
|
|
@ -229,7 +232,7 @@ void MidiParser::onTimer() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MidiParser::processEvent(const EventInfo &info, bool fireEvents) {
|
bool MidiParser::processEvent(const EventInfo &info, bool fireEvents) {
|
||||||
if (info.event == 0xF0) {
|
if (info.event == 0xF0) {
|
||||||
// SysEx event
|
// SysEx event
|
||||||
// Check for trailing 0xF7 -- if present, remove it.
|
// Check for trailing 0xF7 -- if present, remove it.
|
||||||
|
|
@ -252,8 +255,7 @@ void MidiParser::processEvent(const EventInfo &info, bool fireEvents) {
|
||||||
if (fireEvents)
|
if (fireEvents)
|
||||||
_driver->metaEvent(info.ext.type, info.ext.data, (uint16)info.length);
|
_driver->metaEvent(info.ext.type, info.ext.data, (uint16)info.length);
|
||||||
}
|
}
|
||||||
_abortParse = true;
|
return false;
|
||||||
return;
|
|
||||||
} else if (info.ext.type == 0x51) {
|
} else if (info.ext.type == 0x51) {
|
||||||
if (info.length >= 3) {
|
if (info.length >= 3) {
|
||||||
setTempo(info.ext.data[0] << 16 | info.ext.data[1] << 8 | info.ext.data[2]);
|
setTempo(info.ext.data[0] << 16 | info.ext.data[1] << 8 | info.ext.data[2]);
|
||||||
|
|
@ -265,6 +267,8 @@ void MidiParser::processEvent(const EventInfo &info, bool fireEvents) {
|
||||||
if (fireEvents)
|
if (fireEvents)
|
||||||
sendToDriver(info.event, info.basic.param1, info.basic.param2);
|
sendToDriver(info.event, info.basic.param1, info.basic.param2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
@ -294,7 +294,7 @@ protected:
|
||||||
virtual void resetTracking();
|
virtual void resetTracking();
|
||||||
virtual void allNotesOff();
|
virtual void allNotesOff();
|
||||||
virtual void parseNextEvent(EventInfo &info) = 0;
|
virtual void parseNextEvent(EventInfo &info) = 0;
|
||||||
virtual void processEvent(const EventInfo &info, bool fireEvents = true);
|
virtual bool processEvent(const EventInfo &info, bool fireEvents = true);
|
||||||
|
|
||||||
void activeNote(byte channel, byte note, bool active);
|
void activeNote(byte channel, byte note, bool active);
|
||||||
void hangingNote(byte channel, byte note, uint32 ticksLeft, bool recycle = true);
|
void hangingNote(byte channel, byte note, uint32 ticksLeft, bool recycle = true);
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
@ -333,7 +333,7 @@ void MixerImpl::stopHandle(SoundHandle handle) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MixerImpl::muteSoundType(SoundType type, bool mute) {
|
void MixerImpl::muteSoundType(SoundType type, bool mute) {
|
||||||
assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings));
|
assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings));
|
||||||
_soundTypeSettings[type].mute = mute;
|
_soundTypeSettings[type].mute = mute;
|
||||||
|
|
||||||
for (int i = 0; i != NUM_CHANNELS; ++i) {
|
for (int i = 0; i != NUM_CHANNELS; ++i) {
|
||||||
|
|
@ -343,7 +343,7 @@ void MixerImpl::muteSoundType(SoundType type, bool mute) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MixerImpl::isSoundTypeMuted(SoundType type) const {
|
bool MixerImpl::isSoundTypeMuted(SoundType type) const {
|
||||||
assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings));
|
assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings));
|
||||||
return _soundTypeSettings[type].mute;
|
return _soundTypeSettings[type].mute;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -468,7 +468,7 @@ bool MixerImpl::hasActiveChannelOfType(SoundType type) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MixerImpl::setVolumeForSoundType(SoundType type, int volume) {
|
void MixerImpl::setVolumeForSoundType(SoundType type, int volume) {
|
||||||
assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings));
|
assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings));
|
||||||
|
|
||||||
// Check range
|
// Check range
|
||||||
if (volume > kMaxMixerVolume)
|
if (volume > kMaxMixerVolume)
|
||||||
|
|
@ -489,7 +489,7 @@ void MixerImpl::setVolumeForSoundType(SoundType type, int volume) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int MixerImpl::getVolumeForSoundType(SoundType type) const {
|
int MixerImpl::getVolumeForSoundType(SoundType type) const {
|
||||||
assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings));
|
assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings));
|
||||||
|
|
||||||
return _soundTypeSettings[type].volume;
|
return _soundTypeSettings[type].volume;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/mpu401.h"
|
#include "audio/mpu401.h"
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AUDIO_MUSICPLUGIN_H
|
#ifndef AUDIO_MUSICPLUGIN_H
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/error.h"
|
#include "common/error.h"
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AUDIO_NULL_H
|
#ifndef AUDIO_NULL_H
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@
|
||||||
.global _ARM_LinearRate_S
|
.global _ARM_LinearRate_S
|
||||||
.global _ARM_LinearRate_R
|
.global _ARM_LinearRate_R
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_CopyRate_M:
|
_ARM_CopyRate_M:
|
||||||
@ r0 = len
|
@ r0 = len
|
||||||
@ r1 = obuf
|
@ r1 = obuf
|
||||||
|
|
@ -73,6 +74,7 @@ CopyRate_M_loop:
|
||||||
|
|
||||||
LDMFD r13!,{r4-r7,PC}
|
LDMFD r13!,{r4-r7,PC}
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_CopyRate_S:
|
_ARM_CopyRate_S:
|
||||||
@ r0 = len
|
@ r0 = len
|
||||||
@ r1 = obuf
|
@ r1 = obuf
|
||||||
|
|
@ -111,6 +113,7 @@ CopyRate_S_loop:
|
||||||
|
|
||||||
LDMFD r13!,{r4-r7,PC}
|
LDMFD r13!,{r4-r7,PC}
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_CopyRate_R:
|
_ARM_CopyRate_R:
|
||||||
@ r0 = len
|
@ r0 = len
|
||||||
@ r1 = obuf
|
@ r1 = obuf
|
||||||
|
|
@ -149,6 +152,7 @@ CopyRate_R_loop:
|
||||||
|
|
||||||
LDMFD r13!,{r4-r7,PC}
|
LDMFD r13!,{r4-r7,PC}
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_SimpleRate_M:
|
_ARM_SimpleRate_M:
|
||||||
@ r0 = AudioStream &input
|
@ r0 = AudioStream &input
|
||||||
@ r1 = input.readBuffer
|
@ r1 = input.readBuffer
|
||||||
|
|
@ -229,6 +233,7 @@ SimpleRate_M_read:
|
||||||
B SimpleRate_M_read_return
|
B SimpleRate_M_read_return
|
||||||
|
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_SimpleRate_S:
|
_ARM_SimpleRate_S:
|
||||||
@ r0 = AudioStream &input
|
@ r0 = AudioStream &input
|
||||||
@ r1 = input.readBuffer
|
@ r1 = input.readBuffer
|
||||||
|
|
@ -308,6 +313,7 @@ SimpleRate_S_read:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_SimpleRate_R:
|
_ARM_SimpleRate_R:
|
||||||
@ r0 = AudioStream &input
|
@ r0 = AudioStream &input
|
||||||
@ r1 = input.readBuffer
|
@ r1 = input.readBuffer
|
||||||
|
|
@ -386,6 +392,7 @@ SimpleRate_R_read:
|
||||||
B SimpleRate_R_read_return
|
B SimpleRate_R_read_return
|
||||||
|
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_LinearRate_M:
|
_ARM_LinearRate_M:
|
||||||
@ r0 = AudioStream &input
|
@ r0 = AudioStream &input
|
||||||
@ r1 = input.readBuffer
|
@ r1 = input.readBuffer
|
||||||
|
|
@ -478,6 +485,7 @@ LinearRate_M_read:
|
||||||
BLT LinearRate_M_end
|
BLT LinearRate_M_end
|
||||||
B LinearRate_M_read_return
|
B LinearRate_M_read_return
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_LinearRate_S:
|
_ARM_LinearRate_S:
|
||||||
@ r0 = AudioStream &input
|
@ r0 = AudioStream &input
|
||||||
@ r1 = input.readBuffer
|
@ r1 = input.readBuffer
|
||||||
|
|
@ -580,6 +588,7 @@ LinearRate_S_read:
|
||||||
BLT LinearRate_S_end
|
BLT LinearRate_S_end
|
||||||
B LinearRate_S_read_return
|
B LinearRate_S_read_return
|
||||||
|
|
||||||
|
.align 2
|
||||||
_ARM_LinearRate_R:
|
_ARM_LinearRate_R:
|
||||||
@ r0 = AudioStream &input
|
@ r0 = AudioStream &input
|
||||||
@ r1 = input.readBuffer
|
@ r1 = input.readBuffer
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/softsynth/emumidi.h"
|
#include "audio/softsynth/emumidi.h"
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
/* ScummVM - Graphic Adventure Engine
|
/* ScummVM - Graphic Adventure Engine
|
||||||
*
|
*
|
||||||
* ScummVM is the legal property of its developers, whose names
|
* ScummVM is the legal property of its developers, whose names
|
||||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||||
* file distributed with this source distribution.
|
* file distributed with this source distribution.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/null.h"
|
#include "audio/null.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/softsynth/cms.h"
|
#include "audio/softsynth/cms.h"
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AUDIO_SOFTSYNTH_CMS_H
|
#ifndef AUDIO_SOFTSYNTH_CMS_H
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/scummsys.h"
|
#include "common/scummsys.h"
|
||||||
|
|
@ -305,7 +306,7 @@ int MidiDriver_EAS::open() {
|
||||||
warning("error opening EAS dump file");
|
warning("error opening EAS dump file");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
g_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType,
|
g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType,
|
||||||
&_soundHandle, this, -1,
|
&_soundHandle, this, -1,
|
||||||
Audio::Mixer::kMaxChannelVolume, 0,
|
Audio::Mixer::kMaxChannelVolume, 0,
|
||||||
DisposeAfterUse::NO, true);
|
DisposeAfterUse::NO, true);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AUDIO_SOFTSYNTH_EMUMIDI_H
|
#ifndef AUDIO_SOFTSYNTH_EMUMIDI_H
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/scummsys.h"
|
#include "common/scummsys.h"
|
||||||
|
|
@ -184,8 +185,7 @@ int MidiDriver_FluidSynth::open() {
|
||||||
|
|
||||||
MidiDriver_Emulated::open();
|
MidiDriver_Emulated::open();
|
||||||
|
|
||||||
// The MT-32 emulator uses kSFXSoundType here. I don't know why.
|
_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
|
||||||
_mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/scummsys.h"
|
#include "common/scummsys.h"
|
||||||
|
|
@ -80,15 +81,6 @@ protected:
|
||||||
void showLCDMessage(const char *message) {
|
void showLCDMessage(const char *message) {
|
||||||
g_system->displayMessageOnOSD(message);
|
g_system->displayMessageOnOSD(message);
|
||||||
}
|
}
|
||||||
void onDeviceReset() {}
|
|
||||||
void onDeviceReconfig() {}
|
|
||||||
void onNewReverbMode(Bit8u /* mode */) {}
|
|
||||||
void onNewReverbTime(Bit8u /* time */) {}
|
|
||||||
void onNewReverbLevel(Bit8u /* level */) {}
|
|
||||||
void onPartStateChanged(int /* partNum */, bool /* isActive */) {}
|
|
||||||
void onPolyStateChanged(int /* partNum */) {}
|
|
||||||
void onPartialStateChanged(int /* partialNum */, int /* oldPartialPhase */, int /* newPartialPhase */) {}
|
|
||||||
void onProgramChanged(int /* partNum */, char * /* patchName */) {}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // end of namespace MT32Emu
|
} // end of namespace MT32Emu
|
||||||
|
|
@ -230,7 +222,7 @@ int MidiDriver_MT32::open() {
|
||||||
|
|
||||||
g_system->updateScreen();
|
g_system->updateScreen();
|
||||||
|
|
||||||
_mixer->playStream(Audio::Mixer::kSFXSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
|
_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -460,9 +452,6 @@ bool MT32EmuMusicPlugin::checkDevice(MidiDriver::DeviceHandle) const {
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Error MT32EmuMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
|
Common::Error MT32EmuMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
|
||||||
if (ConfMan.hasKey("extrapath"))
|
|
||||||
SearchMan.addDirectory("extrapath", ConfMan.get("extrapath"));
|
|
||||||
|
|
||||||
*mididriver = new MidiDriver_MT32(g_system->getMixer());
|
*mididriver = new MidiDriver_MT32(g_system->getMixer());
|
||||||
|
|
||||||
return Common::kNoError;
|
return Common::kNoError;
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -8,18 +8,19 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*
|
*
|
||||||
* LGPL licensed version of MAMEs fmopl (V0.37a modified) by
|
* LGPL licensed version of MAMEs fmopl (V0.37a modified) by
|
||||||
* Tatsuyuki Satoh. Included from LGPL'ed AdPlug.
|
* Tatsuyuki Satoh. Included from LGPL'ed AdPlug.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
||||||
|
|
@ -8,18 +8,19 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*
|
*
|
||||||
* LGPL licensed version of MAMEs fmopl (V0.37a modified) by
|
* LGPL licensed version of MAMEs fmopl (V0.37a modified) by
|
||||||
* Tatsuyuki Satoh. Included from LGPL'ed AdPlug.
|
* Tatsuyuki Satoh. Included from LGPL'ed AdPlug.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
/* ScummVM - Graphic Adventure Engine
|
/* ScummVM - Graphic Adventure Engine
|
||||||
*
|
*
|
||||||
* ScummVM is the legal property of its developers, whose names
|
* ScummVM is the legal property of its developers, whose names
|
||||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||||
* file distributed with this source distribution.
|
* file distributed with this source distribution.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/softsynth/pcspk.h"
|
#include "audio/softsynth/pcspk.h"
|
||||||
#include "audio/null.h"
|
#include "audio/null.h"
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AUDIO_SOFTSYNTH_PCSPK_H
|
#ifndef AUDIO_SOFTSYNTH_PCSPK_H
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
* as published by the Free Software Foundation; either version 2
|
* as published by the Free Software Foundation; either version 2
|
||||||
* of the License, or (at your option) any later version.
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue