[Scummvm-cvs-logs] SF.net SVN: scummvm: [32702] scummvm/branches/gsoc2008-gui
Tanoku at users.sourceforge.net
Tanoku at users.sourceforge.net
Sat Jun 14 16:44:31 CEST 2008
Revision: 32702
http://scummvm.svn.sourceforge.net/scummvm/?rev=32702&view=rev
Author: Tanoku
Date: 2008-06-14 07:44:29 -0700 (Sat, 14 Jun 2008)
Log Message:
-----------
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
Modified Paths:
--------------
scummvm/branches/gsoc2008-gui/AUTHORS
scummvm/branches/gsoc2008-gui/Makefile
scummvm/branches/gsoc2008-gui/Makefile.common
scummvm/branches/gsoc2008-gui/NEWS
scummvm/branches/gsoc2008-gui/README
scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.cpp
scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.h
scummvm/branches/gsoc2008-gui/backends/midi/alsa.cpp
scummvm/branches/gsoc2008-gui/backends/midi/camd.cpp
scummvm/branches/gsoc2008-gui/backends/midi/coreaudio.cpp
scummvm/branches/gsoc2008-gui/backends/midi/coremidi.cpp
scummvm/branches/gsoc2008-gui/backends/midi/dmedia.cpp
scummvm/branches/gsoc2008-gui/backends/midi/quicktime.cpp
scummvm/branches/gsoc2008-gui/backends/midi/seq.cpp
scummvm/branches/gsoc2008-gui/backends/midi/timidity.cpp
scummvm/branches/gsoc2008-gui/backends/midi/windows.cpp
scummvm/branches/gsoc2008-gui/backends/midi/ypa1.cpp
scummvm/branches/gsoc2008-gui/backends/midi/zodiac.cpp
scummvm/branches/gsoc2008-gui/backends/module.mk
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.cpp
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.h
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/extend.cpp
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_kyra.h
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_sword1.h
scummvm/branches/gsoc2008-gui/backends/platform/dc/selector.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/Makefile
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/source/main.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/buildkeyboard.bat
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/lib/readme.txt
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/makefile
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/adpcm_arm.s
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters.s
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters_arm.s
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/cdaudio.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/cdaudio.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/compressor/lz.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/console2.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/dsmain.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/dsoptions.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/dsoptions.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/disc_io.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/disc_io.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_dldi.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_dldi.s
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_efa2.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_efa2.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_fcsr.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_fcsr.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_m3_common.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_m3_common.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_m3cf.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_m3cf.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_m3sd.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_m3sd_asm.s
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_mmcf.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_mmcf.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_mpcf.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_mpcf.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_njsd.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_njsd.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_nmmc.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_nmmc.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_sccf.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_sccf.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_scsd.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_scsd.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_scsd_asm.s
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_sd_common.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/fat/io_sd_common.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/gbampsave.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/gbampsave.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/keys.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/mad/readme.txt
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/portdefs.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/portdefs.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/ramsave.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/ramsave.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/scummconsole.c
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/scummconsole.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/scummhelp.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/scummhelp.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/touchkeyboard.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/touchkeyboard.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/wordcompletion.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/wordcompletion.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/zipreader.cpp
scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/zipreader.h
scummvm/branches/gsoc2008-gui/backends/platform/ds/makefile
scummvm/branches/gsoc2008-gui/backends/platform/sdl/events.cpp
scummvm/branches/gsoc2008-gui/backends/platform/sdl/sdl.cpp
scummvm/branches/gsoc2008-gui/backends/platform/symbian/src/SymbianOS.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wince/CELauncherDialog.cpp
scummvm/branches/gsoc2008-gui/backends/plugins/dc/dc-provider.cpp
scummvm/branches/gsoc2008-gui/backends/plugins/dc/dc-provider.h
scummvm/branches/gsoc2008-gui/backends/plugins/dynamic-plugin.h
scummvm/branches/gsoc2008-gui/backends/plugins/win32/win32-provider.cpp
scummvm/branches/gsoc2008-gui/backends/plugins/win32/win32-provider.h
scummvm/branches/gsoc2008-gui/base/commandLine.cpp
scummvm/branches/gsoc2008-gui/base/game.cpp
scummvm/branches/gsoc2008-gui/base/game.h
scummvm/branches/gsoc2008-gui/base/main.cpp
scummvm/branches/gsoc2008-gui/base/plugins.cpp
scummvm/branches/gsoc2008-gui/base/plugins.h
scummvm/branches/gsoc2008-gui/common/advancedDetector.cpp
scummvm/branches/gsoc2008-gui/common/advancedDetector.h
scummvm/branches/gsoc2008-gui/common/array.h
scummvm/branches/gsoc2008-gui/common/file.cpp
scummvm/branches/gsoc2008-gui/common/file.h
scummvm/branches/gsoc2008-gui/common/hash-str.h
scummvm/branches/gsoc2008-gui/common/hashmap.h
scummvm/branches/gsoc2008-gui/common/module.mk
scummvm/branches/gsoc2008-gui/common/rect.h
scummvm/branches/gsoc2008-gui/common/scummsys.h
scummvm/branches/gsoc2008-gui/common/system.cpp
scummvm/branches/gsoc2008-gui/common/system.h
scummvm/branches/gsoc2008-gui/common/util.cpp
scummvm/branches/gsoc2008-gui/common/util.h
scummvm/branches/gsoc2008-gui/configure
scummvm/branches/gsoc2008-gui/dists/engine-data/kyra.dat
scummvm/branches/gsoc2008-gui/dists/msvc7/cruise.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/drascula.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/gob.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/kyra.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/made.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/parallaction.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/saga.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/scumm.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc7/scummvm.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/cruise.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/drascula.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/gob.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/kyra.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/made.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/parallaction.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/saga.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/scumm.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc71/scummvm.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/cruise.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/drascula.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/gob.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/kyra.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/made.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/parallaction.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/saga.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/scumm.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8/scummvm.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc8_to_msvc7_71.bat
scummvm/branches/gsoc2008-gui/dists/msvc9/cruise.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/drascula.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/gob.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/kyra.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/made.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/parallaction.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/saga.vcproj
scummvm/branches/gsoc2008-gui/dists/msvc9/scummvm.vcproj
scummvm/branches/gsoc2008-gui/engines/agi/detection.cpp
scummvm/branches/gsoc2008-gui/engines/agi/preagi_mickey.cpp
scummvm/branches/gsoc2008-gui/engines/agos/agos.cpp
scummvm/branches/gsoc2008-gui/engines/agos/agos.h
scummvm/branches/gsoc2008-gui/engines/cine/anim.cpp
scummvm/branches/gsoc2008-gui/engines/cine/bg.cpp
scummvm/branches/gsoc2008-gui/engines/cine/bg.h
scummvm/branches/gsoc2008-gui/engines/cine/bg_list.cpp
scummvm/branches/gsoc2008-gui/engines/cine/bg_list.h
scummvm/branches/gsoc2008-gui/engines/cine/cine.cpp
scummvm/branches/gsoc2008-gui/engines/cine/cine.h
scummvm/branches/gsoc2008-gui/engines/cine/gfx.cpp
scummvm/branches/gsoc2008-gui/engines/cine/gfx.h
scummvm/branches/gsoc2008-gui/engines/cine/main_loop.cpp
scummvm/branches/gsoc2008-gui/engines/cine/object.cpp
scummvm/branches/gsoc2008-gui/engines/cine/pal.cpp
scummvm/branches/gsoc2008-gui/engines/cine/pal.h
scummvm/branches/gsoc2008-gui/engines/cine/part.cpp
scummvm/branches/gsoc2008-gui/engines/cine/prc.cpp
scummvm/branches/gsoc2008-gui/engines/cine/rel.cpp
scummvm/branches/gsoc2008-gui/engines/cine/script.h
scummvm/branches/gsoc2008-gui/engines/cine/script_fw.cpp
scummvm/branches/gsoc2008-gui/engines/cine/script_os.cpp
scummvm/branches/gsoc2008-gui/engines/cine/texte.cpp
scummvm/branches/gsoc2008-gui/engines/cine/texte.h
scummvm/branches/gsoc2008-gui/engines/cine/unpack.cpp
scummvm/branches/gsoc2008-gui/engines/cine/unpack.h
scummvm/branches/gsoc2008-gui/engines/cine/various.cpp
scummvm/branches/gsoc2008-gui/engines/cine/various.h
scummvm/branches/gsoc2008-gui/engines/cine/xref.txt
scummvm/branches/gsoc2008-gui/engines/cruise/cruise_main.h
scummvm/branches/gsoc2008-gui/engines/cruise/module.mk
scummvm/branches/gsoc2008-gui/engines/drascula/animation.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/detection.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/drascula.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/drascula.h
scummvm/branches/gsoc2008-gui/engines/drascula/module.mk
scummvm/branches/gsoc2008-gui/engines/drascula/rooms.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/talk.cpp
scummvm/branches/gsoc2008-gui/engines/gob/coktelvideo.cpp
scummvm/branches/gsoc2008-gui/engines/gob/coktelvideo.h
scummvm/branches/gsoc2008-gui/engines/gob/dataio.cpp
scummvm/branches/gsoc2008-gui/engines/gob/detection.cpp
scummvm/branches/gsoc2008-gui/engines/gob/draw.cpp
scummvm/branches/gsoc2008-gui/engines/gob/draw_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/draw_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/driver_vga.cpp
scummvm/branches/gsoc2008-gui/engines/gob/game.cpp
scummvm/branches/gsoc2008-gui/engines/gob/game.h
scummvm/branches/gsoc2008-gui/engines/gob/game_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/game_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/global.cpp
scummvm/branches/gsoc2008-gui/engines/gob/global.h
scummvm/branches/gsoc2008-gui/engines/gob/gob.cpp
scummvm/branches/gsoc2008-gui/engines/gob/gob.h
scummvm/branches/gsoc2008-gui/engines/gob/goblin.cpp
scummvm/branches/gsoc2008-gui/engines/gob/goblin.h
scummvm/branches/gsoc2008-gui/engines/gob/goblin_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/goblin_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/goblin_v4.cpp
scummvm/branches/gsoc2008-gui/engines/gob/init.cpp
scummvm/branches/gsoc2008-gui/engines/gob/init_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/init_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/inter.cpp
scummvm/branches/gsoc2008-gui/engines/gob/inter.h
scummvm/branches/gsoc2008-gui/engines/gob/inter_bargon.cpp
scummvm/branches/gsoc2008-gui/engines/gob/inter_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/inter_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/inter_v4.cpp
scummvm/branches/gsoc2008-gui/engines/gob/map.cpp
scummvm/branches/gsoc2008-gui/engines/gob/map_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/map_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/map_v4.cpp
scummvm/branches/gsoc2008-gui/engines/gob/module.mk
scummvm/branches/gsoc2008-gui/engines/gob/mult.cpp
scummvm/branches/gsoc2008-gui/engines/gob/mult.h
scummvm/branches/gsoc2008-gui/engines/gob/mult_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/mult_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/parse.cpp
scummvm/branches/gsoc2008-gui/engines/gob/parse_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/parse_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/saveload.cpp
scummvm/branches/gsoc2008-gui/engines/gob/saveload.h
scummvm/branches/gsoc2008-gui/engines/gob/saveload_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/saveload_v3.cpp
scummvm/branches/gsoc2008-gui/engines/gob/scenery.cpp
scummvm/branches/gsoc2008-gui/engines/gob/scenery.h
scummvm/branches/gsoc2008-gui/engines/gob/scenery_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/scenery_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/util.cpp
scummvm/branches/gsoc2008-gui/engines/gob/video.cpp
scummvm/branches/gsoc2008-gui/engines/gob/video.h
scummvm/branches/gsoc2008-gui/engines/gob/video_v1.cpp
scummvm/branches/gsoc2008-gui/engines/gob/video_v2.cpp
scummvm/branches/gsoc2008-gui/engines/gob/videoplayer.cpp
scummvm/branches/gsoc2008-gui/engines/gob/videoplayer.h
scummvm/branches/gsoc2008-gui/engines/kyra/animator_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/animator_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/debugger.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/debugger.h
scummvm/branches/gsoc2008-gui/engines/kyra/detection.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui.h
scummvm/branches/gsoc2008-gui/engines/kyra/gui_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui_mr.h
scummvm/branches/gsoc2008-gui/engines/kyra/gui_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui_v2.h
scummvm/branches/gsoc2008-gui/engines/kyra/items_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/items_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/items_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_hof.h
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_mr.h
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v2.h
scummvm/branches/gsoc2008-gui/engines/kyra/module.mk
scummvm/branches/gsoc2008-gui/engines/kyra/resource.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/resource.h
scummvm/branches/gsoc2008-gui/engines/kyra/saveload.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/saveload_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen.h
scummvm/branches/gsoc2008-gui/engines/kyra/screen_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen_hof.h
scummvm/branches/gsoc2008-gui/engines/kyra/screen_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen_v2.h
scummvm/branches/gsoc2008-gui/engines/kyra/script.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/script.h
scummvm/branches/gsoc2008-gui/engines/kyra/script_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/script_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/script_tim.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/script_tim.h
scummvm/branches/gsoc2008-gui/engines/kyra/script_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/seqplayer.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/seqplayer.h
scummvm/branches/gsoc2008-gui/engines/kyra/sequences_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sequences_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sequences_v2.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sound.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sound.h
scummvm/branches/gsoc2008-gui/engines/kyra/sound_adlib.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sound_digital.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sound_towns.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sprites.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sprites.h
scummvm/branches/gsoc2008-gui/engines/kyra/staticres.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/text.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/text.h
scummvm/branches/gsoc2008-gui/engines/kyra/text_hof.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/text_hof.h
scummvm/branches/gsoc2008-gui/engines/kyra/text_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/timer.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/timer.h
scummvm/branches/gsoc2008-gui/engines/kyra/timer_mr.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/vqa.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/vqa.h
scummvm/branches/gsoc2008-gui/engines/kyra/wsamovie.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/wsamovie.h
scummvm/branches/gsoc2008-gui/engines/lure/game.cpp
scummvm/branches/gsoc2008-gui/engines/lure/lure.cpp
scummvm/branches/gsoc2008-gui/engines/lure/lure.h
scummvm/branches/gsoc2008-gui/engines/lure/res.cpp
scummvm/branches/gsoc2008-gui/engines/lure/res_struct.cpp
scummvm/branches/gsoc2008-gui/engines/m4/converse.cpp
scummvm/branches/gsoc2008-gui/engines/m4/converse.h
scummvm/branches/gsoc2008-gui/engines/m4/font.cpp
scummvm/branches/gsoc2008-gui/engines/m4/m4.cpp
scummvm/branches/gsoc2008-gui/engines/m4/script.h
scummvm/branches/gsoc2008-gui/engines/made/database.cpp
scummvm/branches/gsoc2008-gui/engines/made/database.h
scummvm/branches/gsoc2008-gui/engines/made/detection.cpp
scummvm/branches/gsoc2008-gui/engines/made/graphics.cpp
scummvm/branches/gsoc2008-gui/engines/made/graphics.h
scummvm/branches/gsoc2008-gui/engines/made/made.cpp
scummvm/branches/gsoc2008-gui/engines/made/made.h
scummvm/branches/gsoc2008-gui/engines/made/module.mk
scummvm/branches/gsoc2008-gui/engines/made/pmvplayer.cpp
scummvm/branches/gsoc2008-gui/engines/made/resource.cpp
scummvm/branches/gsoc2008-gui/engines/made/resource.h
scummvm/branches/gsoc2008-gui/engines/made/screen.cpp
scummvm/branches/gsoc2008-gui/engines/made/screen.h
scummvm/branches/gsoc2008-gui/engines/made/script.cpp
scummvm/branches/gsoc2008-gui/engines/made/script.h
scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs.h
scummvm/branches/gsoc2008-gui/engines/metaengine.h
scummvm/branches/gsoc2008-gui/engines/parallaction/callables_ns.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/debug.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/dialogue.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/disk.h
scummvm/branches/gsoc2008-gui/engines/parallaction/disk_br.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/exec_br.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/exec_ns.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/font.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/graphics.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/graphics.h
scummvm/branches/gsoc2008-gui/engines/parallaction/gui_br.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/gui_ns.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/inventory.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/module.mk
scummvm/branches/gsoc2008-gui/engines/parallaction/objects.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/objects.h
scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction.h
scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction_br.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction_ns.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/parser.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/parser.h
scummvm/branches/gsoc2008-gui/engines/parallaction/parser_br.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/parser_ns.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/staticres.cpp
scummvm/branches/gsoc2008-gui/engines/saga/actor.cpp
scummvm/branches/gsoc2008-gui/engines/saga/actor_walk.cpp
scummvm/branches/gsoc2008-gui/engines/saga/detection.cpp
scummvm/branches/gsoc2008-gui/engines/saga/detection_tables.h
scummvm/branches/gsoc2008-gui/engines/saga/gfx.cpp
scummvm/branches/gsoc2008-gui/engines/saga/interface.cpp
scummvm/branches/gsoc2008-gui/engines/saga/interface.h
scummvm/branches/gsoc2008-gui/engines/saga/isomap.cpp
scummvm/branches/gsoc2008-gui/engines/saga/isomap.h
scummvm/branches/gsoc2008-gui/engines/saga/itedata.cpp
scummvm/branches/gsoc2008-gui/engines/saga/module.mk
scummvm/branches/gsoc2008-gui/engines/saga/music.cpp
scummvm/branches/gsoc2008-gui/engines/saga/palanim.cpp
scummvm/branches/gsoc2008-gui/engines/saga/puzzle.cpp
scummvm/branches/gsoc2008-gui/engines/saga/rscfile.cpp
scummvm/branches/gsoc2008-gui/engines/saga/saga.cpp
scummvm/branches/gsoc2008-gui/engines/saga/saga.h
scummvm/branches/gsoc2008-gui/engines/saga/saveload.cpp
scummvm/branches/gsoc2008-gui/engines/saga/scene.cpp
scummvm/branches/gsoc2008-gui/engines/saga/scene.h
scummvm/branches/gsoc2008-gui/engines/saga/sfuncs.cpp
scummvm/branches/gsoc2008-gui/engines/saga/sndres.cpp
scummvm/branches/gsoc2008-gui/engines/saga/sprite.cpp
scummvm/branches/gsoc2008-gui/engines/saga/sthread.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/charset.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/debugger.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/detection_tables.h
scummvm/branches/gsoc2008-gui/engines/scumm/dialogs.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/nut_renderer.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/saveload.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/script_v6.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/scumm-md5.h
scummvm/branches/gsoc2008-gui/engines/scumm/scumm.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/scumm.h
scummvm/branches/gsoc2008-gui/engines/scumm/smush/channel.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/smush/codec37.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/smush/imuse_channel.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/smush/saud_channel.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/smush/smush_player.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/string.cpp
scummvm/branches/gsoc2008-gui/engines/scumm/verbs.cpp
scummvm/branches/gsoc2008-gui/engines/sky/sky.cpp
scummvm/branches/gsoc2008-gui/engines/sword1/control.cpp
scummvm/branches/gsoc2008-gui/engines/sword2/header.h
scummvm/branches/gsoc2008-gui/engines/sword2/mouse.cpp
scummvm/branches/gsoc2008-gui/engines/sword2/mouse.h
scummvm/branches/gsoc2008-gui/engines/sword2/object.h
scummvm/branches/gsoc2008-gui/engines/sword2/palette.cpp
scummvm/branches/gsoc2008-gui/engines/sword2/resman.cpp
scummvm/branches/gsoc2008-gui/engines/sword2/screen.cpp
scummvm/branches/gsoc2008-gui/engines/sword2/screen.h
scummvm/branches/gsoc2008-gui/engines/sword2/sword2.cpp
scummvm/branches/gsoc2008-gui/engines/sword2/sword2.h
scummvm/branches/gsoc2008-gui/graphics/cursorman.h
scummvm/branches/gsoc2008-gui/graphics/fontman.h
scummvm/branches/gsoc2008-gui/graphics/imageman.cpp
scummvm/branches/gsoc2008-gui/gui/ListWidget.cpp
scummvm/branches/gsoc2008-gui/gui/ThemeModern.cpp
scummvm/branches/gsoc2008-gui/gui/about.cpp
scummvm/branches/gsoc2008-gui/gui/console.cpp
scummvm/branches/gsoc2008-gui/gui/credits.h
scummvm/branches/gsoc2008-gui/gui/debugger.cpp
scummvm/branches/gsoc2008-gui/gui/eval.cpp
scummvm/branches/gsoc2008-gui/gui/eval.h
scummvm/branches/gsoc2008-gui/gui/launcher.cpp
scummvm/branches/gsoc2008-gui/gui/launcher.h
scummvm/branches/gsoc2008-gui/gui/massadd.cpp
scummvm/branches/gsoc2008-gui/gui/massadd.h
scummvm/branches/gsoc2008-gui/gui/newgui.cpp
scummvm/branches/gsoc2008-gui/gui/options.cpp
scummvm/branches/gsoc2008-gui/gui/options.h
scummvm/branches/gsoc2008-gui/gui/theme-config.cpp
scummvm/branches/gsoc2008-gui/gui/theme.cpp
scummvm/branches/gsoc2008-gui/gui/themes/classic080.ini
scummvm/branches/gsoc2008-gui/gui/themes/modern.ini
scummvm/branches/gsoc2008-gui/sound/audiostream.cpp
scummvm/branches/gsoc2008-gui/sound/audiostream.h
scummvm/branches/gsoc2008-gui/sound/flac.cpp
scummvm/branches/gsoc2008-gui/sound/fmopl.h
scummvm/branches/gsoc2008-gui/sound/mididrv.cpp
scummvm/branches/gsoc2008-gui/sound/mididrv.h
scummvm/branches/gsoc2008-gui/sound/mixer.h
scummvm/branches/gsoc2008-gui/sound/module.mk
scummvm/branches/gsoc2008-gui/sound/mp3.cpp
scummvm/branches/gsoc2008-gui/sound/null.cpp
scummvm/branches/gsoc2008-gui/sound/softsynth/adlib.cpp
scummvm/branches/gsoc2008-gui/sound/softsynth/fluidsynth.cpp
scummvm/branches/gsoc2008-gui/sound/softsynth/mt32/mt32emu.h
scummvm/branches/gsoc2008-gui/sound/softsynth/mt32.cpp
scummvm/branches/gsoc2008-gui/sound/softsynth/ym2612.cpp
scummvm/branches/gsoc2008-gui/sound/vorbis.cpp
scummvm/branches/gsoc2008-gui/test/common/hashmap.h
scummvm/branches/gsoc2008-gui/test/cxxtest/sample/CreatedTest.h
scummvm/branches/gsoc2008-gui/test/cxxtest/sample/FixtureTest.h
scummvm/branches/gsoc2008-gui/tools/create_kyradat/create_kyradat.cpp
scummvm/branches/gsoc2008-gui/tools/create_kyradat/create_kyradat.h
scummvm/branches/gsoc2008-gui/tools/create_kyradat/hof_towns.h
scummvm/branches/gsoc2008-gui/tools/create_kyradat/misc.h
scummvm/branches/gsoc2008-gui/tools/create_kyradat/pak.cpp
scummvm/branches/gsoc2008-gui/tools/create_kyradat/pak.h
scummvm/branches/gsoc2008-gui/tools/credits.pl
scummvm/branches/gsoc2008-gui/tools/scumm-md5.txt
Added Paths:
-----------
scummvm/branches/gsoc2008-gui/COPYING.LGPL
scummvm/branches/gsoc2008-gui/backends/fs/wii/
scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp
scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h
scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_m4.h
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_made.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/
scummvm/branches/gsoc2008-gui/backends/platform/wii/Makefile
scummvm/branches/gsoc2008-gui/backends/platform/wii/gecko_console.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/gecko_console.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/gx_supp.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/gx_supp.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/main.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem_events.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem_gfx.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem_sfx.cpp
scummvm/branches/gsoc2008-gui/common/unarj.cpp
scummvm/branches/gsoc2008-gui/common/unarj.h
scummvm/branches/gsoc2008-gui/dists/engine-data/drascula.dat
scummvm/branches/gsoc2008-gui/dists/wii/
scummvm/branches/gsoc2008-gui/dists/wii/READMII
scummvm/branches/gsoc2008-gui/dists/wii/icon.png
scummvm/branches/gsoc2008-gui/dists/wii/meta.xml
scummvm/branches/gsoc2008-gui/engines/drascula/actors.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/converse.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/graphics.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/interface.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/objects.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/palette.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/saveload.cpp
scummvm/branches/gsoc2008-gui/engines/drascula/sound.cpp
scummvm/branches/gsoc2008-gui/engines/gob/saveload_v4.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/
scummvm/branches/gsoc2008-gui/engines/gob/sound/adlib.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/adlib.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/bgatmosphere.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/bgatmosphere.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/cdrom.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/cdrom.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/infogrames.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/infogrames.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/pcspeaker.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/pcspeaker.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/sound.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/sound.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundblaster.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundblaster.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/sounddesc.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/sounddesc.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundmixer.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundmixer.h
scummvm/branches/gsoc2008-gui/engines/gob/variables.cpp
scummvm/branches/gsoc2008-gui/engines/gob/variables.h
scummvm/branches/gsoc2008-gui/engines/kyra/animator_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/animator_lok.h
scummvm/branches/gsoc2008-gui/engines/kyra/gui_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui_lok.h
scummvm/branches/gsoc2008-gui/engines/kyra/items_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_lok.h
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v1.h
scummvm/branches/gsoc2008-gui/engines/kyra/saveload_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen_lok.h
scummvm/branches/gsoc2008-gui/engines/kyra/script_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/script_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sequences_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sound_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/text_lok.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/timer_lok.cpp
scummvm/branches/gsoc2008-gui/engines/made/screenfx.cpp
scummvm/branches/gsoc2008-gui/engines/made/screenfx.h
scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/input.cpp
scummvm/branches/gsoc2008-gui/engines/parallaction/input.h
scummvm/branches/gsoc2008-gui/engines/saga/introproc_ihnm.cpp
scummvm/branches/gsoc2008-gui/engines/saga/introproc_ite.cpp
scummvm/branches/gsoc2008-gui/sound/musicplugin.cpp
scummvm/branches/gsoc2008-gui/sound/musicplugin.h
scummvm/branches/gsoc2008-gui/tools/create_drascula/
scummvm/branches/gsoc2008-gui/tools/create_drascula/Makefile
scummvm/branches/gsoc2008-gui/tools/create_drascula/create_drascula.cpp
scummvm/branches/gsoc2008-gui/tools/create_drascula/create_drascula.h
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8/
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8/create_drascula.sln
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8/create_drascula.vcproj
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8_to_msvc9.bat
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9/
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9/create_drascula.sln
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9/create_drascula.vcproj
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9_to_msvc8.bat
scummvm/branches/gsoc2008-gui/tools/create_drascula/module.mk
scummvm/branches/gsoc2008-gui/tools/create_drascula/staticdata.h
scummvm/branches/gsoc2008-gui/tools/create_kyradat/ita.h
scummvm/branches/gsoc2008-gui/tools/create_kyradat/malcolm.h
Removed Paths:
-------------
scummvm/branches/gsoc2008-gui/backends/fs/gp32/
scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp
scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h
scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.cpp
scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.h
scummvm/branches/gsoc2008-gui/backends/platform/gp32/
scummvm/branches/gsoc2008-gui/backends/platform/wii/Makefile
scummvm/branches/gsoc2008-gui/backends/platform/wii/gecko_console.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/gecko_console.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/gx_supp.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/gx_supp.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/main.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem.h
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem_events.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem_gfx.cpp
scummvm/branches/gsoc2008-gui/backends/platform/wii/osystem_sfx.cpp
scummvm/branches/gsoc2008-gui/dists/wii/READMII
scummvm/branches/gsoc2008-gui/dists/wii/icon.png
scummvm/branches/gsoc2008-gui/dists/wii/meta.xml
scummvm/branches/gsoc2008-gui/engines/cruise/stringSupport.cpp
scummvm/branches/gsoc2008-gui/engines/cruise/stringSupport.h
scummvm/branches/gsoc2008-gui/engines/drascula/texts.cpp
scummvm/branches/gsoc2008-gui/engines/gob/cdrom.cpp
scummvm/branches/gsoc2008-gui/engines/gob/cdrom.h
scummvm/branches/gsoc2008-gui/engines/gob/music.cpp
scummvm/branches/gsoc2008-gui/engines/gob/music.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/adlib.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/adlib.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/bgatmosphere.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/bgatmosphere.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/cdrom.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/cdrom.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/infogrames.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/infogrames.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/pcspeaker.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/pcspeaker.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/sound.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/sound.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundblaster.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundblaster.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/sounddesc.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/sounddesc.h
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundmixer.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound/soundmixer.h
scummvm/branches/gsoc2008-gui/engines/gob/sound.cpp
scummvm/branches/gsoc2008-gui/engines/gob/sound.h
scummvm/branches/gsoc2008-gui/engines/kyra/animator_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/animator_v1.h
scummvm/branches/gsoc2008-gui/engines/kyra/gui_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/gui_v1.h
scummvm/branches/gsoc2008-gui/engines/kyra/items_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra.h
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v1.h
scummvm/branches/gsoc2008-gui/engines/kyra/saveload_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/scene_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/screen_v1.h
scummvm/branches/gsoc2008-gui/engines/kyra/script_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sequences_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/sound_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/text_v1.cpp
scummvm/branches/gsoc2008-gui/engines/kyra/timer_v1.cpp
scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs.cpp
scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs_lgop2.cpp
scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs_mhne.cpp
scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs_rtz.cpp
scummvm/branches/gsoc2008-gui/engines/saga/ihnm_introproc.cpp
scummvm/branches/gsoc2008-gui/engines/saga/ite_introproc.cpp
scummvm/branches/gsoc2008-gui/engines/saga/sagaresnames.h
scummvm/branches/gsoc2008-gui/tools/create_drascula/Makefile
scummvm/branches/gsoc2008-gui/tools/create_drascula/create_drascula.cpp
scummvm/branches/gsoc2008-gui/tools/create_drascula/create_drascula.h
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8/
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8/create_drascula.sln
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8/create_drascula.vcproj
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc8_to_msvc9.bat
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9/
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9/create_drascula.sln
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9/create_drascula.vcproj
scummvm/branches/gsoc2008-gui/tools/create_drascula/dists/msvc9_to_msvc8.bat
scummvm/branches/gsoc2008-gui/tools/create_drascula/module.mk
scummvm/branches/gsoc2008-gui/tools/create_drascula/staticdata.h
Property Changed:
----------------
scummvm/branches/gsoc2008-gui/
Property changes on: scummvm/branches/gsoc2008-gui
___________________________________________________________________
Name: svnmerge-integrated
- /scummvm/trunk:1-31893
+ /scummvm/trunk:1-32700
Modified: scummvm/branches/gsoc2008-gui/AUTHORS
===================================================================
--- scummvm/branches/gsoc2008-gui/AUTHORS 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/AUTHORS 2008-06-14 14:44:29 UTC (rev 32702)
@@ -81,14 +81,14 @@
Paul Gilbert
M4:
- Torbjorn Andersson
+ Torbjorn Andersson
Paul Gilbert
- Benjamin Haisch
- Filippos Karapetis
+ Benjamin Haisch
+ Filippos Karapetis
MADE:
- Benjamin Haisch
-
+ Benjamin Haisch
+
Parallaction:
peres
@@ -139,6 +139,9 @@
Jurgen Braam
Lars Persson
+ Wii:
+ Andre Heider
+
Other subsystems
----------------
Infrastructure:
Copied: scummvm/branches/gsoc2008-gui/COPYING.LGPL (from rev 32700, scummvm/trunk/COPYING.LGPL)
===================================================================
--- scummvm/branches/gsoc2008-gui/COPYING.LGPL (rev 0)
+++ scummvm/branches/gsoc2008-gui/COPYING.LGPL 2008-06-14 14:44:29 UTC (rev 32702)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Modified: scummvm/branches/gsoc2008-gui/Makefile
===================================================================
--- scummvm/branches/gsoc2008-gui/Makefile 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/Makefile 2008-06-14 14:44:29 UTC (rev 32702)
@@ -24,7 +24,7 @@
# Turn off some annoying and not-so-useful warnings
CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
# Enable even more warnings...
-CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
+CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align
CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wwrite-strings
# Disable RTTI and exceptions, and enabled checking of pointers returned by "new"
Modified: scummvm/branches/gsoc2008-gui/Makefile.common
===================================================================
--- scummvm/branches/gsoc2008-gui/Makefile.common 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/Makefile.common 2008-06-14 14:44:29 UTC (rev 32702)
@@ -182,6 +182,9 @@
# Engine data files
DIST_FILES_ENGINEDATA=
+ifdef ENABLE_DRASCULA
+DIST_FILES_ENGINEDATA+=drascula.dat
+endif
ifdef ENABLE_IGOR
DIST_FILES_ENGINEDATA+=igor.tbl
endif
Modified: scummvm/branches/gsoc2008-gui/NEWS
===================================================================
--- scummvm/branches/gsoc2008-gui/NEWS 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/NEWS 2008-06-14 14:44:29 UTC (rev 32702)
@@ -4,7 +4,9 @@
0.12.0 (????-??-??)
New Games:
- Added support for The Legend of Kyrandia: Book Two: Hand of Fate
+ - Added support for The Legend of Kyrandia: Book Three: Malcolm's Revenge
- Added support for Lost in Time
+ - Added support for The Bizarre Adventures of Woodruff and the Schnibble
- Added support for the PC version of Waxworks
- Added support for the Macintosh version of I Have no Mouth, and I
must Scream
Modified: scummvm/branches/gsoc2008-gui/README
===================================================================
--- scummvm/branches/gsoc2008-gui/README 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/README 2008-06-14 14:44:29 UTC (rev 32702)
@@ -245,7 +245,8 @@
Backyard Baseball [baseball]
Backyard Soccer [soccer]
- Blue's ABC Time [BluesABCTime]
+ Blue's 123 Time Activities [Blues123Time]
+ Blue's ABC Time Activities [BluesABCTime]
Blue's Birthday Adventure [BluesBirthday]
SPY Fox 3: Operation Ozone [spyozon]
@@ -1793,7 +1794,7 @@
* To get a version you can run from Finder, type 'make bundle' which
will create ScummVM.app (this only works out of the box if you
installed SDL into /sw (as happens if you are using Fink). If you
- have installed SDL in another way, you will have to edit the Makefile).
+ have installed SDL in another way, you will have to edit ports.mk).
* For more information refer to:
http://wiki.scummvm.org/index.php/Compiling_ScummVM/MacOS_X_Crosscompiling
Modified: scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -209,7 +209,7 @@
if (IDOS->NameFromLock(pLock, (STRPTR)n, bufSize) != DOSFALSE) {
_sPath = n;
_sDisplayName = pDisplayName ? pDisplayName : IDOS->FilePart((STRPTR)n);
- delete [] n;
+ delete[] n;
break;
}
@@ -217,12 +217,12 @@
_bIsValid = false;
debug(6, "IoErr() != ERROR_LINE_TOO_LONG");
LEAVE();
- delete [] n;
+ delete[] n;
return;
}
bufSize *= 2;
- delete [] n;
+ delete[] n;
}
_bIsValid = false;
@@ -536,7 +536,7 @@
sprintf(buffer, "%s (%s)", volName, devName);
- delete [] devName;
+ delete[] devName;
AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(volumeLock, buffer);
if (entry) {
@@ -554,7 +554,7 @@
IDOS->UnLock(volumeLock);
}
- delete [] volName;
+ delete[] volName;
}
dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES);
}
Modified: scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -25,7 +25,7 @@
//#include <NDS/ARM9/console.h> //basic print funcionality
#include "backends/fs/ds/ds-fs.h"
#include "dsmain.h"
-#include "gba_nds_fat.h"
+#include "fat/gba_nds_fat.h"
Modified: scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.h
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.h 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -28,7 +28,7 @@
#include "zipreader.h"
#include "ramsave.h"
#include "scummconsole.h"
-#include "gba_nds_fat.h"
+#include "fat/gba_nds_fat.h"
#include "backends/fs/abstract-fs.h"
namespace DS {
Copied: scummvm/branches/gsoc2008-gui/backends/fs/wii (from rev 32700, scummvm/trunk/backends/fs/wii)
Deleted: scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/wii/wii-fs-factory.cpp 2008-06-14 11:23:29 UTC (rev 32700)
+++ scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,49 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if defined(__WII__)
-
-#include <unistd.h>
-
-#include "backends/fs/wii/wii-fs-factory.h"
-#include "backends/fs/wii/wii-fs.cpp"
-
-DECLARE_SINGLETON(WiiFilesystemFactory);
-
-AbstractFilesystemNode *WiiFilesystemFactory::makeRootFileNode() const {
- return new WiiFilesystemNode();
-}
-
-AbstractFilesystemNode *WiiFilesystemFactory::makeCurrentDirectoryFileNode() const {
- char buf[MAXPATHLEN];
-
- if (getcwd(buf, MAXPATHLEN))
- return new WiiFilesystemNode(buf, true);
- else
- return new WiiFilesystemNode();
-}
-
-AbstractFilesystemNode *WiiFilesystemFactory::makeFileNodePath(const String &path) const {
- return new WiiFilesystemNode(path, true);
-}
-#endif
-
Copied: scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp (from rev 32700, scummvm/trunk/backends/fs/wii/wii-fs-factory.cpp)
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp (rev 0)
+++ scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(__WII__)
+
+#include <unistd.h>
+
+#include "backends/fs/wii/wii-fs-factory.h"
+#include "backends/fs/wii/wii-fs.cpp"
+
+DECLARE_SINGLETON(WiiFilesystemFactory);
+
+AbstractFilesystemNode *WiiFilesystemFactory::makeRootFileNode() const {
+ return new WiiFilesystemNode();
+}
+
+AbstractFilesystemNode *WiiFilesystemFactory::makeCurrentDirectoryFileNode() const {
+ char buf[MAXPATHLEN];
+
+ if (getcwd(buf, MAXPATHLEN))
+ return new WiiFilesystemNode(buf, true);
+ else
+ return new WiiFilesystemNode();
+}
+
+AbstractFilesystemNode *WiiFilesystemFactory::makeFileNodePath(const String &path) const {
+ return new WiiFilesystemNode(path, true);
+}
+#endif
+
Deleted: scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/wii/wii-fs-factory.h 2008-06-14 11:23:29 UTC (rev 32700)
+++ scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,50 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef _WII_FILESYSTEM_FACTORY_H_
-#define _WII_FILESYSTEM_FACTORY_H_
-
-#include "common/singleton.h"
-#include "backends/fs/fs-factory.h"
-
-/**
- * Creates WiiFilesystemNode objects.
- *
- * Parts of this class are documented in the base interface class, FilesystemFactory.
- */
-class WiiFilesystemFactory : public FilesystemFactory, public Common::Singleton<WiiFilesystemFactory> {
-public:
- typedef Common::String String;
-
- virtual AbstractFilesystemNode *makeRootFileNode() const;
- virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
-protected:
- WiiFilesystemFactory() {};
-
-private:
- friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*Wii_FILESYSTEM_FACTORY_H*/
-
Copied: scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h (from rev 32700, scummvm/trunk/backends/fs/wii/wii-fs-factory.h)
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h (rev 0)
+++ scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -0,0 +1,50 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _WII_FILESYSTEM_FACTORY_H_
+#define _WII_FILESYSTEM_FACTORY_H_
+
+#include "common/singleton.h"
+#include "backends/fs/fs-factory.h"
+
+/**
+ * Creates WiiFilesystemNode objects.
+ *
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
+ */
+class WiiFilesystemFactory : public FilesystemFactory, public Common::Singleton<WiiFilesystemFactory> {
+public:
+ typedef Common::String String;
+
+ virtual AbstractFilesystemNode *makeRootFileNode() const;
+ virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
+ virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
+
+protected:
+ WiiFilesystemFactory() {};
+
+private:
+ friend class Common::Singleton<SingletonBaseType>;
+};
+
+#endif /*Wii_FILESYSTEM_FACTORY_H*/
+
Deleted: scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/wii/wii-fs.cpp 2008-06-14 11:23:29 UTC (rev 32700)
+++ scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,196 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if defined(__WII__)
-
-#include "backends/fs/abstract-fs.h"
-
-#include <sys/dir.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/**
- * Implementation of the ScummVM file system API based on Wii.
- *
- * Parts of this class are documented in the base interface class, AbstractFilesystemNode.
- */
-class WiiFilesystemNode : public AbstractFilesystemNode {
-protected:
- String _displayName;
- String _path;
- bool _isDirectory, _isReadable, _isWritable;
-
-public:
- /**
- * Creates a WiiFilesystemNode with the root node as path.
- */
- WiiFilesystemNode();
-
- /**
- * Creates a WiiFilesystemNode for a given path.
- *
- * @param path String with the path the new node should point to.
- * @param verify true if the isValid and isDirectory flags should be verified during the construction.
- */
- WiiFilesystemNode(const String &path, bool verify);
-
- virtual bool exists() const;
- virtual String getDisplayName() const { return _displayName; }
- virtual String getName() const { return _displayName; }
- virtual String getPath() const { return _path; }
- virtual bool isDirectory() const { return _isDirectory; }
- virtual bool isReadable() const { return _isReadable; }
- virtual bool isWritable() const { return _isWritable; }
-
- virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFilesystemNode *getParent() const;
-
-private:
- virtual void setFlags();
-};
-
-/**
- * Returns the last component of a given path.
- *
- * Examples:
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
- *
- * @param str String containing the path.
- * @return Pointer to the first char of the last component inside str.
- */
-const char *lastPathComponent(const Common::String &str) {
- if(str.empty())
- return "";
-
- const char *start = str.c_str();
- const char *cur = start + str.size() - 2;
-
- while (cur >= start && *cur != '/') {
- --cur;
- }
-
- return cur + 1;
-}
-
-void WiiFilesystemNode::setFlags() {
- struct stat st;
-
- _isDirectory = false;
- _isReadable = false;
- _isWritable = false;
-
- if (!stat(_path.c_str(), &st)) {
- _isDirectory = S_ISDIR(st.st_mode);
- _isReadable = (st.st_mode & S_IRUSR) > 0;
- _isWritable = (st.st_mode & S_IWUSR) > 0;
- }
-}
-
-
-WiiFilesystemNode::WiiFilesystemNode() {
- // The root dir.
- _path = "fat:/";
- _displayName = _path;
-
- setFlags();
-}
-
-WiiFilesystemNode::WiiFilesystemNode(const String &p, bool verify) {
- assert(p.size() > 0);
-
- _path = p;
-
- _displayName = lastPathComponent(_path);
-
- if (verify)
- setFlags();
-}
-
-bool WiiFilesystemNode::exists() const {
- struct stat st;
- return stat(_path.c_str (), &st) == 0;
-}
-
-AbstractFilesystemNode *WiiFilesystemNode::getChild(const String &n) const {
- assert(_isDirectory);
-
- String newPath(_path);
- if (newPath.lastChar() != '/')
- newPath += '/';
- newPath += n;
-
- return new WiiFilesystemNode(newPath, true);
-}
-
-bool WiiFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
- assert(_isDirectory);
-
- DIR_ITER* dp = diropen (_path.c_str());
-
- if (dp == NULL)
- return false;
-
- char filename[MAXPATHLEN];
- struct stat st;
-
- while (dirnext(dp, filename, &st) == 0) {
- if (strcmp(filename, ".") == 0 || strcmp(filename, "..") == 0)
- continue;
-
- String newPath(_path);
- if (newPath.lastChar() != '/')
- newPath += '/';
- newPath += filename;
-
- bool isDir = S_ISDIR(st.st_mode);
-
- if ((mode == FilesystemNode::kListFilesOnly && isDir) ||
- (mode == FilesystemNode::kListDirectoriesOnly && !isDir))
- continue;
-
- if (isDir)
- newPath += '/';
-
- myList.push_back(new WiiFilesystemNode(newPath, true));
- }
-
- dirclose(dp);
-
- return true;
-}
-
-AbstractFilesystemNode *WiiFilesystemNode::getParent() const {
- if (_path == "/")
- return 0;
-
- const char *start = _path.c_str();
- const char *end = lastPathComponent(_path);
-
- return new WiiFilesystemNode(String(start, end - start), true);
-}
-
-#endif //#if defined(__WII__)
-
Copied: scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp (from rev 32700, scummvm/trunk/backends/fs/wii/wii-fs.cpp)
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp (rev 0)
+++ scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -0,0 +1,196 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(__WII__)
+
+#include "backends/fs/abstract-fs.h"
+
+#include <sys/dir.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/**
+ * Implementation of the ScummVM file system API based on Wii.
+ *
+ * Parts of this class are documented in the base interface class, AbstractFilesystemNode.
+ */
+class WiiFilesystemNode : public AbstractFilesystemNode {
+protected:
+ String _displayName;
+ String _path;
+ bool _isDirectory, _isReadable, _isWritable;
+
+public:
+ /**
+ * Creates a WiiFilesystemNode with the root node as path.
+ */
+ WiiFilesystemNode();
+
+ /**
+ * Creates a WiiFilesystemNode for a given path.
+ *
+ * @param path String with the path the new node should point to.
+ * @param verify true if the isValid and isDirectory flags should be verified during the construction.
+ */
+ WiiFilesystemNode(const String &path, bool verify);
+
+ virtual bool exists() const;
+ virtual String getDisplayName() const { return _displayName; }
+ virtual String getName() const { return _displayName; }
+ virtual String getPath() const { return _path; }
+ virtual bool isDirectory() const { return _isDirectory; }
+ virtual bool isReadable() const { return _isReadable; }
+ virtual bool isWritable() const { return _isWritable; }
+
+ virtual AbstractFilesystemNode *getChild(const String &n) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
+ virtual AbstractFilesystemNode *getParent() const;
+
+private:
+ virtual void setFlags();
+};
+
+/**
+ * Returns the last component of a given path.
+ *
+ * Examples:
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
+ *
+ * @param str String containing the path.
+ * @return Pointer to the first char of the last component inside str.
+ */
+const char *lastPathComponent(const Common::String &str) {
+ if(str.empty())
+ return "";
+
+ const char *start = str.c_str();
+ const char *cur = start + str.size() - 2;
+
+ while (cur >= start && *cur != '/') {
+ --cur;
+ }
+
+ return cur + 1;
+}
+
+void WiiFilesystemNode::setFlags() {
+ struct stat st;
+
+ _isDirectory = false;
+ _isReadable = false;
+ _isWritable = false;
+
+ if (!stat(_path.c_str(), &st)) {
+ _isDirectory = S_ISDIR(st.st_mode);
+ _isReadable = (st.st_mode & S_IRUSR) > 0;
+ _isWritable = (st.st_mode & S_IWUSR) > 0;
+ }
+}
+
+
+WiiFilesystemNode::WiiFilesystemNode() {
+ // The root dir.
+ _path = "fat:/";
+ _displayName = _path;
+
+ setFlags();
+}
+
+WiiFilesystemNode::WiiFilesystemNode(const String &p, bool verify) {
+ assert(p.size() > 0);
+
+ _path = p;
+
+ _displayName = lastPathComponent(_path);
+
+ if (verify)
+ setFlags();
+}
+
+bool WiiFilesystemNode::exists() const {
+ struct stat st;
+ return stat(_path.c_str (), &st) == 0;
+}
+
+AbstractFilesystemNode *WiiFilesystemNode::getChild(const String &n) const {
+ assert(_isDirectory);
+
+ String newPath(_path);
+ if (newPath.lastChar() != '/')
+ newPath += '/';
+ newPath += n;
+
+ return new WiiFilesystemNode(newPath, true);
+}
+
+bool WiiFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
+ assert(_isDirectory);
+
+ DIR_ITER* dp = diropen (_path.c_str());
+
+ if (dp == NULL)
+ return false;
+
+ char filename[MAXPATHLEN];
+ struct stat st;
+
+ while (dirnext(dp, filename, &st) == 0) {
+ if (strcmp(filename, ".") == 0 || strcmp(filename, "..") == 0)
+ continue;
+
+ String newPath(_path);
+ if (newPath.lastChar() != '/')
+ newPath += '/';
+ newPath += filename;
+
+ bool isDir = S_ISDIR(st.st_mode);
+
+ if ((mode == FilesystemNode::kListFilesOnly && isDir) ||
+ (mode == FilesystemNode::kListDirectoriesOnly && !isDir))
+ continue;
+
+ if (isDir)
+ newPath += '/';
+
+ myList.push_back(new WiiFilesystemNode(newPath, true));
+ }
+
+ dirclose(dp);
+
+ return true;
+}
+
+AbstractFilesystemNode *WiiFilesystemNode::getParent() const {
+ if (_path == "/")
+ return 0;
+
+ const char *start = _path.c_str();
+ const char *end = lastPathComponent(_path);
+
+ return new WiiFilesystemNode(String(start, end - start), true);
+}
+
+#endif //#if defined(__WII__)
+
Modified: scummvm/branches/gsoc2008-gui/backends/midi/alsa.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/alsa.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/alsa.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -26,11 +26,11 @@
#if defined(UNIX) && defined(USE_ALSA)
+#include "common/config-manager.h"
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
-#include "common/config-manager.h"
-
#include <alsa/asoundlib.h>
/*
@@ -79,7 +79,7 @@
}
int MidiDriver_ALSA::open() {
- char *var;
+ const char *var;
if (_isOpen)
return MERR_ALREADY_OPEN;
@@ -87,7 +87,8 @@
if (!(var = getenv("SCUMMVM_PORT"))) {
// use config option if no var specified
- if (parse_addr(ConfMan.get("alsa_port").c_str(), &seq_client, &seq_port) < 0) {
+ var = ConfMan.get("alsa_port").c_str();
+ if (parse_addr(var, &seq_client, &seq_port) < 0) {
error("Invalid port %s", var);
return -1;
}
@@ -238,8 +239,85 @@
snd_seq_flush_output(seq_handle);
}
-MidiDriver *MidiDriver_ALSA_create() {
- return new MidiDriver_ALSA();
+
+// Plugin interface
+
+class AlsaMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "ALSA";
+ }
+
+ const char *getId() const {
+ return "alsa";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+#define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits))
+
+static int check_permission(snd_seq_port_info_t *pinfo)
+{
+ if (perm_ok(pinfo, SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE)) {
+ if (!(snd_seq_port_info_get_capability(pinfo) & SND_SEQ_PORT_CAP_NO_EXPORT))
+ return 1;
+ }
+ return 0;
}
+MusicDevices AlsaMusicPlugin::getDevices() const {
+ MusicDevices devices;
+
+ snd_seq_t *seq;
+ if (snd_seq_open(&seq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0)
+ return devices; // can't open sequencer
+
+ snd_seq_client_info_t *cinfo;
+ snd_seq_client_info_alloca(&cinfo);
+ snd_seq_port_info_t *pinfo;
+ snd_seq_port_info_alloca(&pinfo);
+ snd_seq_client_info_set_client(cinfo, -1);
+ while (snd_seq_query_next_client(seq, cinfo) >= 0) {
+ bool found_valid_port = false;
+
+ /* reset query info */
+ snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+ snd_seq_port_info_set_port(pinfo, -1);
+ while (!found_valid_port && snd_seq_query_next_port(seq, pinfo) >= 0) {
+ if (check_permission(pinfo)) {
+ found_valid_port = true;
+ // TODO: Return a different music type depending on the configuration
+ devices.push_back(MusicDevice(this, snd_seq_client_info_get_name(cinfo), MT_GM));
+ //snd_seq_client_info_get_client(cinfo) : snd_seq_port_info_get_port(pinfo)
+ }
+ }
+ }
+ snd_seq_close(seq);
+
+ return devices;
+}
+
+PluginError AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_ALSA();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ AlsaMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(ALSA)
+ //REGISTER_PLUGIN_DYNAMIC(ALSA, PLUGIN_TYPE_MUSIC, AlsaMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(ALSA, PLUGIN_TYPE_MUSIC, AlsaMusicPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-gui/backends/midi/camd.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/camd.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/camd.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -26,9 +26,10 @@
#if defined(__amigaos4__)
+#include "common/endian.h"
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
-#include "common/endian.h"
#include <proto/camd.h>
#include <proto/exec.h>
@@ -162,8 +163,50 @@
_isOpen = false;
}
-MidiDriver *MidiDriver_CAMD_create() {
- return new MidiDriver_CAMD();
+
+// Plugin interface
+
+class CamdMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "CAMD";
+ }
+
+ const char *getId() const {
+ return "camd";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices CamdMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_CAMD();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ CamdMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(CAMD)
+ //REGISTER_PLUGIN_DYNAMIC(CAMD, PLUGIN_TYPE_MUSIC, CamdMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(CAMD, PLUGIN_TYPE_MUSIC, CamdMusicPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-gui/backends/midi/coreaudio.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/coreaudio.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/coreaudio.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -24,8 +24,20 @@
#ifdef MACOSX
+// HACK to disable deprecated warnings under Mac OS X 10.5.
+// Apple depracted the AUGraphNewNode & AUGraphGetNodeInfo APIs
+// in favor of the new AUGraphAddNode & AUGraphNodeInfo APIs.
+// While it would be trivial to switch to those, this would break
+// binary compatibility with all pre-10.5 systems, so we don't want
+// to do that just now. Maybe when 10.6 comes... :)
+#include <AvailabilityMacros.h>
+#undef DEPRECATED_ATTRIBUTE
+#define DEPRECATED_ATTRIBUTE
+
+
#include "common/config-manager.h"
#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
#include <AudioToolbox/AUGraph.h>
@@ -192,8 +204,50 @@
MusicDeviceSysEx(_synth, buf, length+2);
}
-MidiDriver *MidiDriver_CORE_create() {
- return new MidiDriver_CORE();
+
+// Plugin interface
+
+class CoreAudioMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "CoreAudio";
+ }
+
+ const char *getId() const {
+ return "core";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices CoreAudioMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_CORE();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ CoreAudioMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(COREAUDIO)
+ //REGISTER_PLUGIN_DYNAMIC(COREAUDIO, PLUGIN_TYPE_MUSIC, CoreAudioMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(COREAUDIO, PLUGIN_TYPE_MUSIC, CoreAudioMusicPlugin);
+//#endif
+
#endif // MACOSX
Modified: scummvm/branches/gsoc2008-gui/backends/midi/coremidi.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/coremidi.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/coremidi.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -26,6 +26,7 @@
#include "common/config-manager.h"
#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
#include <CoreMIDI/CoreMIDI.h>
@@ -175,8 +176,50 @@
MIDISend(mOutPort, mDest, packetList);
}
-MidiDriver *MidiDriver_CoreMIDI_create() {
- return new MidiDriver_CoreMIDI();
+
+// Plugin interface
+
+class CoreMIDIMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "CoreMIDI";
+ }
+
+ const char *getId() const {
+ return "coremidi";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices CoreMIDIMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_CoreMIDI();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ CoreMIDIMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(COREMIDI)
+ //REGISTER_PLUGIN_DYNAMIC(COREMIDI, PLUGIN_TYPE_MUSIC, CoreMIDIMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(COREMIDI, PLUGIN_TYPE_MUSIC, CoreMIDIMusicPlugin);
+//#endif
+
#endif // MACOSX
Modified: scummvm/branches/gsoc2008-gui/backends/midi/dmedia.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/dmedia.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/dmedia.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL:$
+ * $URL$
* $Id: dmedia.cpp$
*/
@@ -30,8 +30,9 @@
#if defined(IRIX)
#include "common/scummsys.h"
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include <dmedia/midi.h>
#include <sys/types.h>
@@ -174,8 +175,50 @@
}
}
-MidiDriver *MidiDriver_DMEDIA_create() {
- return new MidiDriver_DMEDIA();
+
+// Plugin interface
+
+class DMediaMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "DMedia";
+ }
+
+ const char *getId() const {
+ return "dmedia";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices DMediaMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_DMEDIA();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ DMediaMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(DMEDIA)
+ //REGISTER_PLUGIN_DYNAMIC(DMEDIA, PLUGIN_TYPE_MUSIC, DMediaMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(DMEDIA, PLUGIN_TYPE_MUSIC, DMediaMusicPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-gui/backends/midi/quicktime.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/quicktime.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/quicktime.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -24,10 +24,22 @@
#if defined(MACOSX) || defined(macintosh)
+// HACK to disable deprecated warnings under Mac OS X 10.5.
+// Apple depracted the complete QuickTime Music/MIDI API.
+// Apps are supposed to use CoreAudio & CoreMIDI. We do support
+// those, but while QT Midi support is still around, there is no
+// reason to disable this driver. If they really ditch the API in 10.6,
+// we can still release binaries with this driver disabled/removed.
+#include <AvailabilityMacros.h>
+#undef DEPRECATED_ATTRIBUTE
+#define DEPRECATED_ATTRIBUTE
-#include "sound/mpu401.h"
+
+
#include "common/endian.h"
#include "common/util.h"
+#include "sound/musicplugin.h"
+#include "sound/mpu401.h"
#if defined(MACOSX)
#include <QuickTime/QuickTimeComponents.h>
@@ -250,8 +262,50 @@
}
}
-MidiDriver *MidiDriver_QT_create() {
- return new MidiDriver_QT();
+
+// Plugin interface
+
+class QuickTimeMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "QuickTime";
+ }
+
+ const char *getId() const {
+ return "qt";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices QuickTimeMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError QuickTimeMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_QT();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ QuickTimeMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(QUICKTIME)
+ //REGISTER_PLUGIN_DYNAMIC(QUICKTIME, PLUGIN_TYPE_MUSIC, QuickTimeMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(QUICKTIME, PLUGIN_TYPE_MUSIC, QuickTimeMusicPlugin);
+//#endif
+
#endif // MACOSX || macintosh
Modified: scummvm/branches/gsoc2008-gui/backends/midi/seq.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/seq.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/seq.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -30,8 +30,9 @@
#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include <fcntl.h>
#include <unistd.h>
@@ -169,8 +170,50 @@
write (device, buf, position);
}
-MidiDriver *MidiDriver_SEQ_create() {
- return new MidiDriver_SEQ();
+
+// Plugin interface
+
+class SeqMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "SEQ";
+ }
+
+ const char *getId() const {
+ return "seq";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices SeqMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_SEQ();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ SeqMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(SEQ)
+ //REGISTER_PLUGIN_DYNAMIC(SEQ, PLUGIN_TYPE_MUSIC, SeqMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(SEQ, PLUGIN_TYPE_MUSIC, SeqMusicPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-gui/backends/midi/timidity.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/timidity.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/timidity.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -36,8 +36,9 @@
#if defined (UNIX)
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include <fcntl.h>
#include <unistd.h>
@@ -510,8 +511,48 @@
timidity_write_data(buf, position);
}
-MidiDriver *MidiDriver_TIMIDITY_create() {
- return new MidiDriver_TIMIDITY();
+
+// Plugin interface
+
+class TimidityMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "TiMidity";
+ }
+
+ const char *getId() const {
+ return "timidity";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices TimidityMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_TIMIDITY();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ TimidityMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(TIMIDITY)
+ //REGISTER_PLUGIN_DYNAMIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
+//#endif
+
#endif // defined (UNIX)
Modified: scummvm/branches/gsoc2008-gui/backends/midi/windows.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/windows.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/windows.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -24,12 +24,15 @@
#if defined(WIN32) && !defined(_WIN32_WCE)
+#include <windows.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
-#include <windows.h>
-#include <mmsystem.h>
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
+#include <mmsystem.h>
+
////////////////////////////////////////
//
// Windows MIDI driver
@@ -141,8 +144,50 @@
}
}
-MidiDriver *MidiDriver_WIN_create() {
- return new MidiDriver_WIN();
+
+// Plugin interface
+
+class WindowsMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "Windows MIDI";
+ }
+
+ const char *getId() const {
+ return "windows";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices WindowsMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_WIN();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ WindowsMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(WINDOWS)
+ //REGISTER_PLUGIN_DYNAMIC(WINDOWS, PLUGIN_TYPE_MUSIC, WindowsMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(WINDOWS, PLUGIN_TYPE_MUSIC, WindowsMusicPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-gui/backends/midi/ypa1.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/ypa1.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/ypa1.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -22,8 +22,9 @@
* $Id$
*/
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include "Pa1Lib.h"
@@ -102,6 +103,48 @@
}
}
-MidiDriver *MidiDriver_YamahaPa1_create() {
- return new MidiDriver_YamahaPa1();
+
+// Plugin interface
+
+class YamahaPa1MusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "Yamaha Pa1";
+ }
+
+ const char *getId() const {
+ return "ypa1";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices YamahaPa1MusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+
+PluginError YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_YamahaPa1();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ YamahaPa1MusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(YPA1)
+ //REGISTER_PLUGIN_DYNAMIC(YPA1, PLUGIN_TYPE_MUSIC, YamahaPa1MusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(YPA1, PLUGIN_TYPE_MUSIC, YamahaPa1MusicPlugin);
+//#endif
Modified: scummvm/branches/gsoc2008-gui/backends/midi/zodiac.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/midi/zodiac.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/midi/zodiac.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -22,8 +22,9 @@
* $Id$
*/
+#include "common/util.h"
+#include "sound/musicplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#ifndef DISABLE_TAPWAVE
@@ -120,8 +121,50 @@
TwMidiSysEx(_midiHandle, 0, (byte *)buf, length + 2);
}
-MidiDriver *MidiDriver_Zodiac_create() {
- return new MidiDriver_Zodiac();
+
+// Plugin interface
+
+class ZodiacMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "Tapwave Zodiac";
+ }
+
+ const char *getId() const {
+ return "zodiac";
+ }
+
+ MusicDevices getDevices() const;
+ PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+MusicDevices ZodiacMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ // TODO: Return a different music type depending on the configuration
+ // TODO: List the available devices
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
}
+PluginError ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_Zodiac();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ ZodiacMusicPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(ZODIAC)
+ //REGISTER_PLUGIN_DYNAMIC(ZODIAC, PLUGIN_TYPE_MUSIC, ZodiacMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(ZODIAC, PLUGIN_TYPE_MUSIC, ZodiacMusicPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-gui/backends/module.mk
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/module.mk 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/module.mk 2008-06-14 14:44:29 UTC (rev 32702)
@@ -3,13 +3,13 @@
MODULE_OBJS := \
fs/amigaos4/amigaos4-fs-factory.o \
fs/ds/ds-fs-factory.o \
- fs/gp32/gp32-fs-factory.o \
fs/palmos/palmos-fs-factory.o \
fs/posix/posix-fs-factory.o \
fs/ps2/ps2-fs-factory.o \
fs/psp/psp-fs-factory.o \
fs/symbian/symbian-fs-factory.o \
fs/windows/windows-fs-factory.o \
+ fs/wii/wii-fs-factory.o \
events/default/default-events.o \
midi/alsa.o \
midi/camd.o \
Modified: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -24,9 +24,9 @@
*/
#include "be_base.h"
-#include "be_save.h"
#include "common/config-file.h"
#include "common/config-manager.h"
+#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
#include "sound/mixer.h"
@@ -100,7 +100,7 @@
// Create the savefile manager, if none exists yet (we check for this to
// allow subclasses to provide their own).
if (_saveMgr == 0) {
- _saveMgr = new PalmSaveFileManager();
+ _saveMgr = new DefaultSaveFileManager();
}
// Create and hook up the mixer, if none exists yet (we check for this to
@@ -120,6 +120,11 @@
OSystem::initBackend();
}
+void OSystem_PalmBase::getTimeAndDate(struct tm &t) const {
+ time_t curTime = time(0);
+ t = *localtime(&curTime);
+}
+
uint32 OSystem_PalmBase::getMillis() {
return TimGetTicks() * 1000 / SysTicksPerSecond();
}
Modified: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.h 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_base.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -26,6 +26,8 @@
#ifndef BE_BASE_H
#define BE_BASE_H
+#include <time.h>
+
#include "PalmVersion.h"
#include "globals.h"
@@ -236,6 +238,7 @@
bool pollEvent(Common::Event &event);
+ void getTimeAndDate(struct tm &t) const;
virtual uint32 getMillis();
virtual void delayMillis(uint msecs);
Deleted: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,76 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_base.h"
-#include "common/savefile.h"
-#include "be_save.h"
-
-Common::StringList PalmSaveFileManager::listSavefiles(const char *pattern) {
- TODO: Implement this. If you don't understand what it should do, just ask
- (e.g. on scummvm-devel or Fingolfin). It should be pretty simple if you
- use Common::matchString from common/util.h and read the Doxygen docs,
- then combine this with the old code below...
-
-/*
-void PalmSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num) {
- FileRef fileRef;
- // try to open the dir
- Err e = VFSFileOpen(gVars->VFS.volRefNum, SCUMMVM_SAVEPATH, vfsModeRead, &fileRef);
- memset(marks, false, num*sizeof(bool));
-
- if (e != errNone)
- return;
-
- // enumerate all files
- UInt32 dirEntryIterator = vfsIteratorStart;
- Char filename[32];
- FileInfoType info = {0, filename, 32};
- UInt16 length = StrLen(prefix);
- int slot = 0;
-
- while (dirEntryIterator != vfsIteratorStop) {
- e = VFSDirEntryEnumerate (fileRef, &dirEntryIterator, &info);
-
- if (e != expErrEnumerationEmpty) { // there is something
-
- if (StrLen(info.nameP) == (length + 2)) { // consider max 99, filename length is ok
- if (StrNCaselessCompare(prefix, info.nameP, length) == 0) { // this seems to be a save file
- if (isdigit(info.nameP[length]) && isdigit(info.nameP[length+1])) {
-
- slot = StrAToI(filename + length);
- if (slot >= 0 && slot < num)
- *(marks+slot) = true;
-
- }
- }
- }
-
- }
- }
-
- VFSFileClose(fileRef);
-}
-
-}
Deleted: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.h
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.h 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/be_save.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKEND_SAVES_PALM_H
-#define BACKEND_SAVES_PALM_H
-
-#include "saves/default/default-saves.h"
-
-class PalmSaveFileManager : public DefaultSaveFileManager {
-public:
- Common::StringList listSavefiles(const char *pattern);
-};
-
-#endif
Modified: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/extend.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/extend.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/extend.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -29,8 +29,6 @@
#include "modulesrsc.h"
-const char *SCUMMVM_SAVEPATH = "/PALM/Programs/ScummVM/Saved";
-
void PalmFatalError(const char *err) {
WinSetDrawWindow(WinGetDisplayWindow());
WinPalette(winPaletteSetToDefault,0,0,0);
Modified: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_kyra.h
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_kyra.h 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_kyra.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -2,6 +2,6 @@
#define PREFIX_H
#include "native_common.h"
-#define ENABLE_KYRA
+#define ENABLE_KYRA STATIC_PLUGIN
#endif
Copied: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_m4.h (from rev 32700, scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_m4.h)
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_m4.h (rev 0)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_m4.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -0,0 +1,7 @@
+#ifndef PREFIX_H
+#define PREFIX_H
+
+#include "native_common.h"
+#define ENABLE_M4 STATIC_PLUGIN
+
+#endif
Copied: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_made.h (from rev 32700, scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_made.h)
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_made.h (rev 0)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_made.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -0,0 +1,7 @@
+#ifndef PREFIX_H
+#define PREFIX_H
+
+#include "native_common.h"
+#define ENABLE_MADE STATIC_PLUGIN
+
+#endif
Modified: scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_sword1.h
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_sword1.h 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/PalmOS/Src/prefixes/native_sword1.h 2008-06-14 14:44:29 UTC (rev 32702)
@@ -2,7 +2,7 @@
#define PREFIX_H
#include "native_common.h"
-#define ENABLE_SWORD1
+#define ENABLE_SWORD1 STATIC_PLUGIN
#define USE_MPEG2
#define USE_VORBIS
Modified: scummvm/branches/gsoc2008-gui/backends/platform/dc/selector.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/dc/selector.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/dc/selector.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -151,8 +151,8 @@
static void detectGames(FSList &files, GameList &candidates)
{
- const PluginList &plugins = PluginManager::instance().getPlugins();
- PluginList::const_iterator iter = plugins.begin();
+ const EnginePluginList &plugins = EngineMan.getPlugins();
+ EnginePluginList::const_iterator iter = plugins.begin();
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
candidates.push_back((*iter)->detectGames(files));
}
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/Makefile
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/Makefile 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/Makefile 2008-06-14 14:44:29 UTC (rev 32702)
@@ -68,7 +68,8 @@
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
-LIBDIRS := /home/neil/devkitpror21/libnds home/neil/devkitpror21/libnds/nds
+#LIBDIRS := /home/neil/devkitpror21/libnds home/neil/devkitpror21/libnds/nds
+LIBDIRS := $(DEVKITPRO)/libnds
#---------------------------------------------------------------------------------
@@ -127,7 +128,11 @@
@echo clean ...$(TARGET)
@rm -fr $(BUILD) *.bin
+#---------------------------------------------------------------------------------
+semiclean:
+ @echo semiclean ...$(TARGET)
+
#---------------------------------------------------------------------------------
else
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/source/main.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/source/main.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm7/source/main.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -36,7 +36,7 @@
#include <arm7/clock.h>
#include <stdlib.h>
#include <string.h>
-#include <registers_alt.h>
+//#include <registers_alt.h> // not needed in current libnds
#include <NDS/scummvm_ipc.h>
//////////////////////////////////////////////////////////////////////
#ifdef USE_DEBUGGER
@@ -261,6 +261,9 @@
REG_SPICNT = SPI_ENABLE | SPI_BAUD_1MHz;
REG_SPIDATA = enable? (result | data): (result & ~data);
SerialWaitBusy();
+
+ // FIXME: This function should either return something, or have a comment
+ // explaining why it is valid for it to not return something. :-)
}
/*
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/buildkeyboard.bat
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/buildkeyboard.bat 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/buildkeyboard.bat 2008-06-14 14:44:29 UTC (rev 32702)
@@ -2,7 +2,3 @@
..\tools\gfx2gba -c16 -t8 -M -pkeyboard_pal.raw ..\keyboard.bmp
del keyboard.map
pause
-cd data
-..\tools\gfx2gba -c16 -t8 -M -pkeyboard_pal.raw ..\keyboard.bmp
-del keyboard.map
-pause
\ No newline at end of file
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/lib/readme.txt
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/lib/readme.txt 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/lib/readme.txt 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,2 +1 @@
If building with MAD enabled, put libmad.a in here.
-If building with MAD enabled, put libmad.a in here.
\ No newline at end of file
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/makefile 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/makefile 2008-06-14 14:44:29 UTC (rev 32702)
@@ -1,47 +1,39 @@
+srcdir ?= .
+DEPDIR := .deps
+
#DYNAMIC_MODULES = 1
-#libndsdir = $(DEVKITPRO)/libnds
-libndsdir = /home/neil/devkitpror21/libnds
+libndsdir = $(DEVKITPRO)/libnds
+#libndsdir = /home/neil/devkitpror21/libnds
-# Select the build you want by uncommenting one of the following lines:
+# Select the build by setting SCUMM_BUILD to a,b,c,d,e,f or g.
+# Anything else gets build a.
-
-
-ifeq ($(SCUMM_BUILD),a)
- DS_BUILD_A = 1
-endif
-
-ifeq ($(SCUMM_BUILD),b)
- DS_BUILD_B = 1
-endif
-
-ifeq ($(SCUMM_BUILD),c)
- DS_BUILD_C = 1
-endif
-
-ifeq ($(SCUMM_BUILD),d)
- DS_BUILD_D = 1
-endif
-
-ifeq ($(SCUMM_BUILD),e)
- DS_BUILD_E = 1
-endif
-
-ifeq ($(SCUMM_BUILD),f)
- DS_BUILD_F = 1
-endif
-
ifeq ($(SCUMM_BUILD),g)
DS_BUILD_G = 1
+else
+ ifeq ($(SCUMM_BUILD),f)
+ DS_BUILD_F = 1
+ else
+ ifeq ($(SCUMM_BUILD),e)
+ DS_BUILD_E = 1
+ else
+ ifeq ($(SCUMM_BUILD),d)
+ DS_BUILD_D = 1
+ else
+ ifeq ($(SCUMM_BUILD),c)
+ DS_BUILD_C = 1
+ else
+ ifeq ($(SCUMM_BUILD),b)
+ DS_BUILD_B = 1
+ else
+ DS_BUILD_A = 1
+ endif
+ endif
+ endif
+ endif
+ endif
endif
-#DS_BUILD_A = 1
-#DS_BUILD_B = 1
-#DS_BUILD_C = 1
-#DS_BUILD_D = 1 # started!
-#DS_BUILD_E = 1
-#DS_BUILD_F = 1
-#DS_BUILD_G = 1
-
# To do:
# - FAT cache?
@@ -79,14 +71,21 @@
# Command to build libmad is:
# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork'
+#
+# I actually had to use
+# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork' LDFLAGS='C:/Progra~1/devkitpro/libnds/lib/libnds9.a' --disable-shared --disable-debugging
USE_ARM_SOUND_ASM = 1
ARM = 1
+USE_ARM_COSTUME_ASM = 1
ifdef DS_BUILD_A
- DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM
+ DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM
LOGO = logoa.bmp
ENABLE_SCUMM = STATIC_PLUGIN
+ DEFINES += -DENABLE_SCUMM=STATIC_PLUGIN
+ MODULES += engines/scumm
+
USE_ARM_GFX_ASM = 1
BUILD=scummvm-A
endif
@@ -146,10 +145,12 @@
CFLAGS = -Wno-multichar -Wall\
-Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
-mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
- -ffast-math -mthumb-interwork
+ -mthumb-interwork -DUSE_ARM_COSTUME_ASM=1
+# -ffast-math
+
ifdef USE_DEBUGGER
- DEFINES += -DUSE_DEBUGGER
+ DEFINES += -DUSE_DEBUGGER
CFLAGS += -g
endif
@@ -158,7 +159,7 @@
DEFINES += -DUSE_PROFILER
endif
-CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-non-virtual-dtor \
+CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder \
-fno-exceptions -fno-rtti -mthumb-interwork
# -mthumb
@@ -181,9 +182,9 @@
LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -Wl,--wrap,time -mno-fpu -Wl,-Map,map.txt
-INCLUDES= -I./ -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/common -I$(portdir)/source -I$(portdir)/source/compressor -I$(portdir)/source/fat \
- -I$(srcdir)/backends/fs -I$(srcdir)/backends/fs/ds -I$(portdir)/data -I$(libndsdir)/include -I$(portdir)/../commoninclude\
- -I$(srcdir)/scumm -I$(libndsdir)/include -I$(libndsdir)/include/nds -I$(srcdir)/engines -I$(portdir)/source/mad\
+INCLUDES= -I./ -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/common -I$(portdir)/source \
+ -I$(portdir)/data -I$(libndsdir)/include -I$(portdir)/../commoninclude\
+ -I$(libndsdir)/include -I$(libndsdir)/include/nds -I$(srcdir)/engines -I$(portdir)/source/mad\
-I$(portdir)/source/libcartreset -include $(srcdir)/common/scummsys.h
@@ -258,13 +259,15 @@
#OPTLIST :=
# Compiler options for files which should be optimised for speed
-OPT_SPEED := -O3
+OPT_SPEED := -O2
# Compiler options for files which should be optimised for space
-OPT_SIZE := -Os -mthumb -fno-gcse -fno-schedule-insns2
+OPT_SIZE := -Os
+#-mthumb -fno-gcse -fno-schedule-insns2
+
OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS)
@@ -277,6 +280,9 @@
include $(srcdir)/Makefile.common
+semiclean:
+ $(RM) $(portdir)/source/dsoptions.o $(portdir)/source/dsmain.o $(FAT_OBJS) $(DATA_OBJS) $(portdir)/source/wordcompletion.o
+
clean:
$(RM) $(OBJS) $(EXECUTABLE)
rm -fr $(BUILD)
@@ -330,8 +336,8 @@
ifndef HAVE_GCC3
# If you use GCC, disable the above and enable this for intelligent
# dependency tracking.
-.cpp.o:
-
+#.cpp.o:
+%.o:%.cpp
$(MKDIR) $(*D)/$(DEPDIR)
$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
# $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
@@ -342,7 +348,8 @@
# rule can get you into a bad state if you Ctrl-C at the wrong moment.
# Also, with this GCC inserts additional dummy rules for the involved headers,
# which ensures a smooth compilation even if said headers become obsolete.
-.cpp.o:
+#.cpp.o:
+%.o:%.cpp
# echo !!!!!!!!!!!! $(notdir $<)
# ifeq ( $(notdir $<), $(findstring $(notdir $<), $(OPTLIST)) )
# OPTFLAG=-O3
@@ -354,8 +361,7 @@
# echo !!!!!!!! $(OPTFLAG)
$(MKDIR) $(*D)/$(DEPDIR)
- $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
- $(CXX) -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" $(if $(findstring $(notdir $<), $(OPTLIST)), $(OPT_SPEED), $(OPT_SIZE)) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+ $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(if $(findstring $(notdir $<), $(OPTLIST)), $(OPT_SPEED), $(OPT_SIZE)) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
endif
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/adpcm_arm.s
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/adpcm_arm.s 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/adpcm_arm.s 2008-06-14 14:44:29 UTC (rev 32702)
@@ -55,14 +55,14 @@
loop:
LDRH r10,[r11,r2] @ r10 = stepTab[stepTableIndex]
TST r12,#4 @ if ((offset & 4) == 0)
- MOVEQ r9, #0 @ r9 = diff = 0
+ MOVEQ r9, #0 @ r9 = diff = 0
MOVNE r9, r10 @ else r9 = diff = stepTab[stepTableIndex]
TST r12,#2 @ if (offset & 2)
- ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1
+ ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1
TST r12,#1 @ if (offset & 1)
- ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2
+ ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2
ADD r9, r9, r10,ASR #3 @ diff += r10>>3
Modified: scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters.cpp 2008-06-14 14:44:06 UTC (rev 32701)
+++ scummvm/branches/gsoc2008-gui/backends/platform/ds/arm9/source/blitters.cpp 2008-06-14 14:44:29 UTC (rev 32702)
@@ -27,25 +27,25 @@
namespace DS {
-void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
+void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
int vsPitch, int vmScreenWidth, int textSurfacePitch) {
if (height <= 0) height = 1;
if (width < 4) return;
-
-
+
+
width &= ~4;
// src = (const byte *) (((int) (src)) & (~4));
// dst = (byte *) (((int) (dst)) & (~4));
// text = (const byte *) (((int) (text)) & (~4));
-
+
asm ( "mov r5, %0\n" // Height
- "yLoop:\n"
+ "yLoop:\n"
"mov r3, #0\n" // X pos
-
+
"xLoop:\n"
-
+
"ldr r4, [%2, r3]\n" // Load text layer word
"cmp r4, %5\n"
"bne singleByteCompare\n"
@@ -54,7 +54,7 @@
"add r3, r3, #4\n"
"cmp r3, %1\n" // x == width?
"blt xLoop\n"
-
+
"add %2, %2, %8\n" // src += vs->pitch
"add %3, %3, %6\n" // dst += _vm->_screenWidth
"add %4, %4, %7\n" // text += _textSurface.pitch
@@ -62,8 +62,8 @@
"cmp r5, #0\n" // y == 0?
"bne yLoop\n"
"b end\n"
-
-
+
+
"singleByteCompare:\n"
"ldrb r4, [%2, r3]\n" // Load text byte
"cmps r4, %5, lsr #24\n" // Compare with mask
@@ -78,7 +78,7 @@
"ldreqb r4, [%3, r3]\n" // Otherwise Load src byte
"streqb r4, [%4, r3]\n" // Store it
"add r3, r3, #1\n"
-
+
"ldrb r4, [%2, r3]\n" // Load text byte
"cmps r4, %5, lsr #24\n" // Compare with mask
"strneb r4, [%4, r3]\n" // Store if not equal
@@ -91,7 +91,7 @@
"strneb r4, [%4, r3]\n" // Store if not equal
"ldreqb r4, [%3, r3]\n" // Otherwise Load src byte
"streqb r4, [%4, r3]\n" // Store it
- "add r3, r3, #1\n"
+ "add r3, r3, #1\n"
"cmps r3, %1\n" // x == width?
"blt xLoop\n" // Repeat
@@ -101,10 +101,10 @@
"sub r5, r5, #1\n" // y -= 1
"cmp r5, #0\n" // y == 0?
"bne yLoop\n"
-
+
"end:\n"
: /* no output registers */
- : "r" (height), "r" (width), "r" (text), "r" (src), "r" (dst), "r" (CHARSET_MASK_TRANSPARENCY | (CHARSET_MASK_TRANSPARENCY << 8) | (CHARSET_MASK_TRANSPARENCY << 16) | (CHARSET_MASK_TRANSPARENCY << 24)),
+ : "r" (height), "r" (width), "r" (text), "r" (src), "r" (dst), "r" (CHARSET_MASK_TRANSPARENCY | (CHARSET_MASK_TRANSPARENCY << 8) | (CHARSET_MASK_TRANSPARENCY << 16) | (CHARSET_MASK_TRANSPARENCY << 24)),
"r" (vsPitch), "r" (vmScreenWidth), "r" (textSurfacePitch)
: "r5", "r3", "r4", "%2", "%3", "%4", "memory");
}
@@ -115,7 +115,7 @@
asm("ands r0, %3, #1\n"
"addne %3, %3, #1\n"
"bne roll2\n"
-
+
"yLoop2:\n"
"ldr r0, [%2, #0]\n"
"str r0, [%0, #0]\n"
@@ -131,7 +131,7 @@
"add %0, %0, %1\n"
"add %2, %2, %1\n"
"subs %3, %3, #2\n"
- "bne yLoop2\n"
+ "bne yLoop2\n"
: /* no output registers */
: "r" (dst), "r" (dstPitch), "r" (src), "r" (height)
@@ -150,7 +150,7 @@
for (int i=0; i<160; ++i)
{
DIV_BY_5[i] = (2*i+5)/10;
- }
+ }
}
#ifdef PERFECT_5_TO_4_RESCALING
@@ -163,13 +163,13 @@
u32 bs3 = s3 & 0x1F;
u32 bs4 = s4 & 0x1F;
-#if 0
+#if 0
u32 gs0 = (s0 >> 5) & 0x1F;
u32 gs1 = (s1 >> 5) & 0x1F;
u32 gs2 = (s2 >> 5) & 0x1F;
u32 gs3 = (s3 >> 5) & 0x1F;
u32 gs4 = (s4 >> 5) & 0x1F;
-
+
u32 rs0 = (s0 >> 10) & 0x1F;
u32 rs1 = (s1 >> 10) & 0x1F;
u32 rs2 = (s2 >> 10) & 0x1F;
@@ -191,22 +191,22 @@
asm("and %0, %2, %1, lsr #10" : "=r"(rs3) : "r"(s3), "r"(mask) : );
asm("and %0, %2, %1, lsr #10" : "=r"(rs4) : "r"(s4), "r"(mask) : );
#endif
-
+
u32 rd0 = 4*rs0 + rs1;
u32 rd1 = 2*rs1 + rs1 + 2*rs2;
u32 rd2 = 2*rs2 + 2*rs3 + rs3;
u32 rd3 = rs3 + 4*rs4;
-
+
u32 gd0 = 4*gs0 + gs1;
u32 gd1 = 2*gs1 + gs1 + 2*gs2;
u32 gd2 = 2*gs2 + 2*gs3 + gs3;
u32 gd3 = gs3 + 4*gs4;
-
+
u32 bd0 = 4*bs0 + bs1;
u32 bd1 = 2*bs1 + bs1 + 2*bs2;
u32 bd2 = 2*bs2 + 2*bs3 + bs3;
u32 bd3 = bs3 + 4*bs4;
-
+
#if 0
// Offsetting for correct rounding
rd0 = rd0*2+5; rd1 = rd1*2+5; rd2 = rd2*2+5; rd3 = rd3*2+5;
@@ -217,14 +217,14 @@
gd0 = (gd0 * 51) >> 9; gd1 = (gd1 * 51) >> 9; gd2 = (gd2 * 51) >> 9; gd3 = (gd3 * 51) >> 9;
bd0 = (bd0 * 51) >> 9; bd1 = (bd1 * 51) >> 9; bd2 = (bd2 * 51) >> 9; bd3 = (bd3 * 51) >> 9;
#else
- rd0 = DIV_BY_5[rd0]; rd1 = DIV_BY_5[rd1]; rd2 = DIV_BY_5[rd2]; rd3 = DIV_BY_5[rd3];
- gd0 = DIV_BY_5[gd0]; gd1 = DIV_BY_5[gd1]; gd2 = DIV_BY_5[gd2]; gd3 = DIV_BY_5[gd3];
- bd0 = DIV_BY_5[bd0]; bd1 = DIV_BY_5[bd1]; bd2 = DIV_BY_5[bd2]; bd3 = DIV_BY_5[bd3];
+ rd0 = DIV_BY_5[rd0]; rd1 = DIV_BY_5[rd1]; rd2 = DIV_BY_5[rd2]; rd3 = DIV_BY_5[rd3];
+ gd0 = DIV_BY_5[gd0]; gd1 = DIV_BY_5[gd1]; gd2 = DIV_BY_5[gd2]; gd3 = DIV_BY_5[gd3];
+ bd0 = DIV_BY_5[bd0]; bd1 = DIV_BY_5[bd1]; bd2 = DIV_BY_5[bd2]; bd3 = DIV_BY_5[bd3];
#endif
-
+
u32 d10 = 0x80008000 | (rd1 << 26) | (gd1 << 21) | (bd1 << 16) | (rd0 << 10) | (gd0 << 5) | bd0;
u32 d32 = 0x80008000 | (rd3 << 26) | (gd3 << 21) | (bd3 << 16) | (rd2 << 10) | (gd2 << 5) | bd2;
-
+
((u32*)dest)[0] = d10;
((u32*)dest)[1] = d32;
}
@@ -233,7 +233,7 @@
u16* dest)
{
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list