~ubuntu-branches/debian/experimental/mednafen/experimental

Viewing changes to src/snes/interface.cpp

Committer: Package Import Robot
Author(s): Stephen Kitt
Date: 2012-01-31 07:21:35 UTC
mfrom: (1.2.8)
Revision ID: package-import@ubuntu.com-20120131072135-es3dj12y00xcnrsk

Tags: 0.9.19-1

* New upstream WIP version.
* Update copyright information.
* Refresh use-system-tremor.patch and remove psx-big-endian-only.patch.
* Add spelling-fixes.patch based on Lintian's recommendations.
* Build-depend on debhelper 9 or later and remove corresponding Lintian
override.

files added:
.pc/spelling-fixes.patch

.pc/spelling-fixes.patch/src

.pc/spelling-fixes.patch/src/vb

.pc/spelling-fixes.patch/src/vb/vb.cpp

debian/gbp.conf

debian/patches/spelling-fixes.patch

intl/setlocale.c

intl/threadlib.c

m4/fcntl-o.m4

m4/threadlib.m4

src/Stream.cpp

src/Stream.h

src/cdrom/CDAccess.cpp

src/cdrom/CDAccess.h

src/cdrom/CDAccess_Image.cpp

src/cdrom/CDAccess_Image.h

src/cdrom/CDAccess_Physical.cpp

src/cdrom/CDAccess_Physical.h

src/cdrom/CDUtility.cpp

src/cdrom/CDUtility.h

src/pce/mcgenjin.cpp

src/pce/mcgenjin.h

src/pce/mcgenjin_ym2413.inc

src/psx/NOTES

src/psx/SOURCES

src/psx/gpu_line.inc

src/psx/gpu_polygon.inc

src/psx/gpu_sprite.inc

src/psx/gte_divrecip.inc

src/psx/input/dualanalog.cpp

src/psx/input/dualanalog.h

src/psx/input/memcard.cpp

src/psx/input/memcard.h

src/psx/input/mouse.cpp

src/psx/input/mouse.h

src/psx/input/multitap.cpp

src/psx/input/multitap.h

files removed:
.pc/psx-big-endian-only.patch

.pc/psx-big-endian-only.patch/configure.ac

debian/patches/psx-big-endian-only.patch

debian/source/lintian-overrides

po/Makevars.template

src/cdrom/cdromfile-stuff.h

src/cdrom/cdromfile.cpp

src/cdrom/cdromfile.h

files modified:
.pc/applied-patches

.pc/use-system-tremor.patch/configure.ac

.pc/use-system-tremor.patch/src/Makefile.am

.pc/use-system-tremor.patch/src/cdrom/audioreader.cpp

.pc/use-system-tremor.patch/src/tremor/Makefile.in

ABOUT-NLS

ChangeLog

Documentation/docgen.inc

Documentation/gb.html

Documentation/gba.html

Documentation/gg.html

Documentation/lynx.html

Documentation/lynx.php

Documentation/md.html

Documentation/mednafen.html

Documentation/mednafen.php

Documentation/nes.html

Documentation/ngp.html

Documentation/pce.html

Documentation/pce_fast.html

Documentation/pcfx.html

Documentation/psx.html

Documentation/psx.php

Documentation/settings.def

Documentation/sms.html

Documentation/snes.html

Documentation/vb.html

Documentation/wswan.html

Documentation/wswan.php

Makefile.in

README

TODO

acinclude.m4

aclocal.m4

config.guess

config.rpath

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/copyright

debian/patches/series

debian/patches/use-system-tremor.patch

include/blip/Blip_Buffer.h

include/config.h.in

include/config.h.in~

intl/ChangeLog

intl/Makefile.in

intl/VERSION

intl/bindtextdom.c

intl/config.charset

intl/dcigettext.c

intl/gettextP.h

intl/intl-compat.c

intl/intl-exports.c

intl/l10nflist.c

intl/langprefs.c

intl/libgnuintl.h.in

intl/libintl.rc

intl/loadmsgcat.c

intl/localcharset.c

intl/localename.c

intl/lock.c

intl/lock.h

intl/log.c

intl/os2compat.h

intl/printf-args.c

intl/printf-args.h

intl/printf-parse.c

intl/printf-parse.h

intl/printf.c

intl/relocatable.c

intl/relocatable.h

intl/tsearch.c

intl/tsearch.h

intl/vasnprintf.c

intl/vasnwprintf.h

intl/wprintf-parse.h

intl/xsize.h

ltmain.sh

m4/ChangeLog

m4/codeset.m4

m4/gettext.m4

m4/glibc2.m4

m4/glibc21.m4

m4/iconv.m4

m4/intdiv0.m4

m4/intl.m4

m4/intldir.m4

m4/intlmacosx.m4

m4/intmax.m4

m4/inttypes-pri.m4

m4/inttypes_h.m4

m4/lcmessage.m4

m4/lib-ld.m4

m4/lib-link.m4

m4/lib-prefix.m4

m4/lock.m4

m4/longlong.m4

m4/nls.m4

m4/po.m4

m4/printf-posix.m4

m4/progtest.m4

m4/size_max.m4

m4/stdint_h.m4

m4/uintmax_t.m4

m4/visibility.m4

m4/wchar_t.m4

m4/wint_t.m4

m4/xsize.m4

po/ChangeLog

po/Makefile.in.in

po/Makevars

po/POTFILES.in

po/Rules-quot

po/de.gmo

po/de.po

po/es.gmo

po/es.po

po/mednafen.pot

po/ru.gmo

po/ru.po

src/FileWrapper.cpp

src/FileWrapper.h

src/Makefile.am

src/Makefile.in

src/cdplay.cpp

src/cdrom/Makefile.am.inc

src/cdrom/SimpleFIFO.h

src/cdrom/audioreader.cpp

src/cdrom/cdromif.cpp

src/cdrom/cdromif.h

src/cdrom/crc32.cpp

src/cdrom/dvdisaster.h

src/cdrom/pcecd.cpp

src/cdrom/recover-raw.cpp

src/cdrom/scsicd-pce-commands.inc

src/cdrom/scsicd.cpp

src/cdrom/scsicd.h

src/compress/ioapi.c

src/compress/ioapi.h

src/compress/unzip.c

src/compress/unzip.h

src/debug.h

src/demo/Makefile.in

src/desa68/Makefile.in

src/drivers/Makefile.in

src/drivers/help.cpp

src/drivers/input-config.cpp

src/drivers/input-config.h

src/drivers/input-default-buttons.h

src/drivers/input.cpp

src/drivers/input.h

src/drivers/joystick.cpp

src/drivers/joystick.h

src/drivers/main.cpp

src/drivers/nongl.cpp

src/drivers/opengl.cpp

src/drivers/opengl.h

src/drivers/shader.cpp

src/drivers/shader.h

src/drivers/sound.cpp

src/drivers/video.cpp

src/drivers/video.h

src/file.cpp

src/file.h

src/gb/Makefile.in

src/gb/gb.cpp

src/gb/gb.h

src/gb/gbGlobals.cpp

src/gb/gbGlobals.h

src/gb/gfx.cpp

src/gb/memory.cpp

src/gb/memory.h

src/gb/sound.cpp

src/gb/sound.h

src/gb/z80.cpp

src/gb/z80.h

src/gba/GBA.cpp

src/gba/GBA.h

src/gba/GBAinline.cpp

src/gba/GBAinline.h

src/gba/Gfx.cpp

src/gba/Gfx.h

src/gba/Globals.cpp

src/gba/Globals.h

src/gba/Makefile.in

src/gba/Mode0.cpp

src/gba/Mode1.cpp

src/gba/Mode2.cpp

src/gba/Mode3.cpp

src/gba/Mode4.cpp

src/gba/Mode5.cpp

src/gba/Port.h

src/gba/RTC.cpp

src/gba/RTC.h

src/gba/Sound.cpp

src/gba/Sound.h

src/gba/arm.cpp

src/gba/arm.h

src/gba/bios.cpp

src/gba/bios.h

src/gba/eeprom.cpp

src/gba/eeprom.h

src/gba/flash.cpp

src/gba/flash.h

src/gba/gfx-draw.h

src/gba/sram.cpp

src/gba/sram.h

src/gba/thumb.cpp

src/gba/thumb.h

src/general.cpp

src/general.h

src/git.h

src/hw_cpu/Makefile.in

src/hw_misc/Makefile.in

src/hw_misc/arcade_card/arcade_card.cpp

src/hw_sound/Makefile.in

src/hw_sound/ym2413/emu2413.cpp

src/hw_video/Makefile.in

src/lepacker.h

src/lynx/Makefile.in

src/lynx/susie.cpp

src/math_ops.h

src/md/Makefile.in

src/md/cart/map_svp.cpp

src/md/cd/cd.cpp

src/md/cd/cd.h

src/md/cd/cdc_cdd.cpp

src/md/debug.cpp

src/md/system.cpp

src/md/vdp.cpp

src/md/vdp_run.inc

src/mednafen-driver.h

src/mednafen.cpp

src/mpcdec/Makefile.in

src/nes/Makefile.in

src/nes/boards/emutypes.h

src/nes/boards/fme7.cpp

src/nes/boards/mmc5.cpp

src/nes/cart.cpp

src/nes/fds.cpp

src/nes/filter.cpp

src/nes/filter.h

src/nes/input/arkanoid.cpp

src/nes/input/cursor.cpp

src/nes/input/oekakids.cpp

src/nes/input/shadow.cpp

src/nes/input/zapper.cpp

src/nes/nes.cpp

src/nes/ntsc/nes_ntsc.cpp

src/nes/ppu/ppu-fastrl.h

src/nes/ppu/ppu.cpp

src/nes/ppu/ppu.h

src/nes/sound.cpp

src/nes/unif.cpp

src/nes/vsuni.cpp

src/ngp/Makefile.in

src/ngp/mem.cpp

src/pce/Makefile.am

src/pce/Makefile.in

src/pce/hes.cpp

src/pce/huc.cpp

src/pce/huc.h

src/pce/pce.cpp

src/pce/vce_sync.inc

src/pce_fast/Makefile.in

src/pce_fast/hes.cpp

src/pce_fast/pce.cpp

src/pce_fast/vdc.cpp

src/pcfx/Makefile.in

src/pcfx/fxscsi.cpp

src/pcfx/huc6273.cpp

src/pcfx/king.cpp

src/pcfx/pcfx.cpp

src/pcfx/rainbow.cpp

src/player.cpp

src/psx/.Tpo

src/psx/Makefile.am

src/psx/Makefile.in

src/psx/README.NOW

src/psx/cdc.cpp

src/psx/cdc.h

src/psx/cpu.cpp

src/psx/cpu.h

src/psx/debug.cpp

src/psx/debug.h

src/psx/dis.cpp

src/psx/dma.cpp

src/psx/dma.h

src/psx/frontio.cpp

src/psx/frontio.h

src/psx/gpu.cpp

src/psx/gpu.h

src/psx/gpu_command_table.inc

src/psx/gte.cpp

src/psx/input/gamepad.cpp

src/psx/irq.cpp

src/psx/mdec.cpp

src/psx/mdec.h

src/psx/psx.cpp

src/psx/psx.h

src/psx/sio.cpp

src/psx/sio.h

src/psx/spu.cpp

src/psx/spu.h

src/psx/spu_reverb.inc

src/psx/timer.cpp

src/psx/timer.h

src/qtrecord.cpp

src/settings.cpp

src/sexyal/Makefile.in

src/sms/Makefile.in

src/sms/hvc.inc

src/sms/pio.cpp

src/sms/render.cpp

src/sms/sound.cpp

src/sms/system.cpp

src/sms/vdp.cpp

src/sms/vdp.h

src/snes/Makefile.in

src/snes/interface.cpp

src/sound/Blip_Buffer.cpp

src/sound/Makefile.in

src/sound/WAVRecord.cpp

src/state.cpp

src/tests.cpp

src/trio/Makefile.in

src/vb/Makefile.in

src/vb/vb.cpp

src/video/surface.cpp

src/video/tblur.cpp

src/video/text.cpp

src/wswan/Makefile.in

src/wswan/dis/opcodes.inc

src/wswan/main.cpp

src/wswan/memory.cpp

src/wswan/memory.h

Show diffs side-by-side

added added

removed removed

src/snes/interface.cpp

static uint8 MouseBLatch[2];

static uint8 *CustomColorMap = NULL;

static uint32 ColorMap[32768];

//static uint32 ColorMap[32768];

static std::vector<uint32> ColorMap;

static bool LoadCPalette(const char *syspalname, uint8 **ptr, uint32 num_entries)

{

479

480

481

MDFNMP_AddRAM(131072, 0x7E << 16, SNES::memory::wram.data());

481

482

483

ColorMap.resize(32768);

484

482

485

if(!LoadCPalette(NULL, &CustomColorMap, 32768))

483

486

return(0); // FIXME: cleanup

484

487

620

623

const int id;

621

624

};

622

625

623

static StrToBSIT_t StrToBSIT[] =

626

static const StrToBSIT_t StrToBSIT[] =

624

627

{

625

628

{ "none", SNES::Input::DeviceNone },

626

629

{ "gamepad", SNES::Input::DeviceJoypad },

639

642

640

643

if(port < 2)

641

644

{

642

StrToBSIT_t *sb = StrToBSIT;

645

const StrToBSIT_t *sb = StrToBSIT;

643

646

int id = -1;

644

647

645

648

if(MultitapEnabled[port] && !strcmp(type, "gamepad"))

716

719

{ "r", "Right Shoulder", 11, IDIT_BUTTON, NULL },

717

720

};

718

721

719

const InputDeviceInputInfoStruct MouseIDII[0x4] =

722

static const InputDeviceInputInfoStruct MouseIDII[0x4] =

720

723

{

721

724

{ "x_axis", "X Axis", -1, IDIT_X_AXIS_REL },

722

725

{ "y_axis", "Y Axis", -1, IDIT_Y_AXIS_REL },

788

791

PortInfo

789

792

};

790

793

791

static MDFNSetting SNESSettings[] =

794

static const MDFNSetting SNESSettings[] =

792

795

{

793

796

{ "snes.input.port1.multitap", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Enable multitap on SNES port 1."), NULL, MDFNST_BOOL, "0", NULL, NULL },

794

797

{ "snes.input.port2.multitap", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, gettext_noop("Enable multitap on SNES port 2."), NULL, MDFNST_BOOL, "0", NULL, NULL },

Older »