diff --git a/65c816.h b/65c816.h index 995fcbbb..3c1278f7 100644 --- a/65c816.h +++ b/65c816.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/apu/SNES_SPC.cpp b/apu/SNES_SPC.cpp index d6f6c927..567b7ddc 100644 --- a/apu/SNES_SPC.cpp +++ b/apu/SNES_SPC.cpp @@ -82,7 +82,7 @@ void SNES_SPC::enable_rom( int enable ) { if ( m.rom_enabled != enable ) { - m.rom_enabled = enable; + m.rom_enabled = dsp.rom_enabled = enable; if ( enable ) memcpy( m.hi_ram, &RAM [rom_addr], sizeof m.hi_ram ); memcpy( &RAM [rom_addr], (enable ? m.rom : m.hi_ram), rom_size ); diff --git a/apu/SNES_SPC.h b/apu/SNES_SPC.h index bc69e94d..baf90063 100644 --- a/apu/SNES_SPC.h +++ b/apu/SNES_SPC.h @@ -7,6 +7,12 @@ #include "SPC_DSP.h" #include "blargg_endian.h" +#ifdef DEBUGGER +#include "snes9x.h" +#include "display.h" +#include "debug.h" +#endif + struct SNES_SPC { public: typedef BOOST::uint8_t uint8_t; @@ -114,6 +120,16 @@ public: uint8_t dsp_reg_value( int, int ); int dsp_envx_value( int ); +//// Snes9x Debugger + +#ifdef DEBUGGER + void debug_toggle_trace( void ); + bool debug_is_enabled( void ); + void debug_do_trace( int, int, int, uint8_t const *, uint8_t *, int, int, int, int ); + void debug_op_print( char *, int, int, int, uint8_t const *, uint8_t *, int, int, int, int ); + void debug_io_print( char * ); +#endif + public: BLARGG_DISABLE_NOTHROW @@ -263,6 +279,11 @@ private: // Snes9x timing hack bool allow_time_overflow; +// Snes9x debugger +#ifdef DEBUGGER + FILE *apu_trace; + bool debug_trace; +#endif }; #include diff --git a/apu/SNES_SPC_misc.cpp b/apu/SNES_SPC_misc.cpp index 52899157..078120d2 100644 --- a/apu/SNES_SPC_misc.cpp +++ b/apu/SNES_SPC_misc.cpp @@ -70,7 +70,15 @@ blargg_err_t SNES_SPC::init() } allow_time_overflow = false; - + + dsp.rom = m.rom; + dsp.hi_ram = m.hi_ram; + +#ifdef DEBUGGER + apu_trace = NULL; + debug_trace = false; +#endif + #if SPC_LESS_ACCURATE memcpy( reg_times, reg_times_, sizeof reg_times ); #endif @@ -141,7 +149,7 @@ void SNES_SPC::load_regs( uint8_t const in [reg_count] ) // and timer counts. Copies these to proper registers. void SNES_SPC::ram_loaded() { - m.rom_enabled = 0; + m.rom_enabled = dsp.rom_enabled = 0; load_regs( &RAM [0xF0] ); // Put STOP instruction around memory to catch PC underflow/overflow @@ -413,3 +421,435 @@ int SNES_SPC::dsp_envx_value( int ch ) { return dsp.envx_value( ch ); } + +//// Snes9x debugger + +#ifdef DEBUGGER + +void SNES_SPC::debug_toggle_trace( void ) +{ + debug_trace = !debug_trace; + + if (debug_trace) + { + printf("APU tracing enabled.\n"); + ENSURE_TRACE_OPEN(apu_trace, "apu_trace.log", "wb") + } + else + { + printf("APU tracing disabled.\n"); + fclose(apu_trace); + apu_trace = NULL; + } +} + +bool SNES_SPC::debug_is_enabled( void ) { return debug_trace; } + +void SNES_SPC::debug_do_trace( int a, int x, int y, uint8_t const *pc, uint8_t *sp, int psw, int c, int nz, int dp ) +{ + char msg[512]; + + ENSURE_TRACE_OPEN(apu_trace, "apu_trace.log", "a") + + debug_op_print(msg, a, x, y, pc, sp, psw, c, nz, dp); + fprintf(apu_trace, "%s ", msg); + debug_io_print(msg); + fprintf(apu_trace, "%s ", msg); + S9xPrintHVPosition(msg); + fprintf(apu_trace, "%s\n", msg); +} + +void SNES_SPC::debug_op_print( char *buffer, int a, int x, int y, uint8_t const *pc, uint8_t *sp, int psw, int c, int nz, int dp ) +{ + static char mnemonics[256][20] = + { + "NOP", + "TCALL 0", + "SET1 $%02X.0", + "BBS $%02X.0,$%04X", + "OR A,$%02X", + "OR A,!$%04X", + "OR A,(X)", + "OR A,[$%02X+X]", + "OR A,#$%02X", + "OR $%02X,$%02X", + "OR1 C,$%04X.%d", + "ASL $%02X", + "MOV !$%04X,Y", + "PUSH PSW", + "TSET1 !$%04X", + "BRK", + "BPL $%04X", + "TCALL 1", + "CLR1 $%02X.0", + "BBC $%02X.0,$%04X", + "OR A,$%02X+X", + "OR A,!$%04X+X", + "OR A,!$%04X+Y", + "OR A,[$%02X]+Y", + "OR $%02X,#$%02X", + "OR (X),(Y)", + "DECW $%02X", + "ASL $%02X+X", + "ASL A", + "DEC X", + "CMP X,!$%04X", + "JMP [!$%04X+X]", + "CLRP", + "TCALL 2", + "SET1 $%02X.1", + "BBS $%02X.1,$%04X", + "AND A,$%02X", + "AND A,!$%04X", + "AND A,(X)", + "AND A,[$%02X+X]", + "AND A,#$%02X", + "AND $%02X,$%02X", + "OR1 C,/$%04X.%d", + "ROL $%02X", + "ROL !$%04X", + "PUSH A", + "CBNE $%02X,$%04X", + "BRA $%04X", + "BMI $%04X", + "TCALL 3", + "CLR1 $%02X.1", + "BBC $%02X.1,$%04X", + "AND A,$%02X+X", + "AND A,!$%04X+X", + "AND A,!$%04X+Y", + "AND A,[$%02X]+Y", + "AND $%02X,#$%02X", + "AND (X),(Y)", + "INCW $%02X", + "ROL $%02X+X", + "ROL A", + "INC X", + "CMP X,$%02X", + "CALL !$%04X", + "SETP", + "TCALL 4", + "SET1 $%02X.2", + "BBS $%02X.2,$%04X", + "EOR A,$%02X", + "EOR A,!$%04X", + "EOR A,(X)", + "EOR A,[$%02X+X]", + "EOR A,#$%02X", + "EOR $%02X,$%02X", + "AND1 C,$%04X.%d", + "LSR $%02X", + "LSR !$%04X", + "PUSH X", + "TCLR1 !$%04X", + "PCALL $%02X", + "BVC $%04X", + "TCALL 5", + "CLR1 $%02X.2", + "BBC $%02X.2,$%04X", + "EOR A,$%02X+X", + "EOR A,!$%04X+X", + "EOR A,!$%04X+Y", + "EOR A,[$%02X]+Y", + "EOR $%02X,#$%02X", + "EOR (X),(Y)", + "CMPW YA,$%02X", + "LSR $%02X+X", + "LSR A", + "MOV X,A", + "CMP Y,!$%04X", + "JMP !$%04X", + "CLRC", + "TCALL 6", + "SET1 $%02X.3", + "BBS $%02X.3,$%04X", + "CMP A,$%02X", + "CMP A,!$%04X", + "CMP A,(X)", + "CMP A,[$%02X+X]", + "CMP A,#$%02X", + "CMP $%02X,$%02X", + "AND1 C,/$%04X.%d", + "ROR $%02X", + "ROR !$%04X", + "PUSH Y", + "DBNZ $%02X,$%04X", + "RET", + "BVS $%04X", + "TCALL 7", + "CLR1 $%02X.3", + "BBC $%02X.3,$%04X", + "CMP A,$%02X+X", + "CMP A,!$%04X+X", + "CMP A,!$%04X+Y", + "CMP A,[$%02X]+Y", + "CMP $%02X,#$%02X", + "CMP (X),(Y)", + "ADDW YA,$%02X", + "ROR $%02X+X", + "ROR A", + "MOV A,X", + "CMP Y,$%02X", + "RET1", + "SETC", + "TCALL 8", + "SET1 $%02X.4", + "BBS $%02X.4,$%04X", + "ADC A,$%02X", + "ADC A,!$%04X", + "ADC A,(X)", + "ADC A,[$%02X+X]", + "ADC A,#$%02X", + "ADC $%02X,$%02X", + "EOR1 C,$%04X.%d", + "DEC $%02X", + "DEC !$%04X", + "MOV Y,#$%02X", + "POP PSW", + "MOV $%02X,#$%02X", + "BCC $%04X", + "TCALL 9", + "CLR1 $%02X.4", + "BBC $%02X.4,$%04X", + "ADC A,$%02X+X", + "ADC A,!$%04X+X", + "ADC A,!$%04X+Y", + "ADC A,[$%02X]+Y", + "ADC $%02X,#$%02X", + "ADC (X),(Y)", + "SUBW YA,$%02X", + "DEC $%02X+X", + "DEC A", + "MOV X,SP", + "DIV YA,X", + "XCN A", + "EI", + "TCALL 10", + "SET1 $%02X.5", + "BBS $%02X.5,$%04X", + "SBC A,$%02X", + "SBC A,!$%04X", + "SBC A,(X)", + "SBC A,[$%02X+X]", + "SBC A,#$%02X", + "SBC $%02X,$%02X", + "MOV1 C,$%04X.%d", + "INC $%02X", + "INC !$%04X", + "CMP Y,#$%02X", + "POP A", + "MOV (X)+,A", + "BCS $%04X", + "TCALL 11", + "CLR1 $%02X.5", + "BBC $%02X.5,$%04X", + "SBC A,$%02X+X", + "SBC A,!$%04X+X", + "SBC A,!$%04X+Y", + "SBC A,[$%02X]+Y", + "SBC $%02X,#$%02X", + "SBC (X),(Y)", + "MOVW YA,$%02X", + "INC $%02X+X", + "INC A", + "MOV SP,X", + "DAS A", + "MOV A,(X)+", + "DI", + "TCALL 12", + "SET1 $%02X.6", + "BBS $%02X.6,$%04X", + "MOV $%02X,A", + "MOV !$%04X,A", + "MOV (X),A", + "MOV [$%02X+X],A", + "CMP X,#$%02X", + "MOV !$%04X,X", + "MOV1 $%04X.%d,C", + "MOV $%02X,Y", + "ASL !$%04X", + "MOV X,#$%02X", + "POP X", + "MUL YA", + "BNE $%04X", + "TCALL 13", + "CLR1 $%02X.6", + "BBC $%02X.6,$%04X", + "MOV $%02X+X,A", + "MOV !$%04X+X,A", + "MOV !$%04X+Y,A", + "MOV [$%02X]+Y,A", + "MOV $%02X,X", + "MOV $%02X+Y,X", + "MOVW $%02X,YA", + "MOV $%02X+X,Y", + "DEC Y", + "MOV A,Y", + "CBNE $%02X+X,$%04X", + "DAA A", + "CLRV", + "TCALL 14", + "SET1 $%02X.7", + "BBS $%02X.7,$%04X", + "MOV A,$%02X", + "MOV A,!$%04X", + "MOV A,(X)", + "MOV A,[$%02X+X]", + "MOV A,#$%02X", + "MOV X,!$%04X", + "NOT1 $%04X.%d", + "MOV Y,$%02X", + "MOV Y,!$%04X", + "NOTC", + "POP Y", + "SLEEP", + "BEQ $%04X", + "TCALL 15", + "CLR1 $%02X.7", + "BBC $%02X.7,$%04X", + "MOV A,$%02X+X", + "MOV A,!$%04X+X", + "MOV A,!$%04X+Y", + "MOV A,[$%02X]+Y", + "MOV X,$%02X", + "MOV X,$%02X+Y", + "MOV $%02X,$%02X", + "MOV Y,$%02X+X", + "INC Y", + "MOV Y,A", + "DBNZ Y,$%04X", + "STOP" + }; + + static int modes[256] = + { + 2, 2, 0, 5, 0, 1, 2, 0, 0, 3, 6, 0, 1, 2, 1, 2, + 7, 2, 0, 5, 0, 1, 1, 0, 4, 2, 0, 0, 2, 2, 1, 1, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 3, 6, 0, 1, 2, 5, 7, + 7, 2, 0, 5, 0, 1, 1, 0, 4, 2, 0, 0, 2, 2, 0, 1, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 3, 6, 0, 1, 2, 1, 0, + 7, 2, 0, 5, 0, 1, 1, 0, 4, 2, 0, 0, 2, 2, 1, 1, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 3, 6, 0, 1, 2, 5, 2, + 7, 2, 0, 5, 0, 1, 1, 0, 4, 2, 0, 0, 2, 2, 0, 2, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 3, 6, 0, 1, 0, 2, 4, + 7, 2, 0, 5, 0, 1, 1, 0, 4, 2, 0, 0, 2, 2, 2, 2, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 3, 6, 0, 1, 0, 2, 2, + 7, 2, 0, 5, 0, 1, 1, 0, 4, 2, 0, 0, 2, 2, 2, 2, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 1, 6, 0, 1, 0, 2, 2, + 7, 2, 0, 5, 0, 1, 1, 0, 0, 0, 0, 0, 2, 2, 5, 2, + 2, 2, 0, 5, 0, 1, 2, 0, 0, 1, 6, 0, 1, 2, 2, 2, + 7, 2, 0, 5, 0, 1, 1, 0, 0, 0, 3, 0, 2, 2, 7, 2 + }; + + static int modesToBytes[] = + { + 2, 3, 1, 3, 3, 3, 3, 2 + }; + + int const n80 = 0x80; // nz + int const p20 = 0x20; // dp + int const z02 = 0x02; // nz + int const c01 = 0x01; // c + + #define GET_PC() (pc - ram) + #define GET_SP() (sp - 0x101 - ram) + #define GET_PSW( out )\ + {\ + out = psw & ~(n80 | p20 | z02 | c01);\ + out |= c >> 8 & c01;\ + out |= dp >> 3 & p20;\ + out |= ((nz >> 4) | nz) & n80;\ + if ( !(uint8_t) nz ) out |= z02;\ + } + + uint8_t const *ram = RAM; + + int addr; + int tsp, tpsw; + uint8_t d0, d1, d2; + + addr = GET_PC(); + tsp = GET_SP(); + GET_PSW(tpsw); + + d0 = *pc; + d1 = (addr < 0xffff) ? *(pc + 1) : 0; + d2 = (addr < 0xfffe) ? *(pc + 2) : 0; + + int mode = modes[d0]; + int bytes = modesToBytes[mode]; + char mnem[100]; + + switch (bytes) + { + case 1: + sprintf(buffer, "%04X %02X ", addr, d0); + break; + + case 2: + sprintf(buffer, "%04X %02X %02X ", addr, d0, d1); + break; + + case 3: + sprintf(buffer, "%04X %02X %02X %02X ", addr, d0, d1, d2); + break; + } + + switch (mode) + { + case 0: + sprintf(mnem, mnemonics[d0], d1); + break; + + case 1: + sprintf(mnem, mnemonics[d0], d1 + (d2 << 8)); + break; + + case 2: + strcpy (mnem, mnemonics[d0]); + break; + + case 3: + sprintf(mnem, mnemonics[d0], d2, d1); + break; + + case 4: + sprintf(mnem, mnemonics[d0], d2, d1); + break; + + case 5: + sprintf(mnem, mnemonics[d0], d1, addr + 3 + (int8_t) d2); + break; + + case 6: + sprintf(mnem, mnemonics[d0], (d1 + (d2 << 8)) & 0x1fff, d2 >> 5); + break; + + case 7: + sprintf(mnem, mnemonics[d0], addr + 2 + (int8_t) d1); + break; + } + + sprintf(buffer, "%s %-20s A:%02X X:%02X Y:%02X S:%02X P:%c%c%c%c%c%c%c%c ROM:%d", + buffer, mnem, a, x, y, tsp, + (tpsw & 0x80) ? 'N' : 'n', + (tpsw & 0x40) ? 'V' : 'v', + (tpsw & 0x20) ? 'P' : 'p', + (tpsw & 0x10) ? 'B' : 'b', + (tpsw & 0x08) ? 'H' : 'h', + (tpsw & 0x04) ? 'I' : 'i', + (tpsw & 0x02) ? 'Z' : 'z', + (tpsw & 0x01) ? 'C' : 'c', + m.rom_enabled ? 1 : 0); +} + +void SNES_SPC::debug_io_print( char *buffer ) +{ + sprintf(buffer, "i/o %02X/%02X %02X/%02X %02X/%02X %02X/%02X", + m.smp_regs[1][r_cpuio0], m.smp_regs[0][r_cpuio0], + m.smp_regs[1][r_cpuio1], m.smp_regs[0][r_cpuio1], + m.smp_regs[1][r_cpuio2], m.smp_regs[0][r_cpuio2], + m.smp_regs[1][r_cpuio3], m.smp_regs[0][r_cpuio3]); +} + +#endif diff --git a/apu/SPC_CPU.h b/apu/SPC_CPU.h index 0bd56fcd..67fee8da 100644 --- a/apu/SPC_CPU.h +++ b/apu/SPC_CPU.h @@ -218,7 +218,13 @@ loop: PROFILE_TIMER_LOOP( 0xEB, pc [1], 2 ); PROFILE_TIMER_LOOP( 0xE4, pc [1], 2 ); */ - + +#ifdef DEBUGGER + if (debug_trace) + debug_do_trace(a, x, y, pc, sp, psw, c, nz, dp); +#endif + + // TODO: if PC is at end of memory, this will get wrong operand (very obscure) data = *++pc; switch ( opcode ) diff --git a/apu/SPC_DSP.cpp b/apu/SPC_DSP.cpp index 8779feba..6007c2bb 100644 --- a/apu/SPC_DSP.cpp +++ b/apu/SPC_DSP.cpp @@ -716,7 +716,13 @@ ECHO_CLOCK( 28 ) inline void SPC_DSP::echo_write( int ch ) { if ( !(m.t_echo_enabled & 0x20) ) - SET_LE16A( ECHO_PTR( ch ), m.t_echo_out [ch] ); + { + if ( m.t_echo_ptr >= 0xffc0 && rom_enabled ) + SET_LE16A( &hi_ram [m.t_echo_ptr + ch * 2 - 0xffc0], m.t_echo_out [ch] ); + else + SET_LE16A( ECHO_PTR( ch ), m.t_echo_out [ch] ); + } + m.t_echo_out [ch] = 0; } ECHO_CLOCK( 29 ) diff --git a/apu/SPC_DSP.h b/apu/SPC_DSP.h index 6705a490..61d05ab5 100644 --- a/apu/SPC_DSP.h +++ b/apu/SPC_DSP.h @@ -67,9 +67,11 @@ public: // Snes9x Accessor - int stereo_switch; - int take_spc_snapshot; - void (*spc_snapshot_callback) (void); + int stereo_switch; + int take_spc_snapshot; + int rom_enabled; // mirror + uint8_t *rom, *hi_ram; // mirror + void (*spc_snapshot_callback) (void); void set_spc_snapshot_callback( void (*callback) (void) ); void dump_spc_snapshot( void ); diff --git a/apu/apu.cpp b/apu/apu.cpp index 62d8423c..f6e24456 100644 --- a/apu/apu.cpp +++ b/apu/apu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/apu/apu.h b/apu/apu.h index 48a0e082..358469da 100644 --- a/apu/apu.h +++ b/apu/apu.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/bsx.cpp b/bsx.cpp index c6d6b369..d55b346c 100644 --- a/bsx.cpp +++ b/bsx.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/bsx.h b/bsx.h index d88bb193..24f258af 100644 --- a/bsx.h +++ b/bsx.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/c4.cpp b/c4.cpp index d586e79e..92d843ff 100644 --- a/c4.cpp +++ b/c4.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/c4.h b/c4.h index 9b4c6070..420c9445 100644 --- a/c4.h +++ b/c4.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/c4emu.cpp b/c4emu.cpp index 65e0f553..7b61d111 100644 --- a/c4emu.cpp +++ b/c4emu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cheats.cpp b/cheats.cpp index e4d648d0..72ee6a5e 100644 --- a/cheats.cpp +++ b/cheats.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cheats.h b/cheats.h index 51ed71fb..fa9a118c 100644 --- a/cheats.h +++ b/cheats.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cheats2.cpp b/cheats2.cpp index fc076b5b..ce1d153a 100644 --- a/cheats2.cpp +++ b/cheats2.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/clip.cpp b/clip.cpp index 8e6baa35..8679a18d 100644 --- a/clip.cpp +++ b/clip.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/conffile.cpp b/conffile.cpp index 5f437ab4..2923ecc8 100644 --- a/conffile.cpp +++ b/conffile.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/conffile.h b/conffile.h index 2fd692e9..24c8c20e 100644 --- a/conffile.h +++ b/conffile.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/controls.cpp b/controls.cpp index 5985781d..08aa3e8e 100644 --- a/controls.cpp +++ b/controls.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/controls.h b/controls.h index 8772f62c..3fd059d4 100644 --- a/controls.h +++ b/controls.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpu.cpp b/cpu.cpp index 547a4469..575bc59b 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpuaddr.h b/cpuaddr.h index 3ae55c41..727e6a7a 100644 --- a/cpuaddr.h +++ b/cpuaddr.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpuexec.cpp b/cpuexec.cpp index 5b1656e1..58d9f9fc 100644 --- a/cpuexec.cpp +++ b/cpuexec.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpuexec.h b/cpuexec.h index ccfadd5c..7e65b313 100644 --- a/cpuexec.h +++ b/cpuexec.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpumacro.h b/cpumacro.h index 73c4340b..ce360d92 100644 --- a/cpumacro.h +++ b/cpumacro.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpuops.cpp b/cpuops.cpp index e9c71eda..112973f0 100644 --- a/cpuops.cpp +++ b/cpuops.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/cpuops.h b/cpuops.h index d9bfcc1e..29dd68f1 100644 --- a/cpuops.h +++ b/cpuops.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/crosshairs.cpp b/crosshairs.cpp index 7c3f3851..a8aa159e 100644 --- a/crosshairs.cpp +++ b/crosshairs.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/crosshairs.h b/crosshairs.h index 16c3811d..9d08bc72 100644 --- a/crosshairs.h +++ b/crosshairs.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/debug.cpp b/debug.cpp index 18ba1a12..3cd97b1c 100644 --- a/debug.cpp +++ b/debug.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -1565,25 +1566,10 @@ static void debug_process_command (char *Line) printf("HC event tracing %s.\n", Settings.TraceHCEvent ? "enabled" : "disabled"); } -/* if (*Line == 'A') - { - APU.Flags ^= TRACE_FLAG; - - if (APU.Flags & TRACE_FLAG) - { - printf("APU tracing enabled.\n"); - if (apu_trace == NULL) - apu_trace = fopen("aputrace.log", "wb"); - } - else - { - printf("APU tracing disabled.\n"); - fclose(apu_trace); - apu_trace = NULL; - } - } + spc_core->debug_toggle_trace(); +/* if (*Line == 'B') { Settings.TraceSoundDSP = !Settings.TraceSoundDSP; @@ -2622,4 +2608,9 @@ void S9xTraceFormattedMessage (const char *s, ...) } } +void S9xPrintHVPosition (char *s) +{ + sprintf(s, "HC:%04ld VC:%03ld FC:%02d", (long) CPU.Cycles, (long) CPU.V_Counter, IPPU.FrameCount); +} + #endif diff --git a/debug.h b/debug.h index 2ff1b4d4..cc26133e 100644 --- a/debug.h +++ b/debug.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -204,6 +205,7 @@ void S9xTrace (void); void S9xSA1Trace (void); void S9xTraceMessage (const char *); void S9xTraceFormattedMessage (const char *, ...); +void S9xPrintHVPosition (char *); #endif diff --git a/display.h b/display.h index fa784088..4f261765 100644 --- a/display.h +++ b/display.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dma.cpp b/dma.cpp index bf171090..6b133a60 100644 --- a/dma.cpp +++ b/dma.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dma.h b/dma.h index c779a798..5b8a8161 100644 --- a/dma.h +++ b/dma.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/docs/changes.txt b/docs/changes.txt index 3810e2b7..0f1027f6 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,3 +1,75 @@ +Snes9x 1.53 + +- Rebuilt IRQ handling. (zones) +- Improved overall timings, now Snes9x can handle events in + a opcode a little. (zones) +- Improved screen interlace and sprite interlace supports. (OV2, zones) +- Fixed Hi-Res pixel plotter. (BearOso, zones, OV2) +- Fixed C4 for Mega Man X2's "weapon get" screen. (Jonas Quinn) +- Fixed Super Buster Bros. graphics after reset. (Jonas Quinn) +- Improved SA-1 support. (zones) +- Added SA-1 CC2 support. (Jonas Quinn, byuu) +- Fixed SA-1 NMI override mode. (zones) +- Fixed Dual Orb 2 sound glitch. (byuu) +- New APU timing hack, fixes various games that exhibit + problems with Blargg's SNES_SPC library. (OV2) +- Fixed the problem that echo buffer breaks IPL ROM. (zones, OV2) +- Fixed movie snapshot unfreeze inconsistency. (gocha) +- Faster config file saving. (OV2) +- Fixed BlockInvalidVRAMAccess config file option. + (windows port, unix port and gtk legacy config) (Jonas Quinn) +- Remove POSIX dup and access calls, and rename qword to + fix compilation with Cell SDK. (BearOso) +- Fixed PS3 version save state crash by using heap + allocation for soundsnapshot. (danieldematteis) +- Fixed crash relating to double-closed descriptor. (BearOso) +- Removed CPUShutdown speedhack, DisableHDMA and + DisableIRQ options. (zones) +- Removed remaining outdated asm code. (zones) +- JMA 64 bit support. (kode54, Nach, friedrich.goepel) +- GTK+, Win32, Mac: Added optional Hi-Res blending. (BearOso, OV2, zones) +- GTK+, Win32: Support for bsnes-style XML shaders. (BearOso, OV2) +- Win32: Full unicode support. (OV2) +- Win32: Restored OpenGL mode. (OV2) +- Win32: x64 version. (OV2) +- Win32: HLSL shader support. (mudlord) +- Win32: Win7 jumplist synchronizes with recent roms list. (OV2) +- Win32: Updated menu structure. (OV2) +- Win32: Drag&Drop support for ROMs. (gocha, OV2) +- Win32: Reworked movie-recording with size selection. (gocha, OV2) +- Win32: Restored SPC save option. (OV2) +- Win32: Fixed vsync in DirectDraw. (OV2) +- Win32: Improved window position saving. (OV2) +- Win32: Restored compile with DEBUGGER. (gocha) +- Win32: Fixed various edge-case errors and/or possible + leaks. (Brian Friesen) +- Win32: Config file option to always center image. (OV2) +- Win32: Fixed "Turbo Down mode" hotkey assignment. (gocha) +- Win32: Added and fixed Autofire for D-pad. (gocha) +- Win32: Fixed aggressive soundsync wait. (OV2) +- Win32: Added window size presets. (OV2) +- Mac : Added pause and frame advance functions. (zones) +- Mac : Now you can choose any folder for saving files. (zones) +- Mac : Updated Music Box (mostly internally). (zones) +- Mac : Fixed gliches in open/save dialogs on 10.6. (zones) +- Mac : Fixed display configuration in windowed mode. (zones) +- Unix : Fixed segfault and hang-up with -DNOSOUND. (zones) +- GTK+ : Added ability to set specific folders for SRAM, + patches, snapshots, etc. (BearOso) +- GTK+ : Fixed many permissions issues with config folders. (BearOso) +- GTK+ : Updated compatibility with latest GTK+ and + GtkBuilder. Added experimental support for GTK+ 3.x. (BearOso) +- GTK+ : Updated software output to use cairo and added the + ability to use bilinear-filtering with it. (BearOso) +- GTK+ : Fixed issues where cheats wouldn't stay enabled. (BearOso) +- GTK+ : Fixed focus issue when there is no window manager. (BearOso) +- GTK+ : Fixed X Visual incompatibilities and expose + problems in the Xv and OpenGL outputs. (BearOso) +- GTK+ : Fixed vsync with new X Server and NVIDIA drivers. (BearOso) +- GTK+ : Added "Reduce input lag" option to OpenGL output. (BearOso) +- GTK+ : Added a visual indication of the expected video + refresh rate for the currently selected sound input rate. (BearOso) + Snes9x 1.52 - IMPORTANT NOTICE: The structure of savestates (also known as snapshots / freeze files) is incompatible with older diff --git a/docs/portsofsnes9x.txt b/docs/portsofsnes9x.txt new file mode 100644 index 00000000..d05365cb --- /dev/null +++ b/docs/portsofsnes9x.txt @@ -0,0 +1,118 @@ +These are all the known ports of Snes9X to other consoles/handhelds/etc as of +2011/04/24. They are all supported and welcomed on the official Snes9X site. + +**If you know of anyone who is currently working on a port of Snes9X, or if you +have some interest in making a port, please have them go to the Snes9X forums +(http://www.snes9x.com/phpbb2/) and have them register an account there. After +that, speak to Ryan and/or Jerremy so you can be let into the devs area and the +git so you can have access to the most current code, collaborate with the other +developers, make the port officialized, etc.** + +Ports and how to get them running are as follows: + +*PSP Version of Snes9X* +Name: Snes9X Euphoria +Latest version: R5 Beta +Homepage/forum: http://www.retroemu.com/forum/ +Maintainer: Zack + +HOW TO GET IT RUNNING: +*DISCLAIMER* You will have to do some Googling, including but not limited to: +* Downgrading/upgrading your firmware +* Checking if your PSP-2000 series can use Pandora's Battery +* Checking if your PSP-3000 series can use the DaveeFTW Downgrader +* Creating Pandora's Battery +* Finding the hacks, HENs, CFWs, etc and how to use/install them + +1. Make sure your PSP is hackable in some way. This means: +* PSP-1000 series and certain PSP-2000 series can use Pandora Battery +* PSP-2000 series that can't use Pandora Battery, most PSP-3000 series, and PSP +Gos are hackable via other means (DaveeFTW Downgrader, etc) + +2. Make sure your PSP has custom firmware or a HEN that's useable (you'll have +to upgrade/downgrade the firmware as necessary). (Hint: I personally prefer +5.50 GEN-D3 on the Pandora-able PSPs; 6.20 or 6.35 PRO-B4 or better on the +non-Pandora-able PSPs.) + +3. When that’s done, be sure to put the Snes9X Euphoria folder in /PSP/GAME on +your PSP’s memory stick (PSP-1000/2000/3000 series) or internal memory +(PSP Go). Be sure to copy the ROMs into the roms folder, saves (*.srm, etc) +into the saves folder, and cheats into the cheats folder. + +*Wii/Gamecube version of Snes9X* +Name: Snes9X GX +Latest Version: 4.2.7 +Homepage/forum: http://code.google.com/p/snes9x-gx +Maintainer: Tantric + +HOW TO GET IT RUNNING: +*DISCLAIMER* You will have to do some Googling, including but not limited to: +* Finding the latest Homebrew Channel, Snes9X GX Channel, and/or IOS58 +installers and installing them +* Finding a modchip for your GameCube and installing it + +Wii: You will need the latest Homebrew Channel installed on your Wii. After +that, copy and paste the apps folder onto the root of your SD card; same goes +for the snes9xgx folder. After that, copy over any ROMs you have to the +\snes9xgx\roms folder, save files (*.srm, etc) to the \snes9xgx\saves folder, +and cheats to the \snes9xgx\cheats folder. + +In addition, there appears to be a channel for Snes9X GX; you will need the +Homebrew Channel installed and you MUST be on System Menu 4.3 so you can be on +IOS58 (or use the IOS58 installer). After that, you should be able to run the +installer from the Homebrew Channel, and you'll be good to go! + +Gamecube: You might need a modchip. + +*Android and iOS (Apple iPhone/iPod Touch) version of Snes9X* +Name: Snes9X EX +Latest Version: 1.3.23 +Homepage/forum: http://www.explusalpha.com/home/snes9x-ex +Maintainer: Rakashazi (on the Snes9X forums) + +HOW TO GET IT RUNNING: +*DISCLAIMER* You will have to do some Googling, including but not limited to: +* iOS (iPhone/iPod Touch) ONLY!!!: Jailbreaking your firmware + +Android: It appears you can just download from the Android app-store thingy and +run it from there :) Be sure to copy over your ROMs, saves, etc though. + +iOS: You’ll have to jailbreak your firmware and install the Cydia app +installer. Then you’ll have to install the BigBoss repository within Cydia and +search for Snes9X EX; you may also want to search for the sshd and all needed +stuff for that, as it’s the only way you can put the ROMs, saves, etc onto your +iPhone/iPod Touch. After that you should be able to download and run from there +:) + +*PS3 version of Snes9X* +Name: Snes9X PS3 +Latest Version: 4.4.9 +Homepage/forum: https://code.google.com/p/snes9x-ps3/ (although for some +reason, you may have to Google for the latest version) +Maintainer: Squarepusher + +HOW TO GET IT RUNNING: +*DISCLAIMER* You will have to do some Googling, including but not limited to: +* Finding a HEN/Jailbreaker/CFW/etc onto your PS3 and installing it +* (if necessary) Downgrading/Upgrading your PS3's firmware + +You’ll have to install a HEN/Jailbreaker/CFW/etc on your PS3 (you might have to +upgrade or downgrade your PS3’s firmware as needed). After that, it should be +as simple as copy the emulator, ROMs, saves, etc over to the PS3 and it should +work :) + +*X-Box Version of Snes9X* +Name: Snes9xbox +Latest Version: V2 (V3 should be out soon) +Homepage/forum: http://forums.xbox-scene.com/index.php?showforum=96 + +HOW TO GET IT RUNNING: +*DISCLAIMER* You will need to do some Googling, including but not limited to: +* Finding a softmod (hack) or a modchip and installing/using it +* Finding a replacement dashboard such as XBMC + +Really, it's not hard. Read the readme, and use a softmod or modchip and a +replacement dashboard. After that's installed, it should be as simple as +copying over the emulator, ROMs, saves, etc to the X-Box and it should work. + +Updated most recently by: 2011/4/24 adventure_of_link \ No newline at end of file diff --git a/docs/snes9x-license.txt b/docs/snes9x-license.txt index 698be102..19d5fd68 100644 --- a/docs/snes9x-license.txt +++ b/docs/snes9x-license.txt @@ -16,11 +16,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -129,7 +130,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -137,11 +138,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dsp.cpp b/dsp.cpp index b6e23ff1..065c62bb 100644 --- a/dsp.cpp +++ b/dsp.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dsp.h b/dsp.h index be4d073f..97b44f08 100644 --- a/dsp.h +++ b/dsp.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dsp1.cpp b/dsp1.cpp index 85f95123..3731578c 100644 --- a/dsp1.cpp +++ b/dsp1.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dsp2.cpp b/dsp2.cpp index 477209b4..fb7dfaa5 100644 --- a/dsp2.cpp +++ b/dsp2.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dsp3.cpp b/dsp3.cpp index 5c792403..a4d0c96b 100644 --- a/dsp3.cpp +++ b/dsp3.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/dsp4.cpp b/dsp4.cpp index 9d6f3fd7..3863e877 100644 --- a/dsp4.cpp +++ b/dsp4.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/2xsai.cpp b/filter/2xsai.cpp index b8225d72..55ee634b 100644 --- a/filter/2xsai.cpp +++ b/filter/2xsai.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/2xsai.h b/filter/2xsai.h index 86da4b3d..da98306d 100644 --- a/filter/2xsai.h +++ b/filter/2xsai.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/blit.cpp b/filter/blit.cpp index 69c48b44..58e565e4 100644 --- a/filter/blit.cpp +++ b/filter/blit.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/blit.h b/filter/blit.h index ebde40b1..627a47bd 100644 --- a/filter/blit.h +++ b/filter/blit.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/epx.cpp b/filter/epx.cpp index 38241110..9459b1e5 100644 --- a/filter/epx.cpp +++ b/filter/epx.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/epx.h b/filter/epx.h index 25782728..ce1619be 100644 --- a/filter/epx.h +++ b/filter/epx.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/hq2x.cpp b/filter/hq2x.cpp index 9b41ad36..c47b411a 100644 --- a/filter/hq2x.cpp +++ b/filter/hq2x.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/filter/hq2x.h b/filter/hq2x.h index bb98097f..73364933 100644 --- a/filter/hq2x.h +++ b/filter/hq2x.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/font.h b/font.h index 27011f6b..6097167e 100644 --- a/font.h +++ b/font.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/fxdbg.cpp b/fxdbg.cpp index ed971234..bae7ae1c 100644 --- a/fxdbg.cpp +++ b/fxdbg.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/fxemu.cpp b/fxemu.cpp index ce1af63e..072a672e 100644 --- a/fxemu.cpp +++ b/fxemu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/fxemu.h b/fxemu.h index b2ce64e7..c4b0e704 100644 --- a/fxemu.h +++ b/fxemu.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/fxinst.cpp b/fxinst.cpp index 5f7df2bf..c67bb6e4 100644 --- a/fxinst.cpp +++ b/fxinst.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/fxinst.h b/fxinst.h index dd3736ec..21475869 100644 --- a/fxinst.h +++ b/fxinst.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/getset.h b/getset.h index b7dda2b6..b52f8987 100644 --- a/getset.h +++ b/getset.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/gfx.cpp b/gfx.cpp index 579aa526..0937852e 100644 --- a/gfx.cpp +++ b/gfx.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/gfx.h b/gfx.h index 75981cc2..be680c70 100644 --- a/gfx.h +++ b/gfx.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/globals.cpp b/globals.cpp index 60d7959f..e660604a 100644 --- a/globals.cpp +++ b/globals.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/gtk/AUTHORS b/gtk/AUTHORS index ec75270c..a8fb9566 100644 --- a/gtk/AUTHORS +++ b/gtk/AUTHORS @@ -4,4 +4,5 @@ Translators: Tukuyomi (fr_FR) Inukaze (es_VE) Tibério Vítor (pt_BR) +Sergey Basalaev (ru) Milan Kostić (sr@latin) diff --git a/gtk/configure.ac b/gtk/configure.ac index c03db53c..f946b695 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -146,6 +146,8 @@ else CFLAGS="$CFLAGS -fomit-frame-pointer" fi +LIBS="$LIBS -lX11 -ldl -lXext" + ZSNESFX='#ZSNESFX=yes' ZSNESC4='#ZSNESC4=yes' ASMCPU='' @@ -186,7 +188,7 @@ if test yes = "$with_opengl" ; then AC_CHECK_LIB(GL,glGetString,[ OPENGL=yes CFLAGS="$CFLAGS -DUSE_OPENGL" - LIBS="-lGL" + LIBS="$LIBS -lGL" ],[ OPENGL=0 ]) diff --git a/gtk/po/LINGUAS b/gtk/po/LINGUAS index 08a368c2..6b8f52cf 100644 --- a/gtk/po/LINGUAS +++ b/gtk/po/LINGUAS @@ -3,4 +3,5 @@ es_VE fr_FR pt_BR +ru sr@latin diff --git a/gtk/po/ru.po b/gtk/po/ru.po new file mode 100644 index 00000000..a07f40dc --- /dev/null +++ b/gtk/po/ru.po @@ -0,0 +1,1666 @@ +# Перевод Snes9x на русский язык. +# Copyright (C) 2010 Brandon Wright +# This file is distributed under the same license as the snes9x package. +# Sergey Basalaev , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: snes9x 1.52\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-12 22:37+0700\n" +"PO-Revision-Date: 2011-04-12 22:54+0600\n" +"Last-Translator: Sergey Basalaev \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/snes9x.ui:7 +msgid "Snes9x" +msgstr "Snes9x" + +#: src/snes9x.ui:24 +msgid "_File" +msgstr "_Файл" + +#: src/snes9x.ui:30 +msgid "_Open ROM Image..." +msgstr "_Открыть образ ROM..." + +#: src/snes9x.ui:42 +msgid "Open Recent" +msgstr "Открыть недавние" + +#: src/snes9x.ui:53 +msgid "Open with _NetPlay..." +msgstr "Открыть с _NetPlay..." + +#: src/snes9x.ui:55 +msgid "Open a ROM to use with NetPlay" +msgstr "Открыть ROM, чтобы использовать с NetPlay" + +#: src/snes9x.ui:65 +msgid "Open _MultiCart..." +msgstr "Открыть _MultiCart..." + +#: src/snes9x.ui:78 +msgid "_Load State" +msgstr "_Загрузить состояние" + +#: src/snes9x.ui:86 +#: src/snes9x.ui:183 +msgid "Slot _0" +msgstr "Слот _0" + +#: src/snes9x.ui:94 +#: src/snes9x.ui:191 +msgid "Slot _1" +msgstr "Слот _1" + +#: src/snes9x.ui:102 +#: src/snes9x.ui:199 +msgid "Slot _2" +msgstr "Слот _2" + +#: src/snes9x.ui:110 +#: src/snes9x.ui:207 +msgid "Slot _3" +msgstr "Слот _3" + +#: src/snes9x.ui:118 +#: src/snes9x.ui:215 +msgid "Slot _4" +msgstr "Слот _4" + +#: src/snes9x.ui:126 +#: src/snes9x.ui:223 +msgid "Slot _5" +msgstr "Слот _5" + +#: src/snes9x.ui:134 +#: src/snes9x.ui:231 +msgid "Slot _6" +msgstr "Слот _6" + +#: src/snes9x.ui:142 +#: src/snes9x.ui:239 +msgid "Slot _7" +msgstr "Слот _7" + +#: src/snes9x.ui:150 +#: src/snes9x.ui:247 +msgid "Slot _8" +msgstr "Слот _8" + +#: src/snes9x.ui:163 +msgid "From _File..." +msgstr "Из _файла..." + +#: src/snes9x.ui:175 +msgid "_Save State" +msgstr "_Сохранить состояние" + +#: src/snes9x.ui:260 +msgid "To _File..." +msgstr "В _файл..." + +#: src/snes9x.ui:276 +msgid "Save SPC..." +msgstr "Сохранить SPC..." + +#: src/snes9x.ui:291 +msgid "Show ROM _Info..." +msgstr "_Информация о ROM..." + +#: src/snes9x.ui:306 +msgid "_Quit" +msgstr "В_ыход" + +#: src/snes9x.ui:321 +msgid "_Emulation" +msgstr "_Эмуляция" + +#: src/snes9x.ui:327 +msgid "Run / _Continue" +msgstr "_Старт / Продолжить" + +#: src/snes9x.ui:337 +msgid "_Pause" +msgstr "_Приостановить" + +#: src/snes9x.ui:353 +msgid "Load _Movie..." +msgstr "Загрузить _видео..." + +#: src/snes9x.ui:364 +msgid "R_ecord Movie..." +msgstr "_Запись видео..." + +#: src/snes9x.ui:375 +msgid "_Stop Recording" +msgstr "_Остановить запись" + +#: src/snes9x.ui:386 +msgid "_Jump to Frame..." +msgstr "Перейти на _кадр..." + +#: src/snes9x.ui:402 +msgid "Sy_nc Clients" +msgstr "Си_нхронизировать клиенты" + +#: src/snes9x.ui:417 +msgid "Reset" +msgstr "Питание" + +#: src/snes9x.ui:428 +msgid "Soft _Reset" +msgstr "С_брос" + +#: src/snes9x.ui:443 +msgid "_View" +msgstr "_Вид" + +#: src/snes9x.ui:450 +msgid "_Hide Menu" +msgstr "Скрыть _меню" + +#: src/snes9x.ui:461 +msgid "_Status Bar" +msgstr "_Строка состояния" + +#: src/snes9x.ui:473 +msgid "_Change Size" +msgstr "_Изменить размер" + +#: src/snes9x.ui:485 +msgid "Exact Pixels" +msgstr "Точные пикселы" + +#: src/snes9x.ui:492 +msgid "_1x" +msgstr "_1x" + +#: src/snes9x.ui:500 +msgid "_2x" +msgstr "_2x" + +#: src/snes9x.ui:508 +msgid "_3x" +msgstr "_3x" + +#: src/snes9x.ui:516 +msgid "_4x" +msgstr "_4x" + +#: src/snes9x.ui:524 +msgid "_5x" +msgstr "_5x" + +#: src/snes9x.ui:538 +msgid "Correct Aspect" +msgstr "Правильное соотношение" + +#: src/snes9x.ui:545 +msgid "1x" +msgstr "1x" + +#: src/snes9x.ui:553 +msgid "2x" +msgstr "2x" + +#: src/snes9x.ui:561 +msgid "3x" +msgstr "3x" + +#: src/snes9x.ui:569 +msgid "4x" +msgstr "4x" + +#: src/snes9x.ui:577 +msgid "5x" +msgstr "5x" + +#: src/snes9x.ui:593 +msgid "_Fullscreen" +msgstr "_Полный экран" + +#: src/snes9x.ui:608 +msgid "_Options" +msgstr "_Опции" + +#: src/snes9x.ui:615 +msgid "Controller Ports" +msgstr "Порты контроллера" + +#: src/snes9x.ui:622 +msgid "SNES Port 1" +msgstr "Порт SNES 1" + +#: src/snes9x.ui:630 +#: src/snes9x.ui:669 +msgid "Joypad" +msgstr "Джойстик" + +#: src/snes9x.ui:638 +#: src/snes9x.ui:677 +msgid "Mouse" +msgstr "Мышь" + +#: src/snes9x.ui:647 +#: src/snes9x.ui:695 +msgid "Superscope" +msgstr "Superscope" + +#: src/snes9x.ui:661 +msgid "SNES Port 2" +msgstr "Порт SNES 2" + +#: src/snes9x.ui:686 +msgid "Multitap" +msgstr "Multitap" + +#: src/snes9x.ui:719 +msgid "_Cheats..." +msgstr "_Читы..." + +#: src/snes9x.ui:732 +msgid "_Preferences..." +msgstr "_Настройки..." + +#: src/snes9x.ui:781 +msgid "Snes9x Preferences" +msgstr "Настройки Snes9x" + +#: src/snes9x.ui:838 +msgid "Use fullscreen on ROM open" +msgstr "Полный экран после открытия ROM" + +#: src/snes9x.ui:842 +msgid "Go to fullscreen mode immediately after opening a ROM" +msgstr "Переключаться на полный экран сразу после открытия ROM'а" + +#: src/snes9x.ui:854 +msgid "Show frame rate" +msgstr "Показывать частоту кадров" + +#: src/snes9x.ui:869 +msgid "Use overscanned height" +msgstr "Показывать расширенную высоту" + +#: src/snes9x.ui:873 +msgid "Use SNES extended height. Will probably cause letterboxing" +msgstr "Использовать расширенную высоту SNES. Может вызвать чёрные полосы сверху и снизу." + +#: src/snes9x.ui:889 +msgid "Change fullscreen resolution:" +msgstr "Разрешение полного экрана:" + +#: src/snes9x.ui:893 +msgid "Changes the screen resolution when running Snes9x in fullscreen mode" +msgstr "Изменяет разрешение экрана при переходе Snes9x в полноэкранный режим" + +#: src/snes9x.ui:932 +msgid "Basic Settings" +msgstr "Основные настройки" + +#: src/snes9x.ui:959 +msgid "Scale image to fit window" +msgstr "Растягивать изображение во всё окно" + +#: src/snes9x.ui:963 +msgid "Scales the image so no black bars are present" +msgstr "Растягивать изображение, чтобы не оставалось чёрных полос" + +#: src/snes9x.ui:979 +msgid "Maintain aspect-ratio:" +msgstr "Соотношение сторон:" + +#: src/snes9x.ui:983 +msgid "Scales the image as large as possible without distortion" +msgstr "Растягивает изображение насколько возможно без искажений" + +#: src/snes9x.ui:1020 +msgid "Use " +msgstr "Использовать " + +#: src/snes9x.ui:1024 +msgid "Allows scaling and filtering to use multiple processors" +msgstr "Позволяет процессам масштабирования и фильтрации использовать несколько процессоров" + +#: src/snes9x.ui:1050 +msgid "threads for filtering and scaling" +msgstr "потоков для фильтрации и масштабирования" + +#: src/snes9x.ui:1069 +msgid "High-resolution effect:" +msgstr "Эффект высокого разрешения:" + +#: src/snes9x.ui:1105 +msgid "Apply scaling filter:" +msgstr "Применять фильтр масштабирования:" + +#: src/snes9x.ui:1143 +msgid "Image Adjustments" +msgstr "Регулировка изображения" + +#: src/snes9x.ui:1179 +msgid "Video preset:" +msgstr "Предустановка видео:" + +#: src/snes9x.ui:1191 +msgid "Composite" +msgstr "Композитная" + +#: src/snes9x.ui:1204 +msgid "S-Video" +msgstr "S-Video" + +#: src/snes9x.ui:1217 +msgid "RGB" +msgstr "RGB" + +#: src/snes9x.ui:1230 +msgid "Monochrome" +msgstr "Монохромная" + +#: src/snes9x.ui:1265 +msgid "Artifacts:" +msgstr "Помехи:" + +#: src/snes9x.ui:1278 +msgid "Sharpness:" +msgstr "Резкость:" + +#: src/snes9x.ui:1291 +msgid "Brightness:" +msgstr "Яркость:" + +#: src/snes9x.ui:1304 +msgid "Contrast:" +msgstr "Контраст:" + +#: src/snes9x.ui:1317 +msgid "Saturation:" +msgstr "Насыщенность:" + +#: src/snes9x.ui:1330 +msgid "Hue:" +msgstr "Тон:" + +#: src/snes9x.ui:1519 +msgid "Gamma:" +msgstr "Гамма:" + +#: src/snes9x.ui:1532 +msgid "Fringing:" +msgstr "Окантовка:" + +#: src/snes9x.ui:1545 +msgid "Bleed:" +msgstr "Края:" + +#: src/snes9x.ui:1558 +msgid "Resolution:" +msgstr "Разрешение:" + +#: src/snes9x.ui:1583 +msgid "Merge odd and even fields" +msgstr "Совместить чётные и нечётные поля" + +#: src/snes9x.ui:1601 +#: src/snes9x.ui:1665 +msgid "Scanline intensity:" +msgstr "Плотность сканлиний:" + +#: src/snes9x.ui:1636 +msgid "NTSC Filter" +msgstr "Фильтр NTSC" + +#: src/snes9x.ui:1695 +msgid "Scanline Filter" +msgstr "Фильтр сканлиний" + +#: src/snes9x.ui:1740 +msgid "Bilinear-filter output" +msgstr "Билинейная фильтрация вывода" + +#: src/snes9x.ui:1758 +msgid "Sync to vertical blank" +msgstr "Синхронизировать с VBlank" + +#: src/snes9x.ui:1762 +msgid "Sync the image to the vertical retrace to stop tearing" +msgstr "Синхронизировать изображение с обратным ходом вертикальной развёртки, чтобы изображение не рвалось" + +#: src/snes9x.ui:1774 +msgid "Reduce input lag" +msgstr "Уменьшить лаг ввода" + +#: src/snes9x.ui:1778 +msgid "Sync the program with the video output after every displayed frame to reduce input latency" +msgstr "Синхронизировать программу с выводом видео после каждого кадра для уменьшения задержки ввода" + +#: src/snes9x.ui:1787 +msgid "Allow non-power-of-two textures" +msgstr "Позволить текстуры не-степени-двойки" + +#: src/snes9x.ui:1791 +msgid "Prevents edge artifacts, but can slow performance" +msgstr "Предотвращает помехи по краям, но может снизить производительность" + +#: src/snes9x.ui:1800 +msgid "Use pixel-buffer objects" +msgstr "Использовать объекты буферов пикселей" + +#: src/snes9x.ui:1805 +msgid "Can be faster or slower depending on drivers" +msgstr "Может быть быстрее или медленнее в зависимости от драйверов" + +#: src/snes9x.ui:1821 +msgid "Different formats can yield highly different performance" +msgstr "Разные форматы могут дать очень разную производительность" + +#: src/snes9x.ui:1827 +msgid "Pixel-buffer format:" +msgstr "Формат буфера пикселей:" + +#: src/snes9x.ui:1864 +msgid "Use GLSL shader:" +msgstr "Использовать шейдер GLSL:" + +#: src/snes9x.ui:1889 +#: src/snes9x.ui:2679 +#: src/snes9x.ui:2694 +#: src/snes9x.ui:2711 +#: src/snes9x.ui:2728 +#: src/snes9x.ui:2745 +#: src/snes9x.ui:6552 +msgid "Browse..." +msgstr "Обзор..." + +#: src/snes9x.ui:1915 +msgid "Force an inverted byte-ordering" +msgstr "Требовать обратный порядок байтов" + +#: src/snes9x.ui:1919 +msgid "Forces a swapped byte-ordering for cases where the system's endian is used instead of the video card" +msgstr "Устанавливает обратный порядок байтов в случае, когда используется порядок байтов системы, а не видеокарты" + +#: src/snes9x.ui:1938 +msgid "Hardware Acceleration" +msgstr "Аппаратное ускорение" + +#: src/snes9x.ui:1969 +msgid "Display" +msgstr "Видео" + +#: src/snes9x.ui:2016 +msgid "Sound driver:" +msgstr "Звуковой драйвер:" + +#: src/snes9x.ui:2050 +msgid "Synchronize with sound" +msgstr "Синхронизировать со звуком" + +#: src/snes9x.ui:2054 +msgid "Base emulation speed on the rate sound is output" +msgstr "Корректировать скорость эмуляции по частоте звука" + +#: src/snes9x.ui:2065 +msgid "Mute sound output" +msgstr "Отключить звук" + +#: src/snes9x.ui:2069 +msgid "Disables output of sound" +msgstr "Запрещает вывод звука" + +#: src/snes9x.ui:2081 +msgid "Stereo" +msgstr "Стерео" + +#: src/snes9x.ui:2085 +msgid "Output two channels, left and right" +msgstr "Вывод на два канала, левый и правый" + +#: src/snes9x.ui:2106 +msgid "Playback rate:" +msgstr "Частота воспроизведения:" + +#: src/snes9x.ui:2133 +msgid "milliseconds" +msgstr "миллисекунд" + +#: src/snes9x.ui:2154 +msgid "Buffer size:" +msgstr "Размер буфера:" + +#: src/snes9x.ui:2167 +msgid "Input rate:" +msgstr "Частота входа:" + +#: src/snes9x.ui:2179 +msgid "Adjust to produce more or less data. Decrease the rate if experiencing crackling. Increase the rate if experiencing frame-rate stuttering. Best used with the \"Synchronize with sound\" option" +msgstr "Измените для увеличения или уменьшения потока данных. Уменьшите частоту, если наблюдается треск. Увеличьте частоту, если наблюдается заикание. Лучше всего использовать с опцией «Синхронизировать со звуком»" + +#: src/snes9x.ui:2223 +msgid "Video rate:" +msgstr "Частота видео:" + +#: src/snes9x.ui:2234 +msgid "label" +msgstr "label" + +#: src/snes9x.ui:2256 +msgid "Sound Settings" +msgstr "Настройки звука" + +#: src/snes9x.ui:2284 +#: src/snes9x.ui:5553 +msgid "Sound" +msgstr "Звук" + +#: src/snes9x.ui:2335 +msgid "Frameskip:" +msgstr "Пропуск кадров:" + +#: src/snes9x.ui:2368 +msgid "Block invalid VRAM access" +msgstr "Блокировать некорректный доступ к VRAM" + +#: src/snes9x.ui:2380 +msgid "Allow opposing dpad directions" +msgstr "Разрешать противоположные направления" + +#: src/snes9x.ui:2384 +msgid "Let left and right or up and down be pressed at the same time" +msgstr "Позволять влево и вправо или вверх и вниз быть нажатыми одновременно" + +#: src/snes9x.ui:2398 +msgid "Accuracy" +msgstr "Точность" + +#: src/snes9x.ui:2425 +msgid "Pause emulation when switching away from Snes9x" +msgstr "Приостанавливать эмуляцию при переключении на другое окно" + +#: src/snes9x.ui:2442 +msgid "The ESC key should:" +msgstr "Клавиша ESC должна:" + +#: src/snes9x.ui:2477 +msgid "Window Switching" +msgstr "Смена окон" + +#: src/snes9x.ui:2503 +msgid "Prevent the screensaver from activating" +msgstr "Предотвращать запуск хранителя экрана" + +#: src/snes9x.ui:2520 +msgid "Screensaver" +msgstr "Хранитель экрана" + +#: src/snes9x.ui:2554 +#: src/snes9x.ui:4439 +msgid "Emulation" +msgstr "Эмуляция" + +#: src/snes9x.ui:2764 +msgid "SRAM:" +msgstr "SRAM:" + +#: src/snes9x.ui:2774 +msgid "Save states:" +msgstr "Состояния:" + +#: src/snes9x.ui:2786 +msgid "Cheats:" +msgstr "Читы:" + +#: src/snes9x.ui:2798 +msgid "Patches:" +msgstr "Патчи:" + +#: src/snes9x.ui:2810 +msgid "Exports:" +msgstr "Экспорты:" + +#: src/snes9x.ui:2831 +msgid "Game Data Locations" +msgstr "данных игры" + +#: src/snes9x.ui:2858 +msgid "Save SRAM:" +msgstr "Сохранять SRAM:" + +#: src/snes9x.ui:2869 +msgid "Automatically save the game's SRAM at this interval. Setting this to 0 will only save when quitting or changing ROMs" +msgstr "Автоматически сохранять память игры через указанный интервал времени. Когда установлено в 0, сохранение будет производиться при выходе или смене ROM'а" + +#: src/snes9x.ui:2882 +msgid "seconds after change" +msgstr "секунд после изменения" + +#: src/snes9x.ui:2896 +msgid "Automatic Saving" +msgstr "Автоматическое сохранение" + +#: src/snes9x.ui:2926 +msgid "Files" +msgstr "Файлы" + +#: src/snes9x.ui:2954 +msgid "Joypad:" +msgstr "Джойстик:" + +#: src/snes9x.ui:2991 +msgid "_Reset" +msgstr "_Сбросить" + +#: src/snes9x.ui:3016 +msgid "Swap with:" +msgstr "Поменять с:" + +#: src/snes9x.ui:3041 +msgid "_Swap" +msgstr "_Поменять" + +#: src/snes9x.ui:3061 +msgid "Use modifier keys (CTRL, SHIFT, ALT) directly" +msgstr "Использовать клавиши-модификаторы (CTRL, SHIFT, ALT) напрямую" + +#: src/snes9x.ui:3065 +msgid "Allow using modifier keys as independent keys instead of modifiers" +msgstr "Позволить использование клавиш-модификаторов, как независимых клавиш" + +#: src/snes9x.ui:3096 +msgid "Up" +msgstr "Вверх" + +#: src/snes9x.ui:3107 +msgid "Down" +msgstr "Вниз" + +#: src/snes9x.ui:3120 +msgid "Left" +msgstr "Налево" + +#: src/snes9x.ui:3133 +msgid "Right" +msgstr "Направо" + +#: src/snes9x.ui:3146 +msgid "Start" +msgstr "Start" + +#: src/snes9x.ui:3159 +msgid "Select" +msgstr "Select" + +#: src/snes9x.ui:3272 +#: src/snes9x.ui:3467 +#: src/snes9x.ui:3648 +msgid "A" +msgstr "A" + +#: src/snes9x.ui:3283 +#: src/snes9x.ui:3478 +#: src/snes9x.ui:3659 +msgid "B" +msgstr "B" + +#: src/snes9x.ui:3296 +#: src/snes9x.ui:3491 +#: src/snes9x.ui:3672 +msgid "X" +msgstr "X" + +#: src/snes9x.ui:3309 +#: src/snes9x.ui:3504 +#: src/snes9x.ui:3685 +msgid "Y" +msgstr "Y" + +#: src/snes9x.ui:3322 +#: src/snes9x.ui:3517 +#: src/snes9x.ui:3698 +msgid "L" +msgstr "L" + +#: src/snes9x.ui:3335 +#: src/snes9x.ui:3530 +#: src/snes9x.ui:3711 +msgid "R" +msgstr "R" + +#: src/snes9x.ui:3442 +msgid "Buttons" +msgstr "Кнопки" + +#: src/snes9x.ui:3819 +msgid "Sticky" +msgstr "Залипающие" + +#: src/snes9x.ui:3834 +msgid "Turbo" +msgstr "Турбо" + +#: src/snes9x.ui:3852 +msgid "Turbo / Sticky Buttons" +msgstr "Турбо и залипающие кнопки" + +#: src/snes9x.ui:3884 +msgid "Set new axis bindings at:" +msgstr "Установить новый привязки осей на:" + +#: src/snes9x.ui:3896 +msgid "Changes the amount a joystick should be tilted to register a button press" +msgstr "Изменяет величину отклонения джойстика, чтобы зафиксировать нажатие кнопки" + +#: src/snes9x.ui:3910 +msgid "percent" +msgstr "процентах" + +#: src/snes9x.ui:3926 +msgid "Joystick Axis Threshold" +msgstr "Порог осей джойстика" + +#: src/snes9x.ui:3958 +msgid "Center all axes on all joysticks and press Calibrate." +msgstr "Установите все оси на всех джойстиках по центру и нажмите Калибровать." + +#: src/snes9x.ui:3972 +msgid "Cali_brate" +msgstr "Кали_бровать" + +#: src/snes9x.ui:4004 +msgid "Calibration" +msgstr "Калибровка" + +#: src/snes9x.ui:4022 +msgid "Joystick Options" +msgstr "Настройки джойстика" + +#: src/snes9x.ui:4037 +#: src/snes9x.ui:5755 +msgid "" +"Click an entry and then press the desired keys or joystick button\n" +"Escape: Move to next Shift-Escape: Clear selected" +msgstr "" +"Щёлкните в поле и нажмите желаемые клавиши на клавиатуре или джойстике\n" +"Escape: Перейти к следующему Shift-Escape: Очистить выбранное" + +#: src/snes9x.ui:4068 +msgid "Joypads" +msgstr "Джойстики" + +#: src/snes9x.ui:4093 +msgid "Snes9x Emulator Shortcut Keys" +msgstr "Привязки клавиш эмулятора Snes9x" + +#: src/snes9x.ui:4140 +msgid "Soft reset" +msgstr "Сброс" + +#: src/snes9x.ui:4153 +msgid "Hardware reset" +msgstr "Питание" + +#: src/snes9x.ui:4166 +msgid "Increase frame time" +msgstr "Увеличить время кадра" + +#: src/snes9x.ui:4179 +msgid "Decrease frame time" +msgstr "Уменьшить время кадра" + +#: src/snes9x.ui:4192 +msgid "Increase frame rate" +msgstr "Увеличить частоту кадров" + +#: src/snes9x.ui:4205 +msgid "Decrease frame rate" +msgstr "Уменьшить частоту кадров" + +#: src/snes9x.ui:4218 +msgid "Pause" +msgstr "Приостановить" + +#: src/snes9x.ui:4231 +msgid "Toggle turbo" +msgstr "Переключить турбо" + +#: src/snes9x.ui:4244 +msgid "Enable turbo" +msgstr "Включить турбо" + +#: src/snes9x.ui:4258 +msgid "Open ROM" +msgstr "Открыть ROM" + +#: src/snes9x.ui:4269 +msgid "Quit Snes9x" +msgstr "Выйти из Snes9x" + +#: src/snes9x.ui:4468 +msgid "Toggle BG layer 0" +msgstr "Переключить задний слой 1" + +#: src/snes9x.ui:4479 +msgid "Toggle BG layer 1" +msgstr "Переключить задний слой 1" + +#: src/snes9x.ui:4492 +msgid "Toggle BG layer 2" +msgstr "Переключить задний слой 2" + +#: src/snes9x.ui:4505 +msgid "Toggle BG layer 3" +msgstr "Переключить задний слой 3" + +#: src/snes9x.ui:4518 +msgid "Toggle sprites" +msgstr "Переключить спрайты" + +#: src/snes9x.ui:4531 +msgid "BG layering hack" +msgstr "Хак слоёв заднего фона" + +#: src/snes9x.ui:4544 +msgid "Screenshot" +msgstr "Снимок экрана" + +#: src/snes9x.ui:4557 +msgid "Toggle fullscreen" +msgstr "Переключить полный экран" + +#: src/snes9x.ui:4688 +msgid "Graphics" +msgstr "Графика" + +#: src/snes9x.ui:4718 +msgid "Quick save state" +msgstr "Быстрое сохранение" + +#: src/snes9x.ui:4732 +msgid "Quick load state" +msgstr "Быстрая загрузка" + +#: src/snes9x.ui:4746 +#: src/snes9x.ui:4865 +msgid "Slot 1" +msgstr "Слот 1" + +#: src/snes9x.ui:4759 +#: src/snes9x.ui:4850 +msgid "Slot 0" +msgstr "Слот 0" + +#: src/snes9x.ui:4772 +#: src/snes9x.ui:4880 +msgid "Slot 2" +msgstr "Слот 2" + +#: src/snes9x.ui:4785 +#: src/snes9x.ui:4895 +msgid "Slot 3" +msgstr "Слот 3" + +#: src/snes9x.ui:4798 +#: src/snes9x.ui:4910 +msgid "Slot 4" +msgstr "Слот 4" + +#: src/snes9x.ui:4811 +#: src/snes9x.ui:4925 +msgid "Slot 5" +msgstr "Слот 5" + +#: src/snes9x.ui:4824 +#: src/snes9x.ui:4940 +msgid "Slot 6" +msgstr "Слот 6" + +#: src/snes9x.ui:4837 +#: src/snes9x.ui:4955 +msgid "Slot 7" +msgstr "Слот 7" + +#: src/snes9x.ui:4970 +#: src/snes9x.ui:4985 +msgid "Slot 8" +msgstr "Слот 8" + +#: src/snes9x.ui:5276 +msgid "Save States" +msgstr "Состояния" + +#: src/snes9x.ui:5306 +msgid "Toggle sound channel 0" +msgstr "Переключить звуковой канал 0" + +#: src/snes9x.ui:5317 +msgid "Toggle sound channel 1" +msgstr "Переключить звуковой канал 1" + +#: src/snes9x.ui:5330 +msgid "Toggle sound channel 2" +msgstr "Переключить звуковой канал 2" + +#: src/snes9x.ui:5343 +msgid "Toggle sound channel 3" +msgstr "Переключить звуковой канал 3" + +#: src/snes9x.ui:5356 +msgid "Toggle sound channel 4" +msgstr "Переключить звуковой канал 4" + +#: src/snes9x.ui:5369 +msgid "Toggle sound channel 5" +msgstr "Переключить звуковой канал 5" + +#: src/snes9x.ui:5382 +msgid "Toggle sound channel 6" +msgstr "Переключить звуковой канал 6" + +#: src/snes9x.ui:5395 +msgid "Toggle sound channel 7" +msgstr "Переключить звуковой канал 7" + +#: src/snes9x.ui:5408 +msgid "Toggle all sound channels" +msgstr "Переключить все звуковые каналы" + +#: src/snes9x.ui:5574 +msgid "Seek to frame" +msgstr "Перейти на фрейм" + +#: src/snes9x.ui:5588 +msgid "Load Movie" +msgstr "Загрузить видео" + +#: src/snes9x.ui:5602 +msgid "Stop movie recording" +msgstr "Остановить запись видео" + +#: src/snes9x.ui:5616 +msgid "Begin movie recording" +msgstr "Начать запись видео" + +#: src/snes9x.ui:5630 +msgid "Save SPC" +msgstr "Сохранить SPC" + +#: src/snes9x.ui:5709 +msgid "Swap controllers 1 & 2" +msgstr "Поменять местами контроллеры 1 и 2" + +#: src/snes9x.ui:5740 +msgid "Misc" +msgstr "Ещё" + +#: src/snes9x.ui:5787 +msgid "Shortcuts" +msgstr "Клавиши" + +#: src/snes9x.ui:5894 +msgid "Advance to Frame" +msgstr "Перейти на кадр" + +#: src/snes9x.ui:5914 +msgid "The current frame in the movie is" +msgstr "Текущий кадр видео" + +#: src/snes9x.ui:5931 +msgid "Fast-forward to frame" +msgstr "Перемотать на кадр" + +#: src/snes9x.ui:6348 +msgid "Snes9x Cheats" +msgstr "Читы Snes9x" + +#: src/snes9x.ui:6389 +msgid "Code:" +msgstr "Код:" + +#: src/snes9x.ui:6413 +msgid "Description:" +msgstr "Описание:" + +#: src/snes9x.ui:6513 +msgid "Snes9x NetPlay" +msgstr "Snes9x NetPlay" + +#: src/snes9x.ui:6543 +msgid "The game chosen will be loaded before connecting. This field can be blank if the server will send the ROM image" +msgstr "Выбранная игра будет загружена перед соединением. Это поле может быть пустым, если сервер посылает образ ROM" + +#: src/snes9x.ui:6572 +msgid "Clear entry" +msgstr "Очистить запись" + +#: src/snes9x.ui:6590 +msgid "ROM Image" +msgstr "Образ ROM" + +#: src/snes9x.ui:6615 +msgid "Connect to another computer" +msgstr "Соединиться с другим копьютером" + +#: src/snes9x.ui:6619 +msgid "Connect to another computer that is running Snes9x NetPlay as a server" +msgstr "Соединиться с другим компьютером, на котором запущен сервер Snes9x NetPlay" + +#: src/snes9x.ui:6635 +msgid "Name or IP address:" +msgstr "Имя или адрес IP:" + +#: src/snes9x.ui:6646 +msgid "Domain name or internet protocol address of a remote computer" +msgstr "Доменное имя или адрес IP удалённого компьютера" + +#: src/snes9x.ui:6655 +msgid "Port:" +msgstr "Порт:" + +#: src/snes9x.ui:6666 +msgid "Connect to specified TCP port on remote computer" +msgstr "Соединиться с указанным портом TCP на удалённом компьютере" + +#: src/snes9x.ui:6683 +msgid "Act as a server" +msgstr "Быть сервером" + +#: src/snes9x.ui:6687 +msgid "Host a game on this computer as Player 1, requiring extra throughput to support multitple users" +msgstr "Запускать игру на этом компьютере как Игрок 1, требует дополнительной настройки для поддержки нескольких пользователей" + +#: src/snes9x.ui:6704 +msgid "Server" +msgstr "Сервер" + +#: src/snes9x.ui:6730 +msgid "Sync using reset" +msgstr "Синхронизировать через сброс" + +#: src/snes9x.ui:6734 +msgid "Reset the game when players join instead of transferring potentially unreliable freeze states" +msgstr "Сбрасывать игру, когда игроки присоединяются вместо того, чтобы отсылать потенциально ненадёжные состояния" + +#: src/snes9x.ui:6744 +msgid "Send ROM image to clients" +msgstr "Посылать образы ROM клиентам" + +#: src/snes9x.ui:6748 +msgid "Send the running game image to players instead of requiring them to have their own copies" +msgstr "Посылать образы игры игрокам, вместо того чтобы требовать от них иметь собственные копии" + +#: src/snes9x.ui:6763 +msgid "Default port:" +msgstr "Порт по умолчанию:" + +#: src/snes9x.ui:6774 +msgid "TCP port used as a connection point for remote clients" +msgstr "Порт TCP, используемый для соединения с удалёнными клиентами" + +#: src/snes9x.ui:6797 +msgid "Ask server to pause when" +msgstr "Просить сервер приостановиться при отставании на" + +#: src/snes9x.ui:6820 +msgid "frames behind" +msgstr "фреймов" + +#: src/snes9x.ui:6840 +msgid "Settings" +msgstr "Настройки" + +#: src/snes9x.ui:6903 +msgid "Open Multiple ROM Images (MultiCart)" +msgstr "Открыть несколько образов ROM (MultiCart)" + +#: src/snes9x.ui:6921 +msgid "Slot A:" +msgstr "Слот A:" + +#: src/snes9x.ui:6931 +msgid "Select an Image for Slot A" +msgstr "Выберите образ для слота A" + +#: src/snes9x.ui:6950 +msgid "Slot B:" +msgstr "Слот B:" + +#: src/snes9x.ui:6960 +msgid "Select an Image for Slot B" +msgstr "Выберите образ для слота B" + +#: src/snes9x.ui:7224 +msgid "" +" Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.\n" +"\n" +" (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com),\n" +" Jerremy Koot (jkoot@snes9x.com)\n" +"\n" +" (c) Copyright 2002 - 2004 Matthew Kendora\n" +"\n" +" (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org)\n" +"\n" +" (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/)\n" +"\n" +" (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net)\n" +"\n" +" (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca),\n" +" Kris Bleakley (codeviolation@hotmail.com)\n" +"\n" +" (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),\n" +" Nach (n-a-c-h@users.sourceforge.net),\n" +"\n" +" (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)\n" +"\n" +" (c) Copyright 2006 - 2007 nitsuja\n" +"\n" +" (c) Copyright 2009 - 2011 BearOso,\n" +" OV2\n" +"\n" +"\n" +" BS-X C emulator code\n" +" (c) Copyright 2005 - 2006 Dreamer Nom,\n" +" zones\n" +"\n" +" C4 x86 assembler and some C emulation code\n" +" (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com),\n" +" Nach,\n" +" zsKnight (zsknight@zsnes.com)\n" +"\n" +" C4 C++ code\n" +" (c) Copyright 2003 - 2006 Brad Jorsch,\n" +" Nach\n" +"\n" +" DSP-1 emulator code\n" +" (c) Copyright 1998 - 2006 _Demo_,\n" +" Andreas Naive (andreasnaive@gmail.com),\n" +" Gary Henderson,\n" +" Ivar (ivar@snes9x.com),\n" +" John Weidman,\n" +" Kris Bleakley,\n" +" Matthew Kendora,\n" +" Nach,\n" +" neviksti (neviksti@hotmail.com)\n" +"\n" +" DSP-2 emulator code\n" +" (c) Copyright 2003 John Weidman,\n" +" Kris Bleakley,\n" +" Lord Nightmare (lord_nightmare@users.sourceforge.net),\n" +" Matthew Kendora,\n" +" neviksti\n" +"\n" +" DSP-3 emulator code\n" +" (c) Copyright 2003 - 2006 John Weidman,\n" +" Kris Bleakley,\n" +" Lancer,\n" +" z80 gaiden\n" +"\n" +" DSP-4 emulator code\n" +" (c) Copyright 2004 - 2006 Dreamer Nom,\n" +" John Weidman,\n" +" Kris Bleakley,\n" +" Nach,\n" +" z80 gaiden\n" +"\n" +" OBC1 emulator code\n" +" (c) Copyright 2001 - 2004 zsKnight,\n" +" pagefault (pagefault@zsnes.com),\n" +" Kris Bleakley\n" +" Ported from x86 assembler to C by sanmaiwashi\n" +"\n" +" SPC7110 and RTC C++ emulator code used in 1.39-1.51\n" +" (c) Copyright 2002 Matthew Kendora with research by\n" +" zsKnight,\n" +" John Weidman,\n" +" Dark Force\n" +"\n" +" SPC7110 and RTC C++ emulator code used in 1.52+\n" +" (c) Copyright 2009 byuu,\n" +" neviksti\n" +"\n" +" S-DD1 C emulator code\n" +" (c) Copyright 2003 Brad Jorsch with research by\n" +" Andreas Naive,\n" +" John Weidman\n" +"\n" +" S-RTC C emulator code\n" +" (c) Copyright 2001 - 2006 byuu,\n" +" John Weidman\n" +"\n" +" ST010 C++ emulator code\n" +" (c) Copyright 2003 Feather,\n" +" John Weidman,\n" +" Kris Bleakley,\n" +" Matthew Kendora\n" +"\n" +" Super FX x86 assembler emulator code\n" +" (c) Copyright 1998 - 2003 _Demo_,\n" +" pagefault,\n" +" zsKnight\n" +"\n" +" Super FX C emulator code\n" +" (c) Copyright 1997 - 1999 Ivar,\n" +" Gary Henderson,\n" +" John Weidman\n" +"\n" +" Sound emulator code used in 1.5-1.51\n" +" (c) Copyright 1998 - 2003 Brad Martin\n" +" (c) Copyright 1998 - 2006 Charles Bilyue'\n" +"\n" +" Sound emulator code used in 1.52+\n" +" (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)\n" +"\n" +" SH assembler code partly based on x86 assembler code\n" +" (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)\n" +"\n" +" 2xSaI filter\n" +" (c) Copyright 1999 - 2001 Derek Liauw Kie Fa\n" +"\n" +" HQ2x, HQ3x, HQ4x filters\n" +" (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com)\n" +"\n" +" NTSC filter\n" +" (c) Copyright 2006 - 2007 Shay Green\n" +"\n" +" GTK+ GUI code\n" +" (c) Copyright 2004 - 2011 BearOso\n" +"\n" +" Win32 GUI code\n" +" (c) Copyright 2003 - 2006 blip,\n" +" funkyass,\n" +" Matthew Kendora,\n" +" Nach,\n" +" nitsuja\n" +" (c) Copyright 2009 - 2011 OV2\n" +"\n" +" Mac OS GUI code\n" +" (c) Copyright 1998 - 2001 John Stiles\n" +" (c) Copyright 2001 - 2011 zones\n" +"\n" +"\n" +" Specific ports contains the works of other authors. See headers in\n" +" individual files.\n" +"\n" +"\n" +" Snes9x homepage: http://www.snes9x.com/\n" +"\n" +" Permission to use, copy, modify and/or distribute Snes9x in both binary\n" +" and source form, for non-commercial purposes, is hereby granted without\n" +" fee, providing that this license information and copyright notice appear\n" +" with all copies and any derived work.\n" +"\n" +" This software is provided 'as-is', without any express or implied\n" +" warranty. In no event shall the authors be held liable for any damages\n" +" arising from the use of this software or it's derivatives.\n" +"\n" +" Snes9x is freeware for PERSONAL USE only. Commercial users should\n" +" seek permission of the copyright holders first. Commercial use includes,\n" +" but is not limited to, charging money for Snes9x or software derived from\n" +" Snes9x, including Snes9x or derivatives in commercial game bundles, and/or\n" +" using Snes9x as a promotion for your commercial product.\n" +"\n" +" The copyright holders request that bug fixes and improvements to the code\n" +" should be forwarded to them so everyone can benefit from the modifications\n" +" in future versions.\n" +"\n" +" Super NES and Super Nintendo Entertainment System are trademarks of\n" +" Nintendo Co., Limited and its subsidiary companies." +msgstr "" +" Snes9x - Портативный эмулятор Super Nintendo Entertainment System (TM).\n" +"\n" +" (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com),\n" +" Jerremy Koot (jkoot@snes9x.com)\n" +"\n" +" (c) Copyright 2002 - 2004 Matthew Kendora\n" +"\n" +" (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org)\n" +"\n" +" (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/)\n" +"\n" +" (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net)\n" +"\n" +" (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca),\n" +" Kris Bleakley (codeviolation@hotmail.com)\n" +"\n" +" (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),\n" +" Nach (n-a-c-h@users.sourceforge.net),\n" +"\n" +" (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)\n" +"\n" +" (c) Copyright 2006 - 2007 nitsuja\n" +"\n" +" (c) Copyright 2009 - 2011 BearOso,\n" +" OV2\n" +"\n" +"\n" +" BS-X C emulator code\n" +" (c) Copyright 2005 - 2006 Dreamer Nom,\n" +" zones\n" +"\n" +" C4 x86 assembler and some C emulation code\n" +" (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com),\n" +" Nach,\n" +" zsKnight (zsknight@zsnes.com)\n" +"\n" +" C4 C++ code\n" +" (c) Copyright 2003 - 2006 Brad Jorsch,\n" +" Nach\n" +"\n" +" DSP-1 emulator code\n" +" (c) Copyright 1998 - 2006 _Demo_,\n" +" Andreas Naive (andreasnaive@gmail.com),\n" +" Gary Henderson,\n" +" Ivar (ivar@snes9x.com),\n" +" John Weidman,\n" +" Kris Bleakley,\n" +" Matthew Kendora,\n" +" Nach,\n" +" neviksti (neviksti@hotmail.com)\n" +"\n" +" DSP-2 emulator code\n" +" (c) Copyright 2003 John Weidman,\n" +" Kris Bleakley,\n" +" Lord Nightmare (lord_nightmare@users.sourceforge.net),\n" +" Matthew Kendora,\n" +" neviksti\n" +"\n" +" DSP-3 emulator code\n" +" (c) Copyright 2003 - 2006 John Weidman,\n" +" Kris Bleakley,\n" +" Lancer,\n" +" z80 gaiden\n" +"\n" +" DSP-4 emulator code\n" +" (c) Copyright 2004 - 2006 Dreamer Nom,\n" +" John Weidman,\n" +" Kris Bleakley,\n" +" Nach,\n" +" z80 gaiden\n" +"\n" +" OBC1 emulator code\n" +" (c) Copyright 2001 - 2004 zsKnight,\n" +" pagefault (pagefault@zsnes.com),\n" +" Kris Bleakley\n" +" Ported from x86 assembler to C by sanmaiwashi\n" +"\n" +" SPC7110 and RTC C++ emulator code used in 1.39-1.51\n" +" (c) Copyright 2002 Matthew Kendora with research by\n" +" zsKnight,\n" +" John Weidman,\n" +" Dark Force\n" +"\n" +" SPC7110 and RTC C++ emulator code used in 1.52+\n" +" (c) Copyright 2009 byuu,\n" +" neviksti\n" +"\n" +" S-DD1 C emulator code\n" +" (c) Copyright 2003 Brad Jorsch with research by\n" +" Andreas Naive,\n" +" John Weidman\n" +"\n" +" S-RTC C emulator code\n" +" (c) Copyright 2001 - 2006 byuu,\n" +" John Weidman\n" +"\n" +" ST010 C++ emulator code\n" +" (c) Copyright 2003 Feather,\n" +" John Weidman,\n" +" Kris Bleakley,\n" +" Matthew Kendora\n" +"\n" +" Super FX x86 assembler emulator code\n" +" (c) Copyright 1998 - 2003 _Demo_,\n" +" pagefault,\n" +" zsKnight\n" +"\n" +" Super FX C emulator code\n" +" (c) Copyright 1997 - 1999 Ivar,\n" +" Gary Henderson,\n" +" John Weidman\n" +"\n" +" Sound emulator code used in 1.5-1.51\n" +" (c) Copyright 1998 - 2003 Brad Martin\n" +" (c) Copyright 1998 - 2006 Charles Bilyue'\n" +"\n" +" Sound emulator code used in 1.52+\n" +" (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)\n" +"\n" +" SH assembler code partly based on x86 assembler code\n" +" (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)\n" +"\n" +" 2xSaI filter\n" +" (c) Copyright 1999 - 2001 Derek Liauw Kie Fa\n" +"\n" +" HQ2x, HQ3x, HQ4x filters\n" +" (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com)\n" +"\n" +" NTSC filter\n" +" (c) Copyright 2006 - 2007 Shay Green\n" +"\n" +" GTK+ GUI code\n" +" (c) Copyright 2004 - 2011 BearOso\n" +"\n" +" Win32 GUI code\n" +" (c) Copyright 2003 - 2006 blip,\n" +" funkyass,\n" +" Matthew Kendora,\n" +" Nach,\n" +" nitsuja\n" +" (c) Copyright 2009 - 2011 OV2\n" +"\n" +" Mac OS GUI code\n" +" (c) Copyright 1998 - 2001 John Stiles\n" +" (c) Copyright 2001 - 2011 zones\n" +"\n" +"\n" +" Specific ports contains the works of other authors. See headers in\n" +" individual files.\n" +"\n" +"\n" +" Snes9x homepage: http://www.snes9x.com/\n" +"\n" +" Permission to use, copy, modify and/or distribute Snes9x in both binary\n" +" and source form, for non-commercial purposes, is hereby granted without\n" +" fee, providing that this license information and copyright notice appear\n" +" with all copies and any derived work.\n" +"\n" +" This software is provided 'as-is', without any express or implied\n" +" warranty. In no event shall the authors be held liable for any damages\n" +" arising from the use of this software or it's derivatives.\n" +"\n" +" Snes9x is freeware for PERSONAL USE only. Commercial users should\n" +" seek permission of the copyright holders first. Commercial use includes,\n" +" but is not limited to, charging money for Snes9x or software derived from\n" +" Snes9x, including Snes9x or derivatives in commercial game bundles, and/or\n" +" using Snes9x as a promotion for your commercial product.\n" +"\n" +" The copyright holders request that bug fixes and improvements to the code\n" +" should be forwarded to them so everyone can benefit from the modifications\n" +" in future versions.\n" +"\n" +" Super NES and Super Nintendo Entertainment System are trademarks of\n" +" Nintendo Co., Limited and its subsidiary companies." + +#: src/snes9x.ui:7402 +msgid "About Snes9x" +msgstr "О программе Snes9x" + +#: src/snes9x.ui:7435 +msgid "label106" +msgstr "label106" + +#~ msgid "" +#~ "8:7 Square pixels\n" +#~ "4:3 SNES correct aspect" +#~ msgstr "" +#~ "8:7 Квадратные пикселы\n" +#~ "4:3 правильное соотношение SNES" + +#~ msgid "Force SNES-hires output" +#~ msgstr "Вывод при высоком разрешении" + +#~ msgid "" +#~ "Detects frames that are not output by Snes9x in hires, and scales them" +#~ msgstr "" +#~ "Определяет кадры, не выводимые Snes9x при высоком разрешении, и " +#~ "масштабирует их" + +#~ msgid "" +#~ "None\n" +#~ "SuperEagle\n" +#~ "2xSaI\n" +#~ "Super2xSaI\n" +#~ "hq2x\n" +#~ "hq3x\n" +#~ "hq4x\n" +#~ "EPX\n" +#~ "EPX Smooth\n" +#~ "Blargg's NTSC\n" +#~ "Scanlines" +#~ msgstr "" +#~ "Нет\n" +#~ "SuperEagle\n" +#~ "2xSaI\n" +#~ "Super2xSaI\n" +#~ "hq2x\n" +#~ "hq3x\n" +#~ "hq4x\n" +#~ "EPX\n" +#~ "EPX Smooth\n" +#~ "Blargg's NTSC\n" +#~ "Сканлинии" + +#~ msgid "" +#~ "0%\n" +#~ "12.5%\n" +#~ "25%\n" +#~ "50%\n" +#~ "100%" +#~ msgstr "" +#~ "0%\n" +#~ "12.5%\n" +#~ "25%\n" +#~ "50%\n" +#~ "100%" + +#~ msgid "" +#~ "12.5%\n" +#~ "25%\n" +#~ "50%\n" +#~ "100%" +#~ msgstr "" +#~ "12.5%\n" +#~ "25%\n" +#~ "50%\n" +#~ "100%" + +#~ msgid "Smoothens (blurs) the image" +#~ msgstr "Сглаживает изображение" + +#~ msgid "" +#~ "16-bit (GL_BGRA)\n" +#~ "24-bit (GL_RGB)\n" +#~ "32-bit (GL_BGRA)" +#~ msgstr "" +#~ "16-bit (GL_BGRA)\n" +#~ "24-bit (GL_RGB)\n" +#~ "32-bit (GL_BGRA)" + +#~ msgid "" +#~ "48000 hz\n" +#~ "44100 hz\n" +#~ "32000 hz (SNES Default)\n" +#~ "22050 hz\n" +#~ "16000 hz\n" +#~ "11025 hz\n" +#~ "8000 hz\n" +#~ "0 hz" +#~ msgstr "" +#~ "48000 гц\n" +#~ "44100 гц\n" +#~ "32000 гц (SNES по умолчанию)\n" +#~ "22050 гц\n" +#~ "16000 гц\n" +#~ "11025 гц\n" +#~ "8000 гц\n" +#~ "0 гц" + +#~ msgid "" +#~ "Automatic\n" +#~ "0\n" +#~ "1\n" +#~ "2\n" +#~ "3\n" +#~ "4\n" +#~ "5\n" +#~ "6\n" +#~ "7\n" +#~ "8\n" +#~ "9" +#~ msgstr "" +#~ "Автоматически\n" +#~ "0\n" +#~ "1\n" +#~ "2\n" +#~ "3\n" +#~ "4\n" +#~ "5\n" +#~ "6\n" +#~ "7\n" +#~ "8\n" +#~ "9" + +#~ msgid "Enable HDMA" +#~ msgstr "Разрешить HDMA" + +#~ msgid "Enable HDMA. Required feature for compatibility with some games" +#~ msgstr "" +#~ "Разрешить HDMA. Требуемая опция для совместимости с некоторыми играми" + +#~ msgid "" +#~ "Toggle the menu bar\n" +#~ "Exit fullscreen mode\n" +#~ "Quit Snes9x" +#~ msgstr "" +#~ "Переключать строку меню\n" +#~ "Выключать полноэкранный режим\n" +#~ "Закрывать Snes9x" + +#~ msgid "ROM folder" +#~ msgstr "Папке ROM'a" + +#~ msgid "Store data in the same folder as the ROM file used" +#~ msgstr "Сохранять данные в той же папке, что и используемый ROM" + +#~ msgid "Snes9x configuration folder" +#~ msgstr "Папке настроек Snes9x" + +#~ msgid "Store data in $HOME/.snes9x/sram" +#~ msgstr "Сохранять данные в $HOME/.snes9x/sram" + +#~ msgid "Custom folder:" +#~ msgstr "Своей папке:" + +#~ msgid "Save data in:" +#~ msgstr "Сохранять данные в:" + +#~ msgid "Version Info" +#~ msgstr "Информация" + +#~ msgid "Type:" +#~ msgstr "Тип:" + +#~ msgid "" +#~ "Game Genie\n" +#~ "Pro Action Replay\n" +#~ "Goldfinger" +#~ msgstr "" +#~ "Game Genie\n" +#~ "Pro Action Replay\n" +#~ "Goldfinger" diff --git a/gtk/src/filter_epx_unsafe.cpp b/gtk/src/filter_epx_unsafe.cpp index 62874e29..9ea6e331 100644 --- a/gtk/src/filter_epx_unsafe.cpp +++ b/gtk/src/filter_epx_unsafe.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/gtk/src/snes9x.ui b/gtk/src/snes9x.ui index 5e9233c7..3f86e43d 100644 --- a/gtk/src/snes9x.ui +++ b/gtk/src/snes9x.ui @@ -7239,11 +7239,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -7352,7 +7353,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -7360,11 +7361,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/jma/s9x-jma.cpp b/jma/s9x-jma.cpp index 4c4c9cb6..f9914fb1 100644 --- a/jma/s9x-jma.cpp +++ b/jma/s9x-jma.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/jma/s9x-jma.h b/jma/s9x-jma.h index 97392ddc..be3639e3 100644 --- a/jma/s9x-jma.h +++ b/jma/s9x-jma.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/language.h b/language.h index 49a30ae1..09d80062 100644 --- a/language.h +++ b/language.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/loadzip.cpp b/loadzip.cpp index ac91a961..6ce8e7c8 100644 --- a/loadzip.cpp +++ b/loadzip.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/logger.cpp b/logger.cpp index 235c5335..2c0ada66 100644 --- a/logger.cpp +++ b/logger.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/logger.h b/logger.h index 63aa30b7..1f8303d4 100644 --- a/logger.h +++ b/logger.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/macosx/English.lproj/Snes9x Help/Snes9x Help.helpindex b/macosx/English.lproj/Snes9x Help/Snes9x Help.helpindex index 181ce7a4..e6d6e1d0 100644 Binary files a/macosx/English.lproj/Snes9x Help/Snes9x Help.helpindex and b/macosx/English.lproj/Snes9x Help/Snes9x Help.helpindex differ diff --git a/macosx/English.lproj/Snes9x Help/pgs/02.html b/macosx/English.lproj/Snes9x Help/pgs/02.html old mode 100644 new mode 100755 index c66d0731..24cbcc6c --- a/macosx/English.lproj/Snes9x Help/pgs/02.html +++ b/macosx/English.lproj/Snes9x Help/pgs/02.html @@ -20,7 +20,7 @@ Choose 'Open ROM Image...' in 'File' menu, select the game and start it. You can also drag and drop the ROM image onto the Snes9x icon. You may open a ROM image by double clicking on its icon in the Finder as well.

- SNES ROM images come in lots of different formats. Snes9x supports zipped ROMs as long as there is only 1 per zip file. Also Snes9x can open gzip/jma compressed file. + SNES ROM images come in lots of different formats. Snes9x supports zipped ROMs as long as there is only 1 per zip file. Also Snes9x can open gzip and jma compressed files.

Game Color System

diff --git a/macosx/English.lproj/Snes9x Help/pgs/03.html b/macosx/English.lproj/Snes9x Help/pgs/03.html old mode 100644 new mode 100755 index 519ad0b0..ed476e06 --- a/macosx/English.lproj/Snes9x Help/pgs/03.html +++ b/macosx/English.lproj/Snes9x Help/pgs/03.html @@ -21,7 +21,7 @@

Software

- You will need access to SNES ROM images in .smc, .sfc, .fig, etc., format otherwise you will have nothing to run! Some home-brewed ROM images can be downloaded from http://www.zophar.com/.
+ You will need access to SNES ROM images otherwise you will have nothing to run! Some home-brewed ROM images can be downloaded from http://www.zophar.com/.
Please note, it is illegal in most countries to have commercial ROM images without also owning the actual SNES ROM cartridges, and even then you may be liable under various EULAs.

diff --git a/macosx/English.lproj/Snes9x Help/pgs/04.html b/macosx/English.lproj/Snes9x Help/pgs/04.html old mode 100644 new mode 100755 index 31f05bfe..55056a6f --- a/macosx/English.lproj/Snes9x Help/pgs/04.html +++ b/macosx/English.lproj/Snes9x Help/pgs/04.html @@ -186,6 +186,14 @@ W decreases emulated frame time - speeding up the game. + + O + just pauses and resumes - doesn't exit from the emulation loop. + + + P + advances a frame when paused. + diff --git a/macosx/English.lproj/Snes9x Help/pgs/06.html b/macosx/English.lproj/Snes9x Help/pgs/06.html old mode 100644 new mode 100755 index 861e423c..fc2e9c52 --- a/macosx/English.lproj/Snes9x Help/pgs/06.html +++ b/macosx/English.lproj/Snes9x Help/pgs/06.html @@ -17,7 +17,7 @@

Using the SRAM File

- It's easy enough, just save the game as you do with the real SNES. Snes9x outputs the contents of the emulated SRAM into a file (.srm) when you load a new game or quit Snes9x. This file is automatically loaded the next time you play the game. + It's easy enough, just save the game as you do with the real SNES. Snes9x outputs the contents of the emulated SRAM into a file (.srm) when you load a new game, pause the emulation loop or quit Snes9x. This file is automatically loaded the next time you play the game.

To avoid losing your progress if Snes9x or your system crashes before the .srm file is saved, Snes9x provides auto-saving .srm option - the .srm file is always updated when the SRAM contents are modified. See into 'File' tab in 'Preferences' dialog to turn on this option. You can also update .srm file manually by choosing 'Save SRAM File Now' in 'Option' menu. diff --git a/macosx/English.lproj/Snes9x Help/pgs/08.html b/macosx/English.lproj/Snes9x Help/pgs/08.html old mode 100644 new mode 100755 index fd0f2d4b..b9d43a95 --- a/macosx/English.lproj/Snes9x Help/pgs/08.html +++ b/macosx/English.lproj/Snes9x Help/pgs/08.html @@ -29,7 +29,8 @@

QuickTime Movie Export

- Note that during the QuickTime recording there is no sound, but the exported QuickTime movie has sound. Choose 'Export to QuickTime Movie...' in 'Option' menu and choose the location where the QuickTime movie file will be saved. Press 'Compression...' button and set the compression settings by the general QuickTime dialog. 'Double Size' check box makes the movie size from 256x224/239 to 512x448/478. 'Overscan' check box is for games that use 239 or 478 lines. 'Frame Skip' menu decides frame rate of the movie, for example when the value is 1, NTSC games which have 60 fps are exported as 30 fps movie.
+ Note that during the QuickTime recording there is no sound, but the exported QuickTime movie has sound.
+ Choose 'Export to QuickTime Movie...' in 'Option' menu and choose the location where the QuickTime movie file will be saved. Press 'Compression...' button and set the compression settings by the general QuickTime dialog. 'Double Size' check box makes the movie size from 256x224/239 to 512x448/478. 'Overscan' check box is for games that use 239 or 478 lines. 'Frame Skip' menu decides frame rate of the movie, for example when the value is 1, NTSC games which have 60 fps are exported as 30 fps movie.
To make a QuickTime movie from .smv, choose 'Play Movie...' in 'Option' menu and turn on 'Export to QuickTime movie at a Time' check box.

diff --git a/macosx/English.lproj/Snes9x Help/pgs/09.html b/macosx/English.lproj/Snes9x Help/pgs/09.html old mode 100644 new mode 100755 index 3e07abca..04c2e2ef --- a/macosx/English.lproj/Snes9x Help/pgs/09.html +++ b/macosx/English.lproj/Snes9x Help/pgs/09.html @@ -32,7 +32,7 @@ Server - Open the ROM image. Pause the game. + Open the ROM image. Pause the game and exit from the emulation loop. Server @@ -84,7 +84,7 @@ Server - Netplay stops when server pauses the game. + Netplay stops when server pauses the game and exits from the emulation loop. Server diff --git a/macosx/English.lproj/Snes9x Help/pgs/10.html b/macosx/English.lproj/Snes9x Help/pgs/10.html old mode 100644 new mode 100755 index 3b1b8303..124a2390 --- a/macosx/English.lproj/Snes9x Help/pgs/10.html +++ b/macosx/English.lproj/Snes9x Help/pgs/10.html @@ -22,7 +22,9 @@

ROM Folder
the files will all be in the same folder as the ROM image being used.
Application Support Folder (default)
-
the subdirectories will be created in /Users/yourname/Library/Application Support/Snes9x and searched.
+
the subdirectories will be created and searched in /Users/yourname/Library/Application Support/Snes9x.
+
Other...
+
the subdirectories will be created and searched in any folder you choose.

Which Display is Used in Full Screen Mode

diff --git a/macosx/English.lproj/Snes9x Help/pgs/13.html b/macosx/English.lproj/Snes9x Help/pgs/13.html old mode 100644 new mode 100755 index b3c98b31..ff136aff --- a/macosx/English.lproj/Snes9x Help/pgs/13.html +++ b/macosx/English.lproj/Snes9x Help/pgs/13.html @@ -19,7 +19,7 @@

  • Sound DSP, with eight 16-bit, stereo channels, compressed samples, hardware envelope processing, echo, pitch modulation and digital FIR sound filter.
  • SRAM, a battery-backed RAM.
  • All background modes, 0 to 7.
  • -
  • All screen resolutions, 256x224, 256x239, 512x224, 512x239, 512x448 and 512x478.
  • +
  • All screen resolutions including interlace mode.
  • Pseudo hi-res mode.
  • 8x8, 16x8 and 16x16 tile sizes, flipped in either direction.
  • 32x32, 32x64, 64x32 and 64x64 screen tile sizes.
  • diff --git a/macosx/English.lproj/Snes9x Help/pgs/15.html b/macosx/English.lproj/Snes9x Help/pgs/15.html old mode 100644 new mode 100755 index e8b5e491..5eb0de91 --- a/macosx/English.lproj/Snes9x Help/pgs/15.html +++ b/macosx/English.lproj/Snes9x Help/pgs/15.html @@ -60,7 +60,7 @@

    Edited for Mac port by: zones (kasumitokoduck@yahoo.com)
    - Updated most recently by: 2009/12/20 zones + Updated most recently by: 2011/3/31 zones

    <Prev  Top  Next> diff --git a/macosx/English.lproj/Snes9x.nib/classes.nib b/macosx/English.lproj/Snes9x.nib/classes.nib deleted file mode 100644 index c4b887e7..00000000 --- a/macosx/English.lproj/Snes9x.nib/classes.nib +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IBVersion - 1 - - diff --git a/macosx/English.lproj/Snes9x.nib/info.nib b/macosx/English.lproj/Snes9x.nib/info.nib deleted file mode 100644 index 0e0eb7bd..00000000 --- a/macosx/English.lproj/Snes9x.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 823 - IBLastKnownRelativeProjectPath - ../snes9x.xcodeproj - IBOldestOS - 6 - IBOpenObjects - - IBSystem Version - 10J567 - targetFramework - IBCarbonFramework - - diff --git a/macosx/English.lproj/Snes9x.nib/objects.xib b/macosx/English.lproj/Snes9x.nib/objects.xib deleted file mode 100644 index d4e9880e..00000000 --- a/macosx/English.lproj/Snes9x.nib/objects.xib +++ /dev/null @@ -1,7694 +0,0 @@ - - - - - - - osx_ - 806 - Saves the sizes and positions of the game window and dialogs so they come back to the same place. - Save Window Size and Position - 326 20 221 18 - 62 347 80 568 - - - PRES - 1 - Preset #n - 130 456 95 13 - 456 130 469 225 - - - AEtx - 1 - TRUE - TRUE - 110 74 90 13 - 74 110 87 200 - - - Star - 2 - 0 - 822 - 4 - 33024 - 159 74 28 28 - 122 200 150 228 - - - #3 - TRUE - CPr3 - - - TRUE - TRUE - - - 1 - Cheat Value : - -1 - 16 74 83 13 - 74 16 87 99 - - - 8__R - 8__R - 0 - 1409 - 4 - TRUE - 32768 - 176 26 28 28 - 324 518 352 546 - - - RChk - 1 - 0 - 809 - 4 - 33024 - 180 30 28 28 - 78 221 106 249 - - - SHTa - 1 - SHTa - 1 - Add - 237 130 70 20 - 130 237 150 307 - - - 7__R - 7__R - 0 - 1309 - 4 - TRUE - 32768 - 176 26 28 28 - 324 196 352 224 - - - Slot A - 20 22 42 16 - 22 20 38 62 - - - 1 - Size (header) : - -1 - 20 167 128 13 - 167 20 180 148 - - - = - TRUE - - - 8Sel - 8Sel - 0 - 1411 - 4 - TRUE - 32768 - 119 70 28 28 - 368 461 396 489 - - - Slid - 1 - TRUE - 16 - 10 - 1 - 16 - 16 28 215 26 - 392 57 418 272 - - - barc - 3 - barc - 0 - 4 - 256 - 192 6 12 12 - 214 213 226 225 - - - 2__A - 2__A - 0 - 819 - 4 - TRUE - 32768 - 262 70 28 28 - 76 604 104 632 - - - 4 - TRUE - - - Justifier - TRUE - EIp7 - - - PANE - 1000 - 2 - - - RCTL - 108 - 1 - Players to Record : - 8 7 21 110 - - - RCTL - 109 - 1 - Comment : - 33 7 46 67 - - - RCTL - 107 - 1 - TRUE - TRUE - 33 77 46 422 - - - RCTL - 101 - 1 - 1 - 7 114 23 140 - - - RCTL - 102 - 1 - 2 - 7 152 23 178 - - - RCTL - 103 - 1 - 3 - 7 190 23 216 - - - RCTL - 104 - 1 - 4 - 7 228 23 254 - - - RCTL - 105 - 1 - 5 - 7 266 23 292 - - - RCTL - 106 - 1 - Reset - 7 358 23 406 - - - 0 0 57 433 - - - CCTL - 102 - 1 - - Popup: - - - Auto Detect - TRUE - - - TRUE - TRUE - - - Force not Interleaved - TRUE - - - Force Mode 1 - TRUE - - - Force Mode 2 - TRUE - - - Force GD24 - TRUE - - - - 6 315 23 425 - - - Up - 2 - 0 - 812 - 4 - 33024 - 46 44 28 28 - 92 87 120 115 - - - Cheat - - Cheat - 132 - - - Apply Cheats - TRUE - Hapl - - - TRUE - TRUE - - - Cheat Entry... - TRUE - Hent - - - Cheat Finder... - TRUE - Hfnd - - - - - - 0 0 257 216 - - - BMrk - All frames are drawn without adjusting times. Make sure 'Synchronize' in 'Sound' tab in 'Preferences' dialog is turned off. - Benchmark Test - 18 20 133 18 - 20 18 38 151 - - - NoTR - GL_TEXTURE_2D is used even if GL_TEXTURE_RECTANGLE_EXT is available. - Don't Use Rectangle Texture - 34 104 203 18 - 104 34 122 237 - - - AGPT - Sets GL_TEXTURE_PRIORITY to 0.0. - AGP Texturing - 34 148 203 18 - 148 34 166 237 - - - Storage Hint : - 36 178 90 16 - 178 36 194 126 - - - CSAp - Sets GL_STORAGE_SHARED_APPLE to 1. - Client Stroage - 34 126 203 18 - 126 34 144 237 - - - Hint - Sets GL_TEXTURE_STORAGE_HINT_APPLE. - 2 - - Popup: - - - Private - TRUE - - - Cached - TRUE - - - Shared - TRUE - - - - 134 176 103 20 - 176 134 196 237 - - - OpenGL Settings : - 20 80 131 16 - 80 20 96 151 - - - 12 58 233 1 - 58 12 59 245 - - - 0 0 216 257 - - - The degree of curvature. - Warp : - -2 - 345 228 45 16 - 270 366 286 411 - - - Defrost State - d - TRUE - Odfr - - - 1 - Set whether automatic fire is enabled for each controller button. - Enable Automatic Fire - FALSE - 20 6 310 148 - - - Left - 1 - 0 - 802 - 4 - 33024 - 16 74 28 28 - 122 57 150 85 - - - Up - 1 - 0 - 800 - 4 - 33024 - 46 44 28 28 - 92 87 120 115 - - - Down - 1 - 0 - 801 - 4 - 33024 - 46 104 28 28 - 152 87 180 115 - - - Righ - 1 - 0 - 803 - 4 - 33024 - 76 74 28 28 - 122 117 150 145 - - - AChk - 1 - 0 - 807 - 4 - 33024 - 266 74 28 28 - 122 307 150 335 - - - YChk - 1 - 0 - 804 - 4 - 33024 - 206 74 28 28 - 122 247 150 275 - - - BChk - 1 - 0 - 805 - 4 - 33024 - 236 104 28 28 - 152 277 180 305 - - - Sele - 1 - 0 - 811 - 4 - 33024 - 123 74 28 28 - 122 164 150 192 - - - Star - 1 - 0 - 810 - 4 - 33024 - 159 74 28 28 - 122 200 150 228 - - - XChk - 1 - 0 - 806 - 4 - 33024 - 236 44 28 28 - 92 277 120 305 - - - LChk - 1 - 0 - 808 - 4 - 33024 - 102 30 28 28 - 78 143 106 171 - - - - 48 41 196 351 - - - 140 ms - TRUE - - - Up - 111 - 0 - 800 - 4 - 33024 - 46 44 28 28 - 250 87 278 115 - - - - Choose the behavior of Snes9x when it is in back of other applications. - When in Background : - 20 134 146 16 - 176 41 192 187 - - - 0 0 555 272 - - - BRSR - - 1 - 1 - 2 - 2 - - 40 - - - CHK_ - chbx - 327681 - 1 - 30 - 30 - - - ADDR - 327681 - 1 - 84 - 84 - Address - - - VALU - 327681 - 1 - 65 - 65 - Value - - - DESC - 327681 - 1 - 196 - 196 - -2 - Description - - - 1 - FALSE - FALSE - 17 - 20 20 396 232 - 20 20 252 416 - - - NEW_ - NEW_ - - 1 - 2 - - New - 432 20 103 20 - 20 432 40 535 - - - DEL_ - DEL_ - - 1 - 2 - - Delete - 432 52 103 20 - 52 432 72 535 - - - ALL_ - ALL_ - - 1 - 2 - - Enable All - 432 92 103 20 - 92 432 112 535 - - - 0 0 272 555 - - - LChk - 22 - 0 - 820 - 4 - 33024 - 102 30 28 28 - 78 473 106 501 - - - _Esc - _Esc - 0 - 837 - 4 - TRUE - 32768 - 262 63 28 28 - 361 926 389 954 - - - 1P : - 20 20 28 16 - 20 20 36 48 - - - 7_Rt - 7_Rt - 0 - 1303 - 4 - TRUE - 32768 - 72 70 28 28 - 368 92 396 120 - - - 1 - Cart Name : - -1 - 20 20 128 13 - 20 20 33 148 - - - TRUE - TRUE - - - - QCTL - 103 - 1 - Compression... - 7 319 27 424 - - - 0 0 292 132 - - - SVIP - TRUE - TRUE - 97 23 172 16 - 23 97 39 269 - - - NOT_ - NOT_ - 2 - Cancel - 110 92 70 20 - 92 110 112 180 - - - OK__ - OK__ - 1 - Connect - 192 92 80 20 - 92 192 112 272 - - - CLNM - TRUE - TRUE - 97 53 172 16 - 53 97 69 269 - - - Server IP : - -1 - 20 23 63 16 - 23 20 39 83 - - - Name : - -1 - 20 53 63 16 - 53 20 69 83 - - - CHAS - 18 98 16 16 - 98 18 114 34 - - - 0 0 132 292 - - - - Multi Taps (Both Ports) - TRUE - EIp6 - - - Smooth - TRUE - - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Automatic Fire - - 0 0 723 472 - - - Ftab - 256 - 21 5 680 449 - - - Ftab - 257 - 2 - 0 37 680 412 - - - - 1 - Set whether pressing 'Alt' in conjunction with a controller button in-game toggles its automatic fire on/off. - Allow 'Alt' to Toggle Enable/Disable Automatic Fire - FALSE - 350 6 310 148 - - - Left - 11 - 0 - 802 - 4 - 33024 - 16 74 28 28 - 122 387 150 415 - - - Up - 11 - 0 - 800 - 4 - 33024 - 46 44 28 28 - 92 417 120 445 - - - Down - 11 - 0 - 801 - 4 - 33024 - 46 104 28 28 - 152 417 180 445 - - - Righ - 11 - 0 - 803 - 4 - 33024 - 76 74 28 28 - 122 447 150 475 - - - AChk - 11 - 0 - 807 - 4 - 33024 - 266 74 28 28 - 122 637 150 665 - - - YChk - 11 - 0 - 804 - 4 - 33024 - 206 74 28 28 - 122 577 150 605 - - - BChk - 11 - 0 - 805 - 4 - 33024 - 236 104 28 28 - 152 607 180 635 - - - Sele - 11 - 0 - 811 - 4 - 33024 - 123 74 28 28 - 122 494 150 522 - - - Star - 11 - 0 - 810 - 4 - 33024 - 159 74 28 28 - 122 530 150 558 - - - XChk - 11 - 0 - 806 - 4 - 33024 - 236 44 28 28 - 92 607 120 635 - - - LChk - 11 - 0 - 808 - 4 - 33024 - 102 30 28 28 - 78 473 106 501 - - - RChk - 11 - 0 - 809 - 4 - 33024 - 180 30 28 28 - 78 551 106 579 - - - 48 371 196 681 - - - 1 - Set whether, when automatic fire is enabled, 'TC' must also be held down to activate automatic fire. - Automatic Fire is Active Only While 'TC' is Pressed - FALSE - 20 164 310 148 - - - Left - 111 - 0 - 802 - 4 - 33024 - 16 74 28 28 - 280 57 308 85 - - - - Down - 111 - 0 - 801 - 4 - 33024 - 46 104 28 28 - 310 87 338 115 - - - Righ - 111 - 0 - 803 - 4 - 33024 - 76 74 28 28 - 280 117 308 145 - - - AChk - 111 - 0 - 807 - 4 - 33024 - 266 74 28 28 - 280 307 308 335 - - - YChk - 111 - 0 - 804 - 4 - 33024 - 206 74 28 28 - 280 247 308 275 - - - BChk - 111 - 0 - 805 - 4 - 33024 - 236 104 28 28 - 310 277 338 305 - - - Sele - 111 - 0 - 811 - 4 - 33024 - 123 74 28 28 - 280 164 308 192 - - - Star - 111 - 0 - 810 - 4 - 33024 - 159 74 28 28 - 280 200 308 228 - - - XChk - 111 - 0 - 806 - 4 - 33024 - 236 44 28 28 - 250 277 278 305 - - - LChk - 111 - 0 - 808 - 4 - 33024 - 102 30 28 28 - 236 143 264 171 - - - RChk - 111 - 0 - 809 - 4 - 33024 - 180 30 28 28 - 236 221 264 249 - - - 206 41 354 351 - - - 1 - Set whether a button's input is inverted - that is, Snes9x acts as though the button is pressed if and only if it is not pressed. - Button Input is Inverted - FALSE - 350 164 310 148 - - - Left - 1111 - 0 - 802 - 4 - 33024 - 16 74 28 28 - 280 387 308 415 - - - Up - 1111 - 0 - 800 - 4 - 33024 - 46 44 28 28 - 250 417 278 445 - - - Down - 1111 - 0 - 801 - 4 - 33024 - 46 104 28 28 - 310 417 338 445 - - - Righ - 1111 - 0 - 803 - 4 - 33024 - 76 74 28 28 - 280 447 308 475 - - - AChk - 1111 - 0 - 807 - 4 - 33024 - 266 74 28 28 - 280 637 308 665 - - - YChk - 1111 - 0 - 804 - 4 - 33024 - 206 74 28 28 - 280 577 308 605 - - - BChk - 1111 - 0 - 805 - 4 - 33024 - 236 104 28 28 - 310 607 338 635 - - - Sele - 1111 - 0 - 811 - 4 - 33024 - 123 74 28 28 - 280 494 308 522 - - - Star - 1111 - 0 - 810 - 4 - 33024 - 159 74 28 28 - 280 530 308 558 - - - XChk - 1111 - 0 - 806 - 4 - 33024 - 236 44 28 28 - 250 607 278 635 - - - LChk - 1111 - 0 - 808 - 4 - 33024 - 102 30 28 28 - 236 473 264 501 - - - RChk - 1111 - 0 - 809 - 4 - 33024 - 180 30 28 28 - 236 551 264 579 - - - 206 371 354 681 - - - 1 - Set the number of presses per second that an automatic fire button receives. - Automatic Fire Speed - FALSE - 20 322 310 70 - - - - Num_ - 1 - 1 - 10 - -1 - 242 35 19 13 - 399 283 412 302 - - - 1 - / sec - 265 35 29 13 - 399 306 412 335 - - - 364 41 434 351 - - - DEF1 - DEF1 - Restores the default settings. - Defaults - 579 372 81 20 - 414 600 434 681 - - - 42 21 454 701 - - - Ftab - 258 - 2 - 0 37 680 412 - - - 1 - Set whether pressing 'Alt' in conjunction with a controller button in-game toggles its automatic fire on/off. - Allow 'Alt' to Toggle Enable/Disable Automatic Fire - FALSE - 350 6 310 148 - - - Left - 22 - 0 - 814 - 4 - 33024 - 16 74 28 28 - 122 387 150 415 - - - Up - 22 - 0 - 812 - 4 - 33024 - 46 44 28 28 - 92 417 120 445 - - - Down - 22 - 0 - 813 - 4 - 33024 - 46 104 28 28 - 152 417 180 445 - - - Righ - 22 - 0 - 815 - 4 - 33024 - 76 74 28 28 - 122 447 150 475 - - - AChk - 22 - 0 - 819 - 4 - 33024 - 266 74 28 28 - 122 637 150 665 - - - YChk - 22 - 0 - 816 - 4 - 33024 - 206 74 28 28 - 122 577 150 605 - - - BChk - 22 - 0 - 817 - 4 - 33024 - 236 104 28 28 - 152 607 180 635 - - - Sele - 22 - 0 - 823 - 4 - 33024 - 123 74 28 28 - 122 494 150 522 - - - Star - 22 - 0 - 822 - 4 - 33024 - 159 74 28 28 - 122 530 150 558 - - - XChk - 22 - 0 - 818 - 4 - 33024 - 236 44 28 28 - 92 607 120 635 - - - - RChk - 22 - 0 - 821 - 4 - 33024 - 180 30 28 28 - 78 551 106 579 - - - 48 371 196 681 - - - 1 - Set whether automatic fire is enabled for each controller button. - Enable Automatic Fire - FALSE - 20 6 310 148 - - - Left - 2 - 0 - 814 - 4 - 33024 - 16 74 28 28 - 122 57 150 85 - - - - Down - 2 - 0 - 813 - 4 - 33024 - 46 104 28 28 - 152 87 180 115 - - - Righ - 2 - 0 - 815 - 4 - 33024 - 76 74 28 28 - 122 117 150 145 - - - AChk - 2 - 0 - 819 - 4 - 33024 - 266 74 28 28 - 122 307 150 335 - - - YChk - 2 - 0 - 816 - 4 - 33024 - 206 74 28 28 - 122 247 150 275 - - - BChk - 2 - 0 - 817 - 4 - 33024 - 236 104 28 28 - 152 277 180 305 - - - Sele - 2 - 0 - 823 - 4 - 33024 - 123 74 28 28 - 122 164 150 192 - - - - XChk - 2 - 0 - 818 - 4 - 33024 - 236 44 28 28 - 92 277 120 305 - - - LChk - 2 - 0 - 820 - 4 - 33024 - 102 30 28 28 - 78 143 106 171 - - - RChk - 2 - 0 - 821 - 4 - 33024 - 180 30 28 28 - 78 221 106 249 - - - 48 41 196 351 - - - 1 - Set whether, when automatic fire is enabled, 'TC' must also be held down to activate automatic fire. - Automatic Fire is Active Only While 'TC' is Pressed - FALSE - 20 164 310 148 - - - Left - 222 - 0 - 814 - 4 - 33024 - 16 74 28 28 - 280 57 308 85 - - - Up - 222 - 0 - 812 - 4 - 33024 - 46 44 28 28 - 250 87 278 115 - - - Down - 222 - 0 - 813 - 4 - 33024 - 46 104 28 28 - 310 87 338 115 - - - Righ - 222 - 0 - 815 - 4 - 33024 - 76 74 28 28 - 280 117 308 145 - - - AChk - 222 - 0 - 819 - 4 - 33024 - 266 74 28 28 - 280 307 308 335 - - - YChk - 222 - 0 - 816 - 4 - 33024 - 206 74 28 28 - 280 247 308 275 - - - BChk - 222 - 0 - 817 - 4 - 33024 - 236 104 28 28 - 310 277 338 305 - - - Sele - 222 - 0 - 823 - 4 - 33024 - 123 74 28 28 - 280 164 308 192 - - - Star - 222 - 0 - 822 - 4 - 33024 - 159 74 28 28 - 280 200 308 228 - - - XChk - 222 - 0 - 818 - 4 - 33024 - 236 44 28 28 - 250 277 278 305 - - - LChk - 222 - 0 - 820 - 4 - 33024 - 102 30 28 28 - 236 143 264 171 - - - RChk - 222 - 0 - 821 - 4 - 33024 - 180 30 28 28 - 236 221 264 249 - - - 206 41 354 351 - - - 1 - Set whether a button's input is inverted - that is, Snes9x acts as though the button is pressed if and only if it is not pressed. - Button Input is Inverted - FALSE - 350 164 310 148 - - - Left - 2222 - 0 - 814 - 4 - 33024 - 16 74 28 28 - 280 387 308 415 - - - Up - 2222 - 0 - 812 - 4 - 33024 - 46 44 28 28 - 250 417 278 445 - - - Down - 2222 - 0 - 813 - 4 - 33024 - 46 104 28 28 - 310 417 338 445 - - - Righ - 2222 - 0 - 815 - 4 - 33024 - 76 74 28 28 - 280 447 308 475 - - - AChk - 2222 - 0 - 819 - 4 - 33024 - 266 74 28 28 - 280 637 308 665 - - - YChk - 2222 - 0 - 816 - 4 - 33024 - 206 74 28 28 - 280 577 308 605 - - - BChk - 2222 - 0 - 817 - 4 - 33024 - 236 104 28 28 - 310 607 338 635 - - - Sele - 2222 - 0 - 823 - 4 - 33024 - 123 74 28 28 - 280 494 308 522 - - - Star - 2222 - 0 - 822 - 4 - 33024 - 159 74 28 28 - 280 530 308 558 - - - XChk - 2222 - 0 - 818 - 4 - 33024 - 236 44 28 28 - 250 607 278 635 - - - LChk - 2222 - 0 - 820 - 4 - 33024 - 102 30 28 28 - 236 473 264 501 - - - RChk - 2222 - 0 - 821 - 4 - 33024 - 180 30 28 28 - 236 551 264 579 - - - 206 371 354 681 - - - 1 - Set the number of presses per second that an automatic fire button receives. - Automatic Fire Speed - FALSE - 20 322 310 70 - - - Slid - 2 - TRUE - 16 - 10 - 1 - 16 - 16 28 215 26 - 392 57 418 272 - - - Num_ - 2 - 1 - 10 - -1 - 242 35 19 13 - 399 283 412 302 - - - 1 - / sec - 265 35 29 13 - 399 306 412 335 - - - 364 41 434 351 - - - DEF2 - DEF2 - Restores the default settings. - Defaults - 579 372 81 20 - 414 600 434 681 - - - 42 21 454 701 - - - 5 21 454 701 - - - contentResID - 0 - tabEnabled - 1 - tabName - Player 1 - userPane - - - - contentResID - 0 - tabEnabled - 1 - tabName - Player 2 - userPane - - - - - - 0 0 472 723 - - 80 40 552 763 - 0 0 768 1024 - - - Enab - Enab - Enable this Effect - 73 18 91 154 - - - Too short length will cause crackling noise. - Mix Buffer Length : - -1 - 275 81 130 16 - 123 296 139 426 - - - - AEcv - 1 - current value - 107 47 96 13 - 47 107 60 203 - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Configure Controllers - - 0 0 986 491 - - - 1 - Player 1 - FALSE - 20 6 302 140 - - - 1_Lf - 1_Lf - 0 - 802 - 4 - TRUE - 32768 - 12 70 28 28 - 76 32 104 60 - - - 1_Up - 1_Up - 0 - 800 - 4 - TRUE - 32768 - 42 40 28 28 - 46 62 74 90 - - - 1_Dn - 1_Dn - 0 - 801 - 4 - TRUE - 32768 - 42 100 28 28 - 106 62 134 90 - - - 1_Rt - 1_Rt - 0 - 803 - 4 - TRUE - 32768 - 72 70 28 28 - 76 92 104 120 - - - 1__A - 1__A - 0 - 807 - 4 - TRUE - 32768 - 262 70 28 28 - 76 282 104 310 - - - 1__Y - 1__Y - 0 - 804 - 4 - TRUE - 32768 - 202 70 28 28 - 76 222 104 250 - - - 1__B - 1__B - 0 - 805 - 4 - TRUE - 32768 - 232 100 28 28 - 106 252 134 280 - - - 1Sel - 1Sel - 0 - 811 - 4 - TRUE - 32768 - 119 70 28 28 - 76 139 104 167 - - - 1Srt - 1Srt - 0 - 810 - 4 - TRUE - 32768 - 155 70 28 28 - 76 175 104 203 - - - 1__X - 1__X - 0 - 806 - 4 - TRUE - 32768 - 232 40 28 28 - 46 252 74 280 - - - 1__L - 1__L - 0 - 808 - 4 - TRUE - 32768 - 98 26 28 28 - 32 118 60 146 - - - 1__R - 1__R - 0 - 809 - 4 - TRUE - 32768 - 176 26 28 28 - 32 196 60 224 - - - 6 20 146 322 - - - 1 - Player 2 - FALSE - 342 6 302 140 - - - 2_Lf - 2_Lf - 0 - 814 - 4 - TRUE - 32768 - 12 70 28 28 - 76 354 104 382 - - - 2_Up - 2_Up - 0 - 812 - 4 - TRUE - 32768 - 42 40 28 28 - 46 384 74 412 - - - 2_Dn - 2_Dn - 0 - 813 - 4 - TRUE - 32768 - 42 100 28 28 - 106 384 134 412 - - - 2_Rt - 2_Rt - 0 - 815 - 4 - TRUE - 32768 - 72 70 28 28 - 76 414 104 442 - - - - 2__Y - 2__Y - 0 - 816 - 4 - TRUE - 32768 - 202 70 28 28 - 76 544 104 572 - - - 2__B - 2__B - 0 - 817 - 4 - TRUE - 32768 - 232 100 28 28 - 106 574 134 602 - - - 2Sel - 2Sel - 0 - 823 - 4 - TRUE - 32768 - 119 70 28 28 - 76 461 104 489 - - - 2Srt - 2Srt - 0 - 822 - 4 - TRUE - 32768 - 155 70 28 28 - 76 497 104 525 - - - 2__X - 2__X - 0 - 818 - 4 - TRUE - 32768 - 232 40 28 28 - 46 574 74 602 - - - 2__L - 2__L - 0 - 820 - 4 - TRUE - 32768 - 98 26 28 28 - 32 440 60 468 - - - 2__R - 2__R - 0 - 821 - 4 - TRUE - 32768 - 176 26 28 28 - 32 518 60 546 - - - 6 342 146 644 - - - 1 - Player 3 - FALSE - 664 6 302 140 - - - 3_Lf - 3_Lf - 0 - 902 - 4 - TRUE - 32768 - 12 70 28 28 - 76 676 104 704 - - - 3_Up - 3_Up - 0 - 900 - 4 - TRUE - 32768 - 42 40 28 28 - 46 706 74 734 - - - 3_Dn - 3_Dn - 0 - 901 - 4 - TRUE - 32768 - 42 100 28 28 - 106 706 134 734 - - - 3_Rt - 3_Rt - 0 - 903 - 4 - TRUE - 32768 - 72 70 28 28 - 76 736 104 764 - - - 3__A - 3__A - 0 - 907 - 4 - TRUE - 32768 - 262 70 28 28 - 76 926 104 954 - - - 3__Y - 3__Y - 0 - 904 - 4 - TRUE - 32768 - 202 70 28 28 - 76 866 104 894 - - - 3__B - 3__B - 0 - 905 - 4 - TRUE - 32768 - 232 100 28 28 - 106 896 134 924 - - - 3Sel - 3Sel - 0 - 911 - 4 - TRUE - 32768 - 119 70 28 28 - 76 783 104 811 - - - 3Srt - 3Srt - 0 - 910 - 4 - TRUE - 32768 - 155 70 28 28 - 76 819 104 847 - - - 3__X - 3__X - 0 - 906 - 4 - TRUE - 32768 - 232 40 28 28 - 46 896 74 924 - - - 3__L - 3__L - 0 - 908 - 4 - TRUE - 32768 - 98 26 28 28 - 32 762 60 790 - - - 3__R - 3__R - 0 - 909 - 4 - TRUE - 32768 - 176 26 28 28 - 32 840 60 868 - - - 6 664 146 966 - - - 1 - Player 4 - FALSE - 20 152 302 140 - - - 4_Lf - 4_Lf - 0 - 1002 - 4 - TRUE - 32768 - 12 70 28 28 - 222 32 250 60 - - - 4_Up - 4_Up - 0 - 1000 - 4 - TRUE - 32768 - 42 40 28 28 - 192 62 220 90 - - - 4_Dn - 4_Dn - 0 - 1001 - 4 - TRUE - 32768 - 42 100 28 28 - 252 62 280 90 - - - 4_Rt - 4_Rt - 0 - 1003 - 4 - TRUE - 32768 - 72 70 28 28 - 222 92 250 120 - - - 4__A - 4__A - 0 - 1007 - 4 - TRUE - 32768 - 262 70 28 28 - 222 282 250 310 - - - 4__Y - 4__Y - 0 - 1004 - 4 - TRUE - 32768 - 202 70 28 28 - 222 222 250 250 - - - 4__B - 4__B - 0 - 1005 - 4 - TRUE - 32768 - 232 100 28 28 - 252 252 280 280 - - - 4Sel - 4Sel - 0 - 1011 - 4 - TRUE - 32768 - 119 70 28 28 - 222 139 250 167 - - - 4Srt - 4Srt - 0 - 1010 - 4 - TRUE - 32768 - 155 70 28 28 - 222 175 250 203 - - - 4__X - 4__X - 0 - 1006 - 4 - TRUE - 32768 - 232 40 28 28 - 192 252 220 280 - - - 4__L - 4__L - 0 - 1008 - 4 - TRUE - 32768 - 98 26 28 28 - 178 118 206 146 - - - 4__R - 4__R - 0 - 1009 - 4 - TRUE - 32768 - 176 26 28 28 - 178 196 206 224 - - - 152 20 292 322 - - - 1 - Player 5 - FALSE - 342 152 302 140 - - - 5_Lf - 5_Lf - 0 - 1102 - 4 - TRUE - 32768 - 12 70 28 28 - 222 354 250 382 - - - 5_Up - 5_Up - 0 - 1100 - 4 - TRUE - 32768 - 42 40 28 28 - 192 384 220 412 - - - 5_Dn - 5_Dn - 0 - 1101 - 4 - TRUE - 32768 - 42 100 28 28 - 252 384 280 412 - - - 5_Rt - 5_Rt - 0 - 1103 - 4 - TRUE - 32768 - 72 70 28 28 - 222 414 250 442 - - - 5__A - 5__A - 0 - 1107 - 4 - TRUE - 32768 - 262 70 28 28 - 222 604 250 632 - - - 5__Y - 5__Y - 0 - 1104 - 4 - TRUE - 32768 - 202 70 28 28 - 222 544 250 572 - - - 5__B - 5__B - 0 - 1105 - 4 - TRUE - 32768 - 232 100 28 28 - 252 574 280 602 - - - 5Sel - 5Sel - 0 - 1111 - 4 - TRUE - 32768 - 119 70 28 28 - 222 461 250 489 - - - 5Srt - 5Srt - 0 - 1110 - 4 - TRUE - 32768 - 155 70 28 28 - 222 497 250 525 - - - 5__X - 5__X - 0 - 1106 - 4 - TRUE - 32768 - 232 40 28 28 - 192 574 220 602 - - - 5__L - 5__L - 0 - 1108 - 4 - TRUE - 32768 - 98 26 28 28 - 178 440 206 468 - - - 5__R - 5__R - 0 - 1109 - 4 - TRUE - 32768 - 176 26 28 28 - 178 518 206 546 - - - 152 342 292 644 - - - 1 - Common - FALSE - 664 298 302 140 - - - _DeF - _DeF - 0 - 826 - 4 - TRUE - 32768 - 48 63 28 28 - 361 712 389 740 - - - ScoT - ScoT - 0 - 829 - 4 - TRUE - 32768 - 190 100 28 28 - 398 854 426 882 - - - __FF - __FF - 0 - 824 - 4 - TRUE - 32768 - 190 26 28 28 - 324 854 352 882 - - - MouR - MouR - 0 - 851 - 4 - TRUE - 32768 - 48 100 28 28 - 398 712 426 740 - - - ScoC - ScoC - 0 - 831 - 4 - TRUE - 32768 - 262 100 28 28 - 398 926 426 954 - - - _SPC - _SPC - 0 - 828 - 4 - TRUE - 32768 - 190 63 28 28 - 361 854 389 882 - - - ScoP - ScoP - 0 - 830 - 4 - TRUE - 32768 - 226 100 28 28 - 398 890 426 918 - - - _Snp - _Snp - 0 - 827 - 4 - TRUE - 32768 - 226 63 28 28 - 361 890 389 918 - - - - MouL - MouL - 0 - 850 - 4 - TRUE - 32768 - 12 100 28 28 - 398 676 426 704 - - - _Frz - _Frz - 0 - 825 - 4 - TRUE - 32768 - 12 63 28 28 - 361 676 389 704 - - - Ofsc - Ofsc - 0 - 832 - 4 - TRUE - 32768 - 154 100 28 28 - 398 818 426 846 - - - __Fn - __Fn - 0 - 833 - 4 - TRUE - 32768 - 12 26 28 28 - 324 676 352 704 - - - _Alt - _Alt - 0 - 834 - 4 - TRUE - 32768 - 48 26 28 28 - 324 712 352 740 - - - __TC - __TC - 0 - 838 - 4 - TRUE - 32768 - 84 26 28 28 - 324 748 352 776 - - - FFUp - FFUp - 0 - 836 - 4 - TRUE - 32768 - 262 26 28 28 - 324 926 352 954 - - - FFDn - FFDn - 0 - 835 - 4 - TRUE - 32768 - 226 26 28 28 - 324 890 352 918 - - - 298 664 438 966 - - - CLRa - 1 - CLRa - Clear All - 21 453 85 20 - 453 21 473 106 - - - - 1 - Player 6 - FALSE - 664 152 302 140 - - - 6_Lf - 6_Lf - 0 - 1202 - 4 - TRUE - 32768 - 12 70 28 28 - 222 676 250 704 - - - 6_Up - 6_Up - 0 - 1200 - 4 - TRUE - 32768 - 42 40 28 28 - 192 706 220 734 - - - 6_Dn - 6_Dn - 0 - 1201 - 4 - TRUE - 32768 - 42 100 28 28 - 252 706 280 734 - - - 6_Rt - 6_Rt - 0 - 1203 - 4 - TRUE - 32768 - 72 70 28 28 - 222 736 250 764 - - - 6__A - 6__A - 0 - 1207 - 4 - TRUE - 32768 - 262 70 28 28 - 222 926 250 954 - - - 6__Y - 6__Y - 0 - 1204 - 4 - TRUE - 32768 - 202 70 28 28 - 222 866 250 894 - - - 6__B - 6__B - 0 - 1205 - 4 - TRUE - 32768 - 232 100 28 28 - 252 896 280 924 - - - 6Sel - 6Sel - 0 - 1211 - 4 - TRUE - 32768 - 119 70 28 28 - 222 783 250 811 - - - 6Srt - 6Srt - 0 - 1210 - 4 - TRUE - 32768 - 155 70 28 28 - 222 819 250 847 - - - 6__X - 6__X - 0 - 1206 - 4 - TRUE - 32768 - 232 40 28 28 - 192 896 220 924 - - - 6__L - 6__L - 0 - 1208 - 4 - TRUE - 32768 - 98 26 28 28 - 178 762 206 790 - - - 6__R - 6__R - 0 - 1209 - 4 - TRUE - 32768 - 176 26 28 28 - 178 840 206 868 - - - 152 664 292 966 - - - 1 - Player 7 - FALSE - 20 298 302 140 - - - 7_Lf - 7_Lf - 0 - 1302 - 4 - TRUE - 32768 - 12 70 28 28 - 368 32 396 60 - - - 7_Up - 7_Up - 0 - 1300 - 4 - TRUE - 32768 - 42 40 28 28 - 338 62 366 90 - - - 7_Dn - 7_Dn - 0 - 1301 - 4 - TRUE - 32768 - 42 100 28 28 - 398 62 426 90 - - - - 7__A - 7__A - 0 - 1307 - 4 - TRUE - 32768 - 262 70 28 28 - 368 282 396 310 - - - 7__Y - 7__Y - 0 - 1304 - 4 - TRUE - 32768 - 202 70 28 28 - 368 222 396 250 - - - 7__B - 7__B - 0 - 1305 - 4 - TRUE - 32768 - 232 100 28 28 - 398 252 426 280 - - - 7Sel - 7Sel - 0 - 1311 - 4 - TRUE - 32768 - 119 70 28 28 - 368 139 396 167 - - - 7Srt - 7Srt - 0 - 1310 - 4 - TRUE - 32768 - 155 70 28 28 - 368 175 396 203 - - - 7__X - 7__X - 0 - 1306 - 4 - TRUE - 32768 - 232 40 28 28 - 338 252 366 280 - - - 7__L - 7__L - 0 - 1308 - 4 - TRUE - 32768 - 98 26 28 28 - 324 118 352 146 - - - - 298 20 438 322 - - - 1 - Player 8 - FALSE - 342 298 302 140 - - - 8_Lf - 8_Lf - 0 - 1402 - 4 - TRUE - 32768 - 12 70 28 28 - 368 354 396 382 - - - 8_Up - 8_Up - 0 - 1400 - 4 - TRUE - 32768 - 42 40 28 28 - 338 384 366 412 - - - 8_Dn - 8_Dn - 0 - 1401 - 4 - TRUE - 32768 - 42 100 28 28 - 398 384 426 412 - - - 8_Rt - 8_Rt - 0 - 1403 - 4 - TRUE - 32768 - 72 70 28 28 - 368 414 396 442 - - - 8__A - 8__A - 0 - 1407 - 4 - TRUE - 32768 - 262 70 28 28 - 368 604 396 632 - - - 8__Y - 8__Y - 0 - 1404 - 4 - TRUE - 32768 - 202 70 28 28 - 368 544 396 572 - - - 8__B - 8__B - 0 - 1405 - 4 - TRUE - 32768 - 232 100 28 28 - 398 574 426 602 - - - - 8Srt - 8Srt - 0 - 1410 - 4 - TRUE - 32768 - 155 70 28 28 - 368 497 396 525 - - - 8__X - 8__X - 0 - 1406 - 4 - TRUE - 32768 - 232 40 28 28 - 338 574 366 602 - - - 8__L - 8__L - 0 - 1408 - 4 - TRUE - 32768 - 98 26 28 28 - 324 440 352 468 - - - - 298 342 438 644 - - - 0 0 491 986 - - 80 40 571 1026 - 0 0 768 1024 - - - - - 0 0 352 246 - - - Playing : - 20 22 61 16 - 22 20 38 81 - - - DONE - 2 - Done - 258 20 74 20 - 20 258 40 332 - - - Tr_i - Tr_i - 18 39 13 14 - 39 18 53 31 - - - Kart - ROMName - 83 22 167 16 - 22 83 38 250 - - - Pane - 36 70 250 130 - 70 36 200 286 - - - rCTL - 2 - 300 70 34 92 - - - Paus - Paus - 2 - 0 - 200 - -1 - 33024 - 2 3 30 20 - 73 302 93 332 - - - HEAD - FALSE - HEAD - 2 - 0 - 201 - -1 - 32768 - 2 29 30 20 - 99 302 119 332 - - - S_EF - S_EF - 2 - 0 - 202 - -1 - 32768 - 2 67 30 20 - 137 302 157 332 - - - 70 300 162 334 - - - bCTL - 2 - 21 208 280 25 - - - bar4 - 3 - bar4 - 0 - 4 - 256 - 62 6 12 12 - 214 83 226 95 - - - - bar9 - 3 - bar9 - 0 - 1 - 256 - 150 6 12 12 - 214 171 226 183 - - - bar3 - 3 - bar3 - 0 - 3 - 256 - 48 6 12 12 - 214 69 226 81 - - - barb - 3 - barb - 0 - 3 - 256 - 178 6 12 12 - 214 199 226 211 - - - bar8 - 3 - bar8 - 0 - 8 - 256 - 118 6 12 12 - 214 139 226 151 - - - bare - 3 - bare - 0 - 6 - 256 - 220 6 12 12 - 214 241 226 253 - - - bar7 - 3 - bar7 - 0 - 7 - 256 - 104 6 12 12 - 214 125 226 137 - - - barf - 3 - barf - 0 - 7 - 256 - 234 6 12 12 - 214 255 226 267 - - - bar6 - 3 - bar6 - 0 - 6 - 256 - 90 6 12 12 - 214 111 226 123 - - - bar2 - 3 - bar2 - 0 - 2 - 256 - 34 6 12 12 - 214 55 226 67 - - - bar0 - 3 - bar0 - 0 - 8 - 256 - 248 6 12 12 - 214 269 226 281 - - - bar5 - 3 - bar5 - 0 - 5 - 256 - 76 6 12 12 - 214 97 226 109 - - - bar1 - 3 - bar1 - 0 - 1 - 256 - 20 6 12 12 - 214 41 226 53 - - - bard - 3 - bard - 0 - 5 - 256 - 206 6 12 12 - 214 227 226 239 - - - bara - 3 - bara - 0 - 2 - 256 - 164 6 12 12 - 214 185 226 197 - - - PILT - 132 - 1835623278 - 2117687422 - 132 4 16 16 - 212 153 228 169 - - - 208 21 233 301 - - - 0 0 246 352 - - - PCTL - 101 - 1 - Read Only - 7 7 23 80 - - - - - - - snd_ - 206 - 5 - - Popup: - - - 20 ms - TRUE - - - 40 ms - TRUE - - - 60 ms - TRUE - - - 80 ms - TRUE - - - 100 ms - TRUE - - - 120 ms - TRUE - - - - 160 ms - TRUE - - - 180 ms - TRUE - - - 200 ms - TRUE - - - - 415 79 127 20 - 121 436 141 563 - - - 5 : - 20 116 19 16 - 116 20 132 39 - - - - 0 0 605 371 - - - tabs - 128 - 21 5 562 346 - - - tabs - 129 - 2 - 0 37 562 309 - - - grap - 2 - Toggles between scaling full screen graphics to the current screen resolution or changing the screen resolution to fit Snes9x's needs. - Switch Monitor Resolution - 18 42 192 18 - 84 39 102 231 - - - grap - 1 - Toggles full screen/windowed mode. Press esc key to hide full screen window and pause the game. - Full Screen Mode - 18 20 192 18 - 62 39 80 231 - - - grap - 3 - Toggles display of the frame rate on/off. - Show Frame Rate - 18 64 192 18 - 106 39 124 231 - - - grap - 5 - Toggles transparency effects on/off. Transparency effect is used in almost all games so this option is just for hack. - Transparency Effects - 18 86 192 18 - 128 39 146 231 - - - grap - 6 - Uses 16,777,216 colors. - Use 32 Bit Color - 326 183 193 18 - 225 347 243 540 - - - grap - 7 - G__7 - Stretches the image to fill the screen in full screen mode. - Stretch Image in Full Screen Mode - 18 205 241 18 - 247 39 265 280 - - - OpenGL Option : - 20 155 111 16 - 197 41 213 152 - - - grap - 9 - 3 - - Popup: - - - Blocky - TRUE - - - TV - TRUE - - - - Blend - TRUE - - - Super Eagle - TRUE - - - 2xSaI - TRUE - - - Super 2xSaI - TRUE - - - EPX - TRUE - - - hq2x - TRUE - - - hq3x - TRUE - - - hq4x - TRUE - - - NTSC Composite - TRUE - - - NTSC S-Video - TRUE - - - NTSC RGB - TRUE - - - NTSC Monochrome - TRUE - - - NTSC+TV Composite - TRUE - - - NTSC+TV S-Video - TRUE - - - NTSC+TV RGB - TRUE - - - NTSC+TV Monochrome - TRUE - - - - 327 19 215 20 - 61 348 81 563 - - - Choose the image scaling filter which is applied to the raw SNES image. - Video Mode : - -1 - 228 21 89 16 - 63 249 79 338 - - - grap - 11 - Synchronizes the render timing to the monitor's vertical refresh rate. - Sync to Vertical Blank - 18 183 241 18 - 225 39 243 280 - - - grap - 10 - When this option is on, the rendering process is separated from the emulation thread (except blocky and smooth modes). - Multitask - 326 64 193 18 - 106 347 124 540 - - - grap - 12 - Keeps the screen height always 239/478, for some games that change screen height frequently. - Keep Overscanned Height - 326 86 193 18 - 128 347 146 540 - - - grap - 13 - G_13 - Adds a warp effect like a CRT-based television. - Use Screen Curvature - 326 205 193 18 - 247 347 265 540 - - - grap - 14 - 2 - 10 - 397 226 144 22 - 268 418 290 562 - - - - 12 131 538 4 - 173 33 177 571 - - - grap - 15 - 2 - 10 - 10000 - 135 226 144 22 - 268 156 290 300 - - - grap - 16 - The aspect ratio of above option: the left is proportional and the right is full width of the monitor. - Aspect Ratio : - 38 228 88 16 - 270 59 286 147 - - - grap - 8 - G_FL - Choose the Core Image filter. - Filter... - 460 160 82 20 - 202 481 222 563 - - - grap - 4 - Applies additional Core Image effect after the image filter is applied. - Use Core Image - 326 161 120 18 - 203 347 221 467 - - - 42 21 351 583 - - - tabs - 130 - 2 - 0 37 562 309 - - - snd_ - 203 - S__3 - Enables stereo sound instead of mono. - Stereo - 18 80 152 18 - 122 39 140 191 - - - snd_ - 204 - Swaps the left and right stereo channels. - Reverse Stereo - 34 102 136 18 - 144 55 162 191 - - - snd_ - 202 - Enables 16-bit playback instead of 8-bit. - 16 Bit Playback - 18 58 152 18 - 100 39 118 191 - - - snd_ - 201 - Tries and ensures all available samples are buffered so there are no overruns. - Synchronize - 18 20 152 18 - 62 39 80 191 - - - snd_ - 210 - Safer from crackling noise, but time-lag becomes more noticeable. - Allow Lag - 414 109 85 18 - 151 435 169 520 - - - snd_ - 205 - 4 - - Popup: - - - 48000 Hz - TRUE - - - 44100 Hz - TRUE - - - 35000 Hz - TRUE - - - 32000 Hz - TRUE - - - 30000 Hz - TRUE - - - 22050 Hz - TRUE - - - 16000 Hz - TRUE - - - 11025 Hz - TRUE - - - 8000 Hz - TRUE - - - - 415 19 127 20 - 61 436 81 563 - - - - snd_ - 211 - 6 - - Popup: - - - 8 ms - TRUE - - - 16 ms - TRUE - - - 32 ms - TRUE - - - 64 ms - TRUE - - - TRUE - TRUE - - - System - TRUE - - - - 415 49 127 20 - 91 436 111 563 - - - The real SNES is 32000 Hz. Any values other than 32000 Hz will cause resampling. - Playback Rate : - -1 - 275 21 130 16 - 63 296 79 426 - - - Make sure this value is smaller than the mix buffer length. - Output Interval : - -1 - 275 51 130 16 - 93 296 109 426 - - - - snd_ - 207 - 2 - 80 - 322 140 219 22 - 182 343 204 562 - - - snd_ - 208 - TRUE - 10 - 2 - 32000 - 31000 - 33000 - 322 170 219 22 - 212 343 234 562 - - - Volume of the whole Snes9x sounds. - Volume : - -1 - 226 142 85 16 - 184 247 200 332 - - - 1 - Hz - -1 - 526 192 16 16 - 234 547 250 563 - - - Adjusts the sound rate through resampling. For every Input Rate samples generated by the SNES, Playback Rate samples will be produced. - Input Rate : - -1 - 226 172 85 16 - 214 247 230 332 - - - snd_ - 209 - 1 - 32000 - -1 - 465 192 59 16 - 234 486 250 545 - - - S_EF - S_EF - Opens 'Sound Effect' dialog. - Effect... - 20 140 100 20 - 182 41 202 141 - - - 42 21 351 583 - - - tabs - 131 - 2 - 0 37 562 309 - - - othe - 401 - 3 - - Popup: - - - Snes9x Folder - TRUE - - - ROM Folder - TRUE - - - Application Support Folder - TRUE - - - TRUE - TRUE - - - None Selected - TRUE - TRUE - - - TRUE - TRUE - - - Other... - TRUE - F_FL - - - - 201 19 222 20 - 61 222 81 444 - - - othe - 402 - TRUE - TRUE - 205 62 73 16 - 104 226 120 299 - - - Choose the folder where Snes9x will look for files. - Save Data in : - -1 - 79 21 112 16 - 63 100 79 212 - - - sec after Modified - -1 - 289 62 116 16 - 104 310 120 426 - - - Updates SRAM file when SRAM contents are modified. This may cause frequent disk access. - Auto Save SRAM : - -1 - 79 62 112 16 - 104 100 120 212 - - - 1 - (0 : Disable) - -1 - 414 64 69 16 - 106 435 122 504 - - - 42 21 351 583 - - - tabs - 132 - 2 - 0 37 562 309 - - - Changes HDMA timing and will 'fix' some games' glitches, but breaks many other games. The default value is 100. - HDMA Timing Hack : - 20 59 133 16 - 101 41 117 174 - - - msc2 - 601 - TRUE - TRUE - 164 59 74 16 - 101 185 117 259 - - - Note : These Hacks Need to Reopen ROM Image to Achieve Effects. - 20 21 456 16 - 63 41 79 497 - - - msc2 - 603 - Turb - 3 - 1 - 15 - 201 219 13 22 - 261 222 283 235 - - - The speed when turbo mode is on. Modify in-game with Fn+T, Fn+Y. - Speed in Turbo Mode : - 20 221 145 16 - 263 41 279 186 - - - msc2 - 604 - 10 - -1 - 173 221 20 16 - 263 194 279 214 - - - 12 158 538 1 - 200 33 201 571 - - - msc2 - 605 - - Popup - - - Auto - TRUE - - - TRUE - TRUE - - - 0 - TRUE - - - 1 - TRUE - - - 2 - TRUE - - - 3 - TRUE - - - 4 - TRUE - - - - 107 185 107 20 - 227 128 247 235 - - - Adjust this value if your Mac is slow. - Frame Skip : - 20 187 79 16 - 229 41 245 120 - - - msc2 - 606 - Allows to write to VRAM outside blank periods. - Allow Invalid VRAM Access - 18 89 223 18 - 131 39 149 262 - - - msc2 - 607 - Applies special hacks for games that can't be emulated correctly. - Apply Specific Game Hacks - 18 111 223 18 - 153 39 171 262 - - - 42 21 351 583 - - - tabs - 133 - 2 - 0 37 562 309 - - - osx_ - 801 - Choose whether open dialog should be shown when Snes9x is launched. - Open Choose ROM Image Dialog at Startup - 18 64 302 18 - 106 39 124 341 - - - osx_ - 802 - Shows time stamps on thumbnails in freeze/defrost screen. - Show Dates and Times in Freese State Selection Screen - 18 86 374 18 - 128 39 146 413 - - - Choose the behavior of Music Box: 'Sound Emulation Only' to only emulate the music system, and 'Whole Emulation' to also emulate the CPU. Music that depends on the CPU running will not sound right without 'Whole Emulation.' - Music Box : - 328 134 76 16 - 176 349 192 425 - - - osx_ - 803 - - - Sound Emulation Only - - - Whole Emulation - - - 326 158 177 39 - 200 347 239 524 - - - osx_ - 804 - Sets 'Turbo' button as a toggle switch. - Toggle Turbo Button - 18 20 207 18 - 62 39 80 246 - - - osx_ - 807 - When this option is on, Snes9x automatically loads the .ips or .ups file and patch the ROM image. - Use IPS / UPS Patch - 326 42 221 18 - 84 347 102 568 - - - osx_ - 808 - Shows messages from Snes9x on the game screen. When off, messages are put in the standard console. - Show Onscreen Information - 18 42 207 18 - 84 39 102 246 - - - osx_ - 809 - 3 - - - Keep on Emulation, Receive All Inputs - - - Keep on Emulation, Reject Any Inputs - - - Pause and Exit from Emulation Loop - - - 18 158 266 59 - 200 39 259 305 - - - - - osx_ - 805 - When this option is on, BS-X ROM is loaded first, then you launch BS games from the menu in BS-X. - Boot Up BS Games from BS-X - 326 64 221 18 - 106 347 124 568 - - - 42 21 351 583 - - - 5 21 351 583 - - - contentResID - 0 - tabEnabled - 1 - tabName - Graphics - userPane - - - - contentResID - 0 - tabEnabled - 1 - tabName - Sound - userPane - - - - contentResID - 0 - tabEnabled - 1 - tabName - File - userPane - - - - contentResID - 0 - tabEnabled - 1 - tabName - Accuracy - userPane - - - - contentResID - 0 - tabEnabled - 1 - tabName - Others - userPane - - - - - - 0 0 371 605 - - - - - - 1 - Value Size : - 11 22 68 16 - 22 253 38 321 - - - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Connect to Server - - 80 40 212 332 - 0 0 768 1024 - - - - - BRes - 1 - BRes - Restore List - 34 57 152 20 - 403 276 423 428 - - - - TRUE - TRUE - - - 0 0 593 251 - - - DFLT - DFLT - Defaults - 20 211 93 20 - 211 20 231 113 - - - 1 - Player 1 - 169 215 48 13 - 215 169 228 217 - - - 1 - Player 2 - 251 215 48 13 - 215 251 228 299 - - - Lgnd - 0.000000 - TRUE - 145 214 16 16 - 214 145 230 161 - - - Lgnd - 1 - 0.000000 - TRUE - 227 214 16 16 - 214 227 230 243 - - - 0 0 251 593 - - - - 1 - Map : - -1 - 20 83 128 13 - 83 20 96 148 - - - - RSto - 1 - RSto - Stored Value - 11 140 86 15 - 140 253 155 339 - - - - - Outp - 1 - output - -2 - 156 272 186 13 - 272 156 285 342 - - - - - Auto Detect - TRUE - - - - - Cle1 - Cle1 - Clear - 507 60 70 20 - 60 507 80 577 - - - - CCTL - 103 - 1 - - Popup: - - - Auto Detect - TRUE - - - - Force PAL - TRUE - - - Force NTSC - TRUE - - - - 31 94 48 204 - - - - - - - 1 - Checksum (header) : - -1 - 20 230 128 13 - 230 20 243 148 - - - CCTL - 107 - 1 - Video System : - -1 - 33 6 46 87 - - - - - Edit - 130 - - - Undo - z - TRUE - undo - - - Redo - Z - TRUE - redo - - - TRUE - TRUE - - - Cut - x - TRUE - cut - - - Copy - c - TRUE - copy - - - Paste - v - TRUE - past - - - Delete - TRUE - clea - - - Select All - a - TRUE - sall - - - - - - - Mode - 1 - Mode - 3 - 3 - - - Hexadecimal - - - Signed Decimal - - - Unsigned Decimal - - - 11 45 117 62 - 45 253 107 370 - - - - - - BAdd - 1 - BAdd - Add to Cheat Entry... - 34 7 152 20 - 353 276 373 428 - - - Multi Tap - TRUE - EIp5 - - - - - - - Configure Controllers... - TRUE - Cpad - - - Snes9x - - _NSAppleMenu - Snes9x - 128 - - - About Snes9x - TRUE - 0 - abou - - - - - - - - - Client... - TRUE - Ncli - - - - - - UI_T - - 1 - 2 - - 2 - 242 0 207 329 - - - Drwr - Drwr - 0 - 3 - Screen - 256 - 127 300 60 18 - 300 369 318 429 - - - BWat - BWat - 0 - 3 - Watch - 512 - 127 268 60 18 - 268 369 286 429 - - - BSea - 1 - BSea - 1 - Search - 109 204 77 20 - 204 351 224 428 - - - - Math - 1 - Math - - Popup: - - - - - TRUE - - - > - TRUE - - - - TRUE - - - < - TRUE - - - - TRUE - - - - 108 115 79 17 - 115 350 132 429 - - - 1 - Address : - 11 270 53 14 - 270 253 284 306 - - - CTxt - 1 - TRUE - TRUE - 111 177 73 13 - 177 353 190 426 - - - BSto - 1 - BSto - Store Current Values - 34 229 152 20 - 229 276 249 428 - - - WTxt - 1 - 000000 - 64 270 48 14 - 270 306 284 354 - - - 1 - Comparison : - 11 117 87 16 - 117 253 133 340 - - - - RThs - 1 - RThs - This Value : - 11 176 81 15 - 176 253 191 334 - - - RLst - 1 - RLst - Last Value - 11 158 73 15 - 158 253 173 326 - - - - Size - 1 - Size - - Popup: - - - 1 Byte - TRUE - - - 2 Bytes - TRUE - - - 3 Bytes - TRUE - - - 4 Bytes - TRUE - - - - 108 20 79 17 - 20 350 37 429 - - - 0 242 329 449 - - - - - Pict - - 1 - 1 - 2 - 2 - - 0 0 512 478 - 0 0 478 512 - - - - - - - - - 0 0 328 168 - - - 1 - Address : - -1 - 16 20 83 13 - 20 16 33 99 - - - AEad - 1 - address - 107 20 96 13 - 20 107 33 203 - - - - 1 - Current Value : - -1 - 16 47 83 13 - 47 16 60 99 - - - - - - SHTc - 1 - SHTc - 2 - Cancel - 157 130 70 20 - 130 157 150 227 - - - 1 - Description : - -1 - 16 101 83 13 - 101 16 114 99 - - - AEde - 1 - TRUE - TRUE - 110 101 195 13 - 101 110 114 305 - - - 0 0 168 328 - - - - ComH - 1 - complement written in header - -2 - 156 251 186 13 - 251 156 264 342 - - - Freeze State - f - TRUE - Ofrz - - - - - PLNM - 3 - 56 92 122 16 - 92 56 108 178 - - - - QCTL - 101 - 1 - Double Size - 9 7 25 90 - - - - - - - - - - - FALSE - FALSE - TRUE - FALSE - TRUE - FALSE - 20 - 51 - 7 - CFDrawer - - 0 0 276 260 - 0 0 260 276 - - 80 40 340 316 - 0 0 768 1024 - - - - - - - Arrange in Front - TRUE - TRUE - 1572864 - frnt - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - 1 - 7 - RecordSMVControl - - - - - 0 0 55 433 - - 80 40 135 473 - 0 0 768 1024 - - - - - - 5P : - 20 116 28 16 - 116 20 132 48 - - - - TRUE - TRUE - - - FALSE - FALSE - TRUE - TRUE - TRUE - FALSE - -1 - 1 - Game Window - - 0 0 512 478 - - - - 0 0 478 512 - - 80 40 558 552 - 0 0 768 1024 - - - - 1 - Type : - -1 - 20 125 128 13 - 125 20 138 148 - - - - - - - Chse - 18 158 16 16 - 158 18 174 34 - - - - Super Scope - TRUE - EIp4 - - - - - - - Pnum - 2 - 52 68 26 16 - 68 52 84 78 - - - Record Movie... - TRUE - MVrc - - - - - - - QCTL - 102 - 1 - Overscan - 9 99 25 168 - - - - Config - - Config - 134 - - - Configure Keyboard... - TRUE - Ckey - - - - TRUE - TRUE - - - Automatic Fire... - TRUE - Caut - - - TRUE - TRUE - - - Controllers Preset - TRUE - - Controllers Preset - 201 - - - #1 - TRUE - CPr1 - - - #2 - TRUE - CPr2 - - - - #4 - TRUE - CPr4 - - - #5 - TRUE - CPr5 - - - - - - - - - Emulation - - Emulation - 131 - - - Run - r - TRUE - Erun - - - TRUE - TRUE - - - Software Reset - TRUE - Esrs - - - Hardware Reset - TRUE - Erst - - - TRUE - TRUE - - - Input Device - TRUE - - Input Device - 202 - - - Pad - TRUE - EIp1 - - - Mouse (Port 1) - TRUE - EIp2 - - - Mouse (Port 2) - TRUE - EIp3 - - - - - - - Justifiers (Two Players) - TRUE - EIp8 - - - - - - - - - Name - 3 - 219 92 118 16 - 92 219 108 337 - - - - - Lice - 1 - licensee - -2 - 156 314 186 13 - 314 156 327 342 - - - - Stat - 2 - 345 68 72 16 - 68 345 84 417 - - - - - 1 - Licensee : - -1 - 20 314 128 13 - 314 20 327 148 - - - Freeze State to... - F - TRUE - 1179648 - Ofrd - - - - - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Core Image Filter Setting - - 0 0 373 81 - - - Filter : - 20 22 44 16 - 22 20 38 64 - - - 12 60 349 1 - 60 12 61 361 - - - 0 0 81 373 - - 80 40 161 413 - 0 0 768 1024 - - - - 1 - Revision : - -1 - 20 293 128 13 - 293 20 306 148 - - - - CRC - 1 - crc32 - -2 - 156 356 186 13 - 356 156 369 342 - - - 0 0 437 192 - - - IP__ - 86 20 118 16 - 20 86 36 204 - - - 1 : - 20 20 19 16 - 20 20 36 39 - - - 2 : - 20 44 19 16 - 44 20 60 39 - - - 3 : - 20 68 19 16 - 68 20 84 39 - - - 4 : - 20 92 19 16 - 92 20 108 39 - - - - IP__ - 1 - 86 44 118 16 - 44 86 60 204 - - - IP__ - 2 - 86 68 118 16 - 68 86 84 204 - - - IP__ - 3 - 86 92 118 16 - 92 86 108 204 - - - IP__ - 4 - 86 116 118 16 - 116 86 132 204 - - - Stat - 345 20 72 16 - 20 345 36 417 - - - Stat - 1 - 345 44 72 16 - 44 345 60 417 - - - - Stat - 3 - 345 92 72 16 - 92 345 108 417 - - - Stat - 4 - 345 116 72 16 - 116 345 132 417 - - - Name - 219 20 118 16 - 20 219 36 337 - - - Name - 1 - 219 44 118 16 - 44 219 60 337 - - - Name - 2 - 219 68 118 16 - 68 219 84 337 - - - - Name - 4 - 219 116 118 16 - 116 219 132 337 - - - OKAY - OKAY - 1 - Play - 347 152 70 20 - 152 347 172 417 - - - CNSL - CNSL - 2 - Cancel - 265 152 70 20 - 152 265 172 335 - - - Pnum - 52 20 26 16 - 20 52 36 78 - - - Pnum - 1 - 52 44 26 16 - 44 52 60 78 - - - - Pnum - 3 - 52 92 26 16 - 92 52 108 78 - - - Pnum - 4 - 52 116 26 16 - 116 52 132 78 - - - - 0 0 192 437 - - - Core Image Filter... - TRUE - Ocif - - - - Epop - - Popup: - - - Apple's Matrix Reverb - TRUE - Revb - - - Apple's Graphic Equalizer - TRUE - GrEQ - - - - 20 234 40 447 - - - LINE - 60 12 61 455 - - - - - - - - - 3 - TRUE - - - - SizC - 1 - calculated rom size - -2 - 156 146 186 13 - 146 156 159 342 - - - - - 0 0 308 242 - - - 3 - COPY - © Copyright 1996-2011 Snes9x developers Snes9x is a Super Nintendo Entertainment System emulator that allows you to play most games designed for the SNES on your PC. Please visit http://www.snes9x.com/ for up-to-the-minute information and help on Snes9x. Nintendo is a trade mark. - 1 - 20 134 268 88 - 134 20 222 288 - - - 132 - 1095782476 - 2117687422 - 122 12 64 64 - 12 122 76 186 - - - VERS - 1 - versionstr - 1 - 51 110 206 16 - 110 51 126 257 - - - NAME - Snes9x - 1 - 62 85 184 18 - 85 62 103 246 - - - 0 0 242 308 - - - - TRUE - TRUE - - - - - Window - - _NSWindowsMenu - Window - - - Minimize - m - TRUE - TRUE - mini - - - Minimize All - m - TRUE - TRUE - 1572864 - mina - - - Zoom - TRUE - zoom - - - - Bring All to Front - TRUE - TRUE - bfrt - - - - - - - - UI_B - - 2 - 2 - - 2 - 242 346 207 95 - - - - BRem - 1 - BRem - Remove from List - 34 32 152 20 - 378 276 398 428 - - - - 346 242 441 449 - - - - - - - - - - - - Clip - 1 - Clip - Copy to Clipboard - 204 384 137 20 - 384 204 404 341 - - - - - - 2P : - 20 44 28 16 - 44 20 60 48 - - - - - - CCTL - 105 - 1 - Memory Type : - -1 - 8 6 21 87 - - - - - - - MPan - 4098 - 85 19 309 22 - - - MNAM - Cart A name - 8 3 290 16 - 22 93 38 383 - - - 19 85 41 394 - - - - TRUE - TRUE - - - Defrost State from... - D - TRUE - 1179648 - Odfd - - - - - - - - - : - 70 62 7 16 - 62 70 78 77 - - - QCTL - 104 - 1 - - Popup: - - - 0 - TRUE - - - 1 - TRUE - - - 2 - TRUE - - - - - 5 - TRUE - - - - 8 258 25 302 - - - - - - Cle0 - Cle0 - Clear - 507 20 70 20 - 20 507 40 577 - - - - - - - - - 1 - SRAM Size : - -1 - 20 188 128 13 - 188 20 201 148 - - - - - - - - - - - - - - - - - PCTL - 102 - 1 - Export to QuickTime Movie at a Time - 7 102 23 319 - - - - - - - - - - - - SWAP - SWAP - Swap - 20 110 70 20 - 110 20 130 90 - - - - - - - - - - - - - - - - - - - - - _NSMainMenu - S9xMenu - - - - File - - File - 129 - - - Open ROM Image... - o - TRUE - open - - - Open Multiple ROM Images... - O - TRUE - 1179648 - Mult - - - Open Recent - TRUE - Frec - - - TRUE - TRUE - - - Close - w - TRUE - clos - - - - ROM Information - i - TRUE - Finf - - - - - - Edit - - - - - - Netplay - - Netplay - 135 - - - Server... - TRUE - Nser - - - - - - - - Option - - Option - 133 - - - - - - - - TRUE - TRUE - - - - Play Movie... - TRUE - MVpl - - - TRUE - TRUE - - - Export to QuickTime Movie... - TRUE - QTmv - - - TRUE - TRUE - - - Save SPC File at Next Note-on - TRUE - Ospc - - - Save SRAM File Now - TRUE - Osrm - - - - - - Music Box - TRUE - Ombx - - - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - ROM Information - - 0 0 362 422 - - - - - 1 - Contents : - -1 - 20 62 128 13 - 62 20 75 148 - - - - 1 - Size (calculated) : - -1 - 20 146 128 13 - 146 20 159 148 - - - 1 - Speed : - -1 - 20 104 128 13 - 104 20 117 148 - - - 1 - Game Code : - -1 - 20 41 128 13 - 41 20 54 148 - - - - 1 - Checksum (calculated) : - -1 - 20 209 128 13 - 209 20 222 148 - - - - 1 - Complement (header) : - -1 - 20 251 128 13 - 251 20 264 148 - - - 1 - Video Output : - -1 - 20 272 128 13 - 272 20 285 148 - - - - 1 - Region : - -1 - 20 335 128 13 - 335 20 348 148 - - - - Name - 1 - name - -2 - 156 20 186 13 - 20 156 33 342 - - - Code - 1 - code - -2 - 156 41 186 13 - 41 156 54 342 - - - - Regi - 1 - region - -2 - 156 335 186 13 - 335 156 348 342 - - - - Vers - 1 - revision - -2 - 156 293 186 13 - 293 156 306 342 - - - Cont - 1 - contents - -2 - 156 62 186 13 - 62 156 75 342 - - - Map - 1 - map - -2 - 156 83 186 13 - 83 156 96 342 - - - Spee - 1 - speed - -2 - 156 104 186 13 - 104 156 117 342 - - - SizH - 1 - rom size written in header - -2 - 156 167 186 13 - 167 156 180 342 - - - - SRAM - 1 - sram size - -2 - 156 188 186 13 - 188 156 201 342 - - - SumH - 1 - checksum written in header - -2 - 156 230 186 13 - 230 156 243 342 - - - - SumC - 1 - calculated checksum - -2 - 156 209 186 13 - 209 156 222 342 - - - - Type - 1 - type - -2 - 156 125 186 13 - 125 156 138 342 - - - 1 - CRC32 : - -1 - 20 356 128 13 - 356 20 369 148 - - - - - 0 0 422 362 - - 80 40 502 402 - 0 0 768 1024 - - - - - - - - - - - - - - - - FALSE - TRUE - TRUE - FALSE - 1 - 7 - Cheat Finder - - 0 0 449 441 - - - Pane - - 1 - 1 - 2 - 2 - - 2 - 20 20 213 401 - 20 20 421 233 - - - - - 0 0 441 449 - - 80 40 521 489 - 0 0 768 1024 - - - - Popup: - - - Auto Detect - TRUE - - - TRUE - TRUE - - - Force no Header - TRUE - - - Force Header - TRUE - - - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - TRUE - FALSE - 11 - 53 - 7 - Add to Entry - - 80 40 248 368 - 0 0 768 1024 - - - CCTL - 104 - 1 - - 31 315 48 425 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Open Multiple ROM Images - - 0 0 597 150 - - - - Slot B - 20 62 42 16 - 62 20 78 62 - - - : - 70 22 7 16 - 22 70 38 77 - - - - Cho0 - Cho0 - Choose... - 407 20 88 20 - 20 407 40 495 - - - Cho1 - Cho1 - Choose... - 407 60 88 20 - 60 407 80 495 - - - - - ok - 1 - OK - 507 110 70 20 - 110 507 130 577 - - - not! - 2 - Cancel - 425 110 70 20 - 110 425 130 495 - - - - MPan - 1 - 4098 - 85 59 309 22 - - - MNAM - 1 - Cart B name - 8 3 290 16 - 62 93 78 383 - - - 59 85 81 394 - - - - 0 0 150 597 - - 80 40 230 637 - 0 0 768 1024 - - - - - - - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Keyboard Layout - - 80 40 331 633 - 0 0 768 1024 - - - - - - - - Popup: - - - - TRUE - TRUE - - - Force LoROM - TRUE - - - Force HiROM - TRUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - CCTL - 108 - 1 - Header : - -1 - 33 214 46 308 - - - PLNM - 4 - 56 116 122 16 - 116 56 132 178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLNM - 1 - 56 44 122 16 - 44 56 60 178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SfUI - 2 - - - - - Choose the Effect to Configure : - 22 20 38 224 - - - - 0 0 99 467 - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - 1 - 7 - PlaySMVControl - - - - PANE - 1000 - 2 - - - - - 0 0 32 327 - - - 0 0 30 327 - - 80 40 110 367 - 0 0 768 1024 - - - - - - - - - - - - - - - - - - - - - - - 3P : - 20 68 28 16 - 68 20 84 48 - - - - - - - - - - - - - - - - - - - CCTL - 101 - 1 - - 6 94 23 204 - - - - - PLNM - 56 20 122 16 - 20 56 36 178 - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Extra Options - - 80 40 296 297 - 0 0 768 1024 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Music Box - - 80 40 326 392 - 0 0 768 1024 - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Preferences - - 80 39 451 644 - 0 0 768 1024 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - 1 - 7 - SoundEffectUI - - - - - 0 0 99 467 - - 80 40 179 507 - 0 0 768 1024 - - - - - - - - - - - - - - - - - - - - - FALSE - TRUE - TRUE - FALSE - 1 - 7 - Cheat Entry - - 80 40 352 595 - 0 0 768 1024 - 555 - 272 - - - - - - - - - - - - - QCTL - 105 - 1 - Frame Skip : - -1 - 10 184 23 253 - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - - - 80 40 322 348 - 0 0 768 1024 - - - - - - - - - - - - - - - - - - - PANE - 1000 - 2 - - - - - - - - 0 0 35 433 - - - 0 0 33 433 - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - 1 - 7 - QTMovControl - - 80 40 113 473 - 0 0 768 1024 - - - - - - - - - - - - - - - - - - - PANE - 1000 - 2 - - - - CCTL - 106 - 1 - Interleave Mode : - -1 - 8 214 21 308 - - - - - - - - - 0 0 56 433 - - - 0 0 54 433 - - - - - - - - - - - - - - - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - 1 - 7 - OpenROMControl - - 80 40 134 473 - 0 0 768 1024 - - - ok - 1 - OK - 108 152 70 20 - 152 108 172 178 - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - 1 - 7 - Clients List - - 80 40 272 477 - 0 0 768 1024 - - - PLNM - 2 - 56 68 122 16 - 68 56 84 178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4P : - 20 92 28 16 - 92 20 108 48 - - - - - - - - - - - - - - - 0 0 198 192 - - - - - - - - - - - - - - 0 0 192 198 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - TRUE - FALSE - 11 - 53 - 7 - Players List - - 80 40 272 238 - 0 0 768 1024 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - About - - AutoFire - - CFAddEntry - - CFDrawer - - CIFilter - - CheatEntry - - CheatFinder - - ClientList - - Connect - - Controllers - - ExtraOptions - - File's Owner - - GameWindow - - Keyboard - - MenuBar - - MultiCart - - MusicBox - - OpenROM - - PlaySMV - - PlayerList - - Preferences - - QTMovie - - RecordSMV - - RomInfo - - SoundEffect - - - IBCarbonFramework - 2296 - diff --git a/macosx/English.lproj/Snes9x.xib b/macosx/English.lproj/Snes9x.xib new file mode 100644 index 00000000..ddadc9d3 --- /dev/null +++ b/macosx/English.lproj/Snes9x.xib @@ -0,0 +1,42679 @@ + + + + 1040 + 10J869 + 851 + 1038.35 + 461.00 + + YES + + YES + + + YES + + + + YES + + + + YES + + + YES + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Automatic Fire + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{20, 6}, {310, 148}} + + + + + + + + + + Set whether automatic fire is enabled for each controller button. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Enable Automatic Fire + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{350, 6}, {310, 148}} + + + + + + + + + + Set whether pressing 'Alt' in conjunction with a controller button in-game toggles its automatic fire on/off. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Allow 'Alt' to Toggle Enable/Disable Automatic Fire + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{20, 164}, {310, 148}} + + + + + + + + + + Set whether, when automatic fire is enabled, 'TC' must also be held down to activate automatic fire. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Automatic Fire is Active Only While 'TC' is Pressed + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{350, 164}, {310, 148}} + + + + + + + + + + Set whether a button's input is inverted - that is, Snes9x acts as though the button is pressed if and only if it is not pressed. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Button Input is Inverted + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{13, 11}, {221, 31}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + 256 + {{242, 22}, {19, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 10 + + + + + + + + 256 + {{265, 22}, {29, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + / sec + + + + + + + {{0, 14}, {310, 56}} + + + + {{20, 322}, {310, 70}} + + + + + + + + + + Set the number of presses per second that an automatic fire button receives. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Automatic Fire Speed + + + + + + + + + + + + 256 + {{573, 368}, {93, 32}} + + + + + + + + + + Restores the default settings. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Defaults + + + {{8, 36}, {680, 412}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {{13, 6}, {697, 456}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + YES + + 0 + YES + + + Player 1 + + + + + 0 + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{350, 6}, {310, 148}} + + + + + + + + + + Set whether pressing 'Alt' in conjunction with a controller button in-game toggles its automatic fire on/off. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Allow 'Alt' to Toggle Enable/Disable Automatic Fire + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{20, 6}, {310, 148}} + + + + + + + + + + Set whether automatic fire is enabled for each controller button. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Enable Automatic Fire + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{20, 164}, {310, 148}} + + + + + + + + + + Set whether, when automatic fire is enabled, 'TC' must also be held down to activate automatic fire. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Automatic Fire is Active Only While 'TC' is Pressed + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{16, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{76, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{266, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{206, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 16}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{123, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{159, 46}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{236, 76}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{102, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{180, 90}, {28, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {310, 134}} + + + + {{350, 164}, {310, 148}} + + + + + + + + + + Set whether a button's input is inverted - that is, Snes9x acts as though the button is pressed if and only if it is not pressed. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Button Input is Inverted + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{13, 11}, {221, 31}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + 256 + {{242, 22}, {19, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 10 + + + + + + + + 256 + {{265, 22}, {29, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + / sec + + + + + + + {{0, 14}, {310, 56}} + + + + {{20, 322}, {310, 70}} + + + + + + + + + + Set the number of presses per second that an automatic fire button receives. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Automatic Fire Speed + + + + + + + + + + + + 256 + {{573, 368}, {93, 32}} + + + + + + + + + + Restores the default settings. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Defaults + + + {{8, 36}, {680, 412}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Player 2 + + + + + + + + {723, 472} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {723, 472}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Configure Controllers + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{20, 6}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 1 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{342, 6}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 2 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{664, 6}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 3 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{20, 152}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 4 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{342, 152}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 5 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{46, 46}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{188, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{188, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{188, 46}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{224, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{224, 46}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 46}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{10, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{10, 46}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{152, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{10, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{46, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{82, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{224, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{664, 298}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Common + + + + + + + + + + + + 256 + {{15, 450}, {97, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Clear All + + + + 256 + {{130, 456}, {95, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Preset #n + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{664, 152}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 6 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{20, 298}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 7 + + + + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{10, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{40, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{70, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{260, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{200, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 9}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{117, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{153, 39}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{230, 69}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{96, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + 256 + {{174, 83}, {32, 33}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + {{0, 14}, {302, 126}} + + + + {{342, 298}, {302, 140}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 8 + + + + + + + + + + + {986, 491} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {986, 491}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Connect to Server + + + 256 + + YES + + + 256 + {{90, 16}, {186, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{104, 88}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Cancel + + + + 256 + {{186, 88}, {92, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Connect + + + + 256 + {{90, 46}, {186, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{20, 23}, {63, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Server IP : + + + + + + + + 256 + {{20, 53}, {63, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Name : + + + + + + + + 256 + {{18, 98}, {16, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {292, 132} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {292, 132}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFDrawer + + + 256 + {276, 260} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {276, 260}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RecordSMVControl + + + 256 + + YES + + + 256 + + YES + + + 256 + {{7, 8}, {103, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Players to Record : + + + + + + + + 256 + {{7, 33}, {60, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Comment : + + + + + + + + 256 + {{70, 26}, {359, 27}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{114, 7}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + 1 + + + + 256 + {{152, 7}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + 2 + + + + 256 + {{190, 7}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + 3 + + + + 256 + {{228, 7}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + 4 + + + + 256 + {{266, 7}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + 5 + + + + 256 + {{358, 7}, {48, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Reset + + + {433, 57} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {433, 55} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {433, 55}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Game Window + + + 256 + + YES + + + 256 + {512, 478} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {512, 478} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {512, 478}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Core Image Filter Setting + + + 256 + + YES + + + 256 + {{20, 22}, {44, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Filter : + + + + + + + + 256 + {{12, 60}, {349, 1}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {373, 81} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {373, 81}} + {{0, 0}, {1024, 768}} + + + YES + + + + S9xMenu + + YES + + + Snes9x + + 1048576 + 2147483647 + + NSMenuCheckmark + 1623195648 + + + NSMenuMixedState + 1623195648 + + submenuAction: + + Snes9x + + YES + + + About Snes9x + + 2147483647 + + + About Snes9x + + + + + + + + + + + + + + + + + + + + + + _NSAppleMenu + Snes9x + + + + + + + + Snes9x + + + + + + + + + + + + + + + + + + + + + + + File + + 1048576 + 2147483647 + + + submenuAction: + + File + + YES + + + Open ROM Image... + o + 1048576 + 2147483647 + + + Open ROM Image... + o + + + + + + + + + + + + + + + + + + + + + + Open Multiple ROM Images... + O + 1179648 + 2147483647 + + + Open Multiple ROM Images... + O + + + + + + + + + + + + + + + + + + + + + + Open Recent + + 1048576 + 2147483647 + + + Open Recent + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Close + w + 1048576 + 2147483647 + + + Close + w + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + ROM Information + i + 1048576 + 2147483647 + + + ROM Information + i + + + + + + + + + + + + + + + + + + + + + File + + + + + + + + File + + + + + + + + + + + + + + + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + Edit + + YES + + + Undo + z + 1048576 + 2147483647 + + + Undo + z + + + + + + + + + + + + + + + + + + + + + + Redo + Z + 1048576 + 2147483647 + + + Redo + Z + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Cut + x + 1048576 + 2147483647 + + + Cut + x + + + + + + + + + + + + + + + + + + + + + + Copy + c + 1048576 + 2147483647 + + + Copy + c + + + + + + + + + + + + + + + + + + + + + + Paste + v + 1048576 + 2147483647 + + + Paste + v + + + + + + + + + + + + + + + + + + + + + + Delete + + 1048576 + 2147483647 + + + Delete + + + + + + + + + + + + + + + + + + + + + + + Select All + a + 1048576 + 2147483647 + + + Select All + a + + + + + + + + + + + + + + + + + + + + + Edit + + + + + + + + Edit + + + + + + + + + + + + + + + + + + + + + + + Emulation + + 1048576 + 2147483647 + + + submenuAction: + + Emulation + + YES + + + Run + r + 1048576 + 2147483647 + + + Run + r + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Software Reset + + 1048576 + 2147483647 + + + Software Reset + + + + + + + + + + + + + + + + + + + + + + + Hardware Reset + + 1048576 + 2147483647 + + + Hardware Reset + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Input Device + + 1048576 + 2147483647 + + + submenuAction: + + Input Device + + YES + + + Pad + + 1048576 + 2147483647 + + + Pad + + + + + + + + + + + + + + + + + + + + + + + Mouse (Port 1) + + 1048576 + 2147483647 + + + Mouse (Port 1) + + + + + + + + + + + + + + + + + + + + + + + Mouse (Port 2) + + 1048576 + 2147483647 + + + Mouse (Port 2) + + + + + + + + + + + + + + + + + + + + + + + Super Scope + + 1048576 + 2147483647 + + + Super Scope + + + + + + + + + + + + + + + + + + + + + + + Multi Tap + + 1048576 + 2147483647 + + + Multi Tap + + + + + + + + + + + + + + + + + + + + + + + Multi Taps (Both Ports) + + 1048576 + 2147483647 + + + Multi Taps (Both Ports) + + + + + + + + + + + + + + + + + + + + + + + Justifier + + 1048576 + 2147483647 + + + Justifier + + + + + + + + + + + + + + + + + + + + + + + Justifiers (Two Players) + + 1048576 + 2147483647 + + + Justifiers (Two Players) + + + + + + + + + + + + + + + + + + + + + + Input Device + + + + + + + + Input Device + + + + + + + + + + + + + + + + + + + + + + Emulation + + + + + + + + Emulation + + + + + + + + + + + + + + + + + + + + + + + Config + + 1048576 + 2147483647 + + + submenuAction: + + Config + + YES + + + Configure Keyboard... + + 1048576 + 2147483647 + + + Configure Keyboard... + + + + + + + + + + + + + + + + + + + + + + + Configure Controllers... + + 1048576 + 2147483647 + + + Configure Controllers... + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Automatic Fire... + + 1048576 + 2147483647 + + + Automatic Fire... + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Controllers Preset + + 1048576 + 2147483647 + + + submenuAction: + + Controllers Preset + + YES + + + #1 + + 1048576 + 2147483647 + + + #1 + + + + + + + + + + + + + + + + + + + + + + + #2 + + 1048576 + 2147483647 + + + #2 + + + + + + + + + + + + + + + + + + + + + + + #3 + + 1048576 + 2147483647 + + + #3 + + + + + + + + + + + + + + + + + + + + + + + #4 + + 1048576 + 2147483647 + + + #4 + + + + + + + + + + + + + + + + + + + + + + + #5 + + 1048576 + 2147483647 + + + #5 + + + + + + + + + + + + + + + + + + + + + + Controllers Preset + + + + + + + + Controllers Preset + + + + + + + + + + + + + + + + + + + + + + Config + + + + + + + + Config + + + + + + + + + + + + + + + + + + + + + + + Netplay + + 1048576 + 2147483647 + + + submenuAction: + + Netplay + + YES + + + Server... + + 1048576 + 2147483647 + + + Server... + + + + + + + + + + + + + + + + + + + + + + + Client... + + 1048576 + 2147483647 + + + Client... + + + + + + + + + + + + + + + + + + + + + + Netplay + + + + + + + + Netplay + + + + + + + + + + + + + + + + + + + + + + + Cheat + + 1048576 + 2147483647 + + + submenuAction: + + Cheat + + YES + + + Apply Cheats + + 1048576 + 2147483647 + + + Apply Cheats + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Cheat Entry... + + 1048576 + 2147483647 + + + Cheat Entry... + + + + + + + + + + + + + + + + + + + + + + + Cheat Finder... + + 1048576 + 2147483647 + + + Cheat Finder... + + + + + + + + + + + + + + + + + + + + + + Cheat + + + + + + + + Cheat + + + + + + + + + + + + + + + + + + + + + + + Option + + 1048576 + 2147483647 + + + submenuAction: + + Option + + YES + + + Freeze State + f + 1048576 + 2147483647 + + + Freeze State + f + + + + + + + + + + + + + + + + + + + + + + Defrost State + d + 1048576 + 2147483647 + + + Defrost State + d + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Freeze State to... + F + 1179648 + 2147483647 + + + Freeze State to... + F + + + + + + + + + + + + + + + + + + + + + + Defrost State from... + D + 1179648 + 2147483647 + + + Defrost State from... + D + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Record Movie... + + 1048576 + 2147483647 + + + Record Movie... + + + + + + + + + + + + + + + + + + + + + + + Play Movie... + + 1048576 + 2147483647 + + + Play Movie... + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Export to QuickTime Movie... + + 1048576 + 2147483647 + + + Export to QuickTime Movie... + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Save SPC File at Next Note-on + + 1048576 + 2147483647 + + + Save SPC File at Next Note-on + + + + + + + + + + + + + + + + + + + + + + + Save SRAM File Now + + 1048576 + 2147483647 + + + Save SRAM File Now + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Core Image Filter... + + 1048576 + 2147483647 + + + Core Image Filter... + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Music Box + + 1048576 + 2147483647 + + + Music Box + + + + + + + + + + + + + + + + + + + + + + Option + + + + + + + + Option + + + + + + + + + + + + + + + + + + + + + + + Window + + 1048576 + 2147483647 + + + submenuAction: + + Window + + YES + + + Minimize + m + 1048576 + 2147483647 + + + Minimize + m + + + + + + + + + + + + + + + + + + + + + + Minimize All + m + 1572864 + 2147483647 + + + Minimize All + m + + + + + + + + + + + + + + + + + + + + + + Zoom + + 1048576 + 2147483647 + + + Zoom + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + Bring All to Front + + + + + + + + + + + + + + + + + + + + + + + Arrange in Front + + 1572864 + 2147483647 + + + Arrange in Front + + + + + + + + + + + + + + + + + + + + + + _NSWindowsMenu + Window + + + + + + + + Window + + + + + + + + + + + + + + + + + + + + + + _NSMainMenu + S9xMenu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ROM Information + + + 256 + + YES + + + 256 + {{20, 20}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Cart Name : + + + + + + + + 256 + {{20, 314}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Licensee : + + + + + + + + 256 + {{20, 62}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Contents : + + + + + + + + 256 + {{20, 167}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Size (header) : + + + + + + + + 256 + {{20, 146}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Size (calculated) : + + + + + + + + 256 + {{20, 104}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Speed : + + + + + + + + 256 + {{20, 41}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Game Code : + + + + + + + + 256 + {{20, 188}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + SRAM Size : + + + + + + + + 256 + {{20, 209}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Checksum (calculated) : + + + + + + + + 256 + {{20, 230}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Checksum (header) : + + + + + + + + 256 + {{20, 251}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Complement (header) : + + + + + + + + 256 + {{20, 272}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Video Output : + + + + + + + + 256 + {{20, 293}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Revision : + + + + + + + + 256 + {{20, 335}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Region : + + + + + + + + 256 + {{20, 83}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Map : + + + + + + + + 256 + {{156, 20}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + name + + + + + + + + 256 + {{156, 41}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + code + + + + + + + + 256 + {{156, 314}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + licensee + + + + + + + + 256 + {{156, 335}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + region + + + + + + + + 256 + {{156, 272}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + output + + + + + + + + 256 + {{156, 293}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + revision + + + + + + + + 256 + {{156, 62}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + contents + + + + + + + + 256 + {{156, 83}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + map + + + + + + + + 256 + {{156, 104}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + speed + + + + + + + + 256 + {{156, 167}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + rom size written in header + + + + + + + + 256 + {{156, 146}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + calculated rom size + + + + + + + + 256 + {{156, 188}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + sram size + + + + + + + + 256 + {{156, 230}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + checksum written in header + + + + + + + + 256 + {{156, 251}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + complement written in header + + + + + + + + 256 + {{156, 209}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + calculated checksum + + + + + + + + 256 + {{20, 125}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Type : + + + + + + + + 256 + {{156, 125}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + type + + + + + + + + 256 + {{20, 356}, {128, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + CRC32 : + + + + + + + + 256 + {{156, 356}, {186, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + crc32 + + + + + + + + 256 + {{198, 381}, {149, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Copy to Clipboard + + + {362, 422} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {362, 422}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cheat Finder + + + 256 + + YES + + + 256 + {{20, 20}, {213, 401}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + 256 + + YES + + + 256 + {{127, 300}, {60, 18}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + Screen + + + + + 256 + {{127, 268}, {60, 18}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + Watch + + + + + 256 + {{103, 201}, {89, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Search + + + + 256 + {{11, 45}, {117, 62}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + YES + + Hexadecimal + + + Signed Decimal + + + Unsigned Decimal + + + + + + 256 + {{105, 114}, {85, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + = + + 1048576 + 2147483647 + + + = + + + + + + + + + + + + + + + + + + + + + + + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + > + + 1048576 + 2147483647 + + + > + + + + + + + + + + + + + + + + + + + + + + + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + < + + 1048576 + 2147483647 + + + < + + + + + + + + + + + + + + + + + + + + + + + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{11, 270}, {53, 14}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Address : + + + + + + + + 256 + {{104, 170}, {87, 27}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{28, 226}, {164, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Store Current Values + + + + 256 + {{64, 270}, {48, 14}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 000000 + + + + + + + + 256 + {{11, 117}, {87, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Comparison : + + + + + + + + 256 + {{11, 140}, {86, 15}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Stored Value + + + + 256 + {{11, 176}, {81, 15}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + This Value : + + + + 256 + {{11, 158}, {73, 15}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Last Value + + + + 256 + {{11, 22}, {68, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Value Size : + + + + + + + + 256 + {{105, 19}, {85, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + 1 Byte + + 1048576 + 2147483647 + + + 1 Byte + + + + + + + + + + + + + + + + + + + + + + + 2 Bytes + + 1048576 + 2147483647 + + + 2 Bytes + + + + + + + + + + + + + + + + + + + + + + + 3 Bytes + + 1048576 + 2147483647 + + + 3 Bytes + + + + + + + + + + + + + + + + + + + + + + + 4 Bytes + + 1048576 + 2147483647 + + + 4 Bytes + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + {{242, 0}, {207, 329}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + 256 + + YES + + + 256 + {{28, 4}, {164, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Add to Cheat Entry... + + + + 256 + {{28, 29}, {164, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Remove from List + + + + 256 + {{28, 54}, {164, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Restore List + + + {{242, 346}, {207, 95}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {449, 441} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {449, 441}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Add to Entry + + + 256 + + YES + + + 256 + {{16, 20}, {83, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Address : + + + + + + + + 256 + {{107, 20}, {96, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + address + + + + + + + + 256 + {{103, 67}, {104, 27}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{16, 47}, {83, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Current Value : + + + + + + + + 256 + {{16, 74}, {83, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Cheat Value : + + + + + + + + 256 + {{107, 47}, {96, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + current value + + + + + + + + 256 + {{231, 127}, {82, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Add + + + + 256 + {{151, 127}, {82, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Cancel + + + + 256 + {{16, 101}, {83, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Description : + + + + + + + + 256 + {{103, 94}, {209, 27}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + {328, 168} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {328, 168}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Open Multiple ROM Images + + + 256 + + YES + + + 256 + {{20, 22}, {42, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Slot A + + + + + + + + 256 + {{20, 62}, {42, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Slot B + + + + + + + + 256 + {{70, 22}, {7, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + : + + + + + + + + 256 + {{70, 62}, {7, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + : + + + + + + + + 256 + {{401, 16}, {100, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Choose... + + + + 256 + {{401, 56}, {100, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Choose... + + + + 256 + {{501, 16}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Clear + + + + 256 + {{501, 56}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Clear + + + + 256 + {{501, 106}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + OK + + + + 256 + {{419, 106}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Cancel + + + + 256 + + YES + + + 256 + {{8, 3}, {290, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Cart A name + + + + + + + {{85, 19}, {309, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + 256 + + YES + + + 256 + {{8, 3}, {290, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Cart B name + + + + + + + {{85, 59}, {309, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + 256 + {{14, 106}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Swap + + + {597, 150} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {597, 150}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Keyboard Layout + + + 256 + + YES + + + 256 + {{14, 207}, {105, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Defaults + + + + 256 + {{169, 215}, {48, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 1 + + + + + + + + 256 + {{251, 215}, {48, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Player 2 + + + + + + + + 256 + {{145, 214}, {16, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + 256 + {{227, 214}, {16, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + {593, 251} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {593, 251}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PlaySMVControl + + + 256 + + YES + + + 256 + + YES + + + 256 + {{7, 7}, {73, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Read Only + + + + 256 + {{102, 7}, {217, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Export to QuickTime Movie at a Time + + + {327, 32} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {327, 30} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {327, 30}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Extra Options + + + 256 + + YES + + + 256 + {{18, 20}, {133, 18}} + + + + + + + + + + All frames are drawn without adjusting times. Make sure 'Synchronize' in 'Sound' tab in 'Preferences' dialog is turned off. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Benchmark Test + + + + 256 + {{34, 104}, {203, 18}} + + + + + + + + + + GL_TEXTURE_2D is used even if GL_TEXTURE_RECTANGLE_EXT is available. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Don't Use Rectangle Texture + + + + 256 + {{34, 148}, {203, 18}} + + + + + + + + + + Sets GL_TEXTURE_PRIORITY to 0.0. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + AGP Texturing + + + + 256 + {{36, 178}, {90, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Storage Hint : + + + + + + + + 256 + {{34, 126}, {203, 18}} + + + + + + + + + + Sets GL_STORAGE_SHARED_APPLE to 1. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Client Stroage + + + + 256 + {{132, 174}, {108, 26}} + + + + + + + + + + Sets GL_TEXTURE_STORAGE_HINT_APPLE. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Private + + 1048576 + 2147483647 + + + Private + + + + + + + + + + + + + + + + + + + + + + + Cached + + 1048576 + 2147483647 + + + Cached + + + + + + + + + + + + + + + + + + + + + + + Shared + + 1048576 + 2147483647 + + + Shared + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{20, 80}, {131, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + OpenGL Settings : + + + + + + + + 256 + {{12, 58}, {233, 1}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {257, 216} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {257, 216}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Preferences + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 256 + {{18, 42}, {192, 18}} + + + + + + + + + + Toggles between scaling full screen graphics to the current screen resolution or changing the screen resolution to fit Snes9x's needs. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Switch Monitor Resolution + + + + 256 + {{18, 20}, {192, 18}} + + + + + + + + + + Toggles full screen/windowed mode. Press esc key to hide full screen window and pause the game. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Full Screen Mode + + + + 256 + {{18, 64}, {192, 18}} + + + + + + + + + + Toggles display of the frame rate on/off. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Show Frame Rate + + + + 256 + {{18, 86}, {192, 18}} + + + + + + + + + + Toggles transparency effects on/off. Transparency effect is used in almost all games so this option is just for hack. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Transparency Effects + + + + 256 + {{326, 183}, {193, 18}} + + + + + + + + + + Uses 16,777,216 colors. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Use 32 Bit Color + + + + 256 + {{18, 205}, {241, 18}} + + + + + + + + + + Stretches the image to fill the screen in full screen mode. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Stretch Image in Full Screen Mode + + + + 256 + {{20, 155}, {111, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + OpenGL Option : + + + + + + + + 256 + {{325, 17}, {220, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Blocky + + 1048576 + 2147483647 + + + Blocky + + + + + + + + + + + + + + + + + + + + + + + TV + + 1048576 + 2147483647 + + + TV + + + + + + + + + + + + + + + + + + + + + + + Smooth + + 1048576 + 2147483647 + + + Smooth + + + + + + + + + + + + + + + + + + + + + + + Blend + + 1048576 + 2147483647 + + + Blend + + + + + + + + + + + + + + + + + + + + + + + Super Eagle + + 1048576 + 2147483647 + + + Super Eagle + + + + + + + + + + + + + + + + + + + + + + + 2xSaI + + 1048576 + 2147483647 + + + 2xSaI + + + + + + + + + + + + + + + + + + + + + + + Super 2xSaI + + 1048576 + 2147483647 + + + Super 2xSaI + + + + + + + + + + + + + + + + + + + + + + + EPX + + 1048576 + 2147483647 + + + EPX + + + + + + + + + + + + + + + + + + + + + + + hq2x + + 1048576 + 2147483647 + + + hq2x + + + + + + + + + + + + + + + + + + + + + + + hq3x + + 1048576 + 2147483647 + + + hq3x + + + + + + + + + + + + + + + + + + + + + + + hq4x + + 1048576 + 2147483647 + + + hq4x + + + + + + + + + + + + + + + + + + + + + + + NTSC Composite + + 1048576 + 2147483647 + + + NTSC Composite + + + + + + + + + + + + + + + + + + + + + + + NTSC S-Video + + 1048576 + 2147483647 + + + NTSC S-Video + + + + + + + + + + + + + + + + + + + + + + + NTSC RGB + + 1048576 + 2147483647 + + + NTSC RGB + + + + + + + + + + + + + + + + + + + + + + + NTSC Monochrome + + 1048576 + 2147483647 + + + NTSC Monochrome + + + + + + + + + + + + + + + + + + + + + + + NTSC+TV Composite + + 1048576 + 2147483647 + + + NTSC+TV Composite + + + + + + + + + + + + + + + + + + + + + + + NTSC+TV S-Video + + 1048576 + 2147483647 + + + NTSC+TV S-Video + + + + + + + + + + + + + + + + + + + + + + + NTSC+TV RGB + + 1048576 + 2147483647 + + + NTSC+TV RGB + + + + + + + + + + + + + + + + + + + + + + + NTSC+TV Monochrome + + 1048576 + 2147483647 + + + NTSC+TV Monochrome + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{228, 21}, {89, 16}} + + + + + + + + + + Choose the image scaling filter which is applied to the raw SNES image. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Video Mode : + + + + + + + + 256 + {{18, 183}, {241, 18}} + + + + + + + + + + Synchronizes the render timing to the monitor's vertical refresh rate. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Sync to Vertical Blank + + + + 256 + {{326, 64}, {193, 18}} + + + + + + + + + + When this option is on, the rendering process is separated from the emulation thread (except blocky and smooth modes). + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Multitask + + + + 256 + {{326, 86}, {193, 18}} + + + + + + + + + + Keeps the screen height always 239/478, for some games that change screen height frequently. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Keep Overscanned Height + + + + 256 + {{326, 205}, {193, 18}} + + + + + + + + + + Adds a warp effect like a CRT-based television. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Use Screen Curvature + + + + 256 + {{394, 226}, {150, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + 256 + {{345, 228}, {45, 16}} + + + + + + + + + + The degree of curvature. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Warp : + + + + + + + + 256 + {{12, 131}, {538, 4}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + 256 + {{132, 226}, {150, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + 256 + {{38, 228}, {88, 16}} + + + + + + + + + + The aspect ratio of above option: the left is proportional and the right is full width of the monitor. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Aspect Ratio : + + + + + + + + 256 + {{454, 156}, {94, 32}} + + + + + + + + + + Choose the Core Image filter. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Filter... + + + + 256 + {{326, 161}, {120, 18}} + + + + + + + + + + Applies additional Core Image effect after the image filter is applied. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Use Core Image + + + {{8, 36}, {562, 309}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {{13, 6}, {579, 353}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + YES + + 0 + YES + + + Graphics + + + + + 0 + YES + + + 256 + + YES + + + 256 + {{18, 80}, {152, 18}} + + + + + + + + + + Enables stereo sound instead of mono. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Stereo + + + + 256 + {{34, 102}, {136, 18}} + + + + + + + + + + Swaps the left and right stereo channels. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Reverse Stereo + + + + 256 + {{18, 58}, {152, 18}} + + + + + + + + + + Enables 16-bit playback instead of 8-bit. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + 16 Bit Playback + + + + 256 + {{18, 20}, {152, 18}} + + + + + + + + + + Tries and ensures all available samples are buffered so there are no overruns. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Synchronize + + + + 256 + {{414, 109}, {85, 18}} + + + + + + + + + + Safer from crackling noise, but time-lag becomes more noticeable. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Allow Lag + + + + 256 + {{413, 17}, {132, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + 48000 Hz + + 1048576 + 2147483647 + + + 48000 Hz + + + + + + + + + + + + + + + + + + + + + + + 44100 Hz + + 1048576 + 2147483647 + + + 44100 Hz + + + + + + + + + + + + + + + + + + + + + + + 35000 Hz + + 1048576 + 2147483647 + + + 35000 Hz + + + + + + + + + + + + + + + + + + + + + + + 32000 Hz + + 1048576 + 2147483647 + + + 32000 Hz + + + + + + + + + + + + + + + + + + + + + + + 30000 Hz + + 1048576 + 2147483647 + + + 30000 Hz + + + + + + + + + + + + + + + + + + + + + + + 22050 Hz + + 1048576 + 2147483647 + + + 22050 Hz + + + + + + + + + + + + + + + + + + + + + + + 16000 Hz + + 1048576 + 2147483647 + + + 16000 Hz + + + + + + + + + + + + + + + + + + + + + + + 11025 Hz + + 1048576 + 2147483647 + + + 11025 Hz + + + + + + + + + + + + + + + + + + + + + + + 8000 Hz + + 1048576 + 2147483647 + + + 8000 Hz + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{413, 77}, {132, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + 20 ms + + 1048576 + 2147483647 + + + 20 ms + + + + + + + + + + + + + + + + + + + + + + + 40 ms + + 1048576 + 2147483647 + + + 40 ms + + + + + + + + + + + + + + + + + + + + + + + 60 ms + + 1048576 + 2147483647 + + + 60 ms + + + + + + + + + + + + + + + + + + + + + + + 80 ms + + 1048576 + 2147483647 + + + 80 ms + + + + + + + + + + + + + + + + + + + + + + + 100 ms + + 1048576 + 2147483647 + + + 100 ms + + + + + + + + + + + + + + + + + + + + + + + 120 ms + + 1048576 + 2147483647 + + + 120 ms + + + + + + + + + + + + + + + + + + + + + + + 140 ms + + 1048576 + 2147483647 + + + 140 ms + + + + + + + + + + + + + + + + + + + + + + + 160 ms + + 1048576 + 2147483647 + + + 160 ms + + + + + + + + + + + + + + + + + + + + + + + 180 ms + + 1048576 + 2147483647 + + + 180 ms + + + + + + + + + + + + + + + + + + + + + + + 200 ms + + 1048576 + 2147483647 + + + 200 ms + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{413, 47}, {132, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + 8 ms + + 1048576 + 2147483647 + + + 8 ms + + + + + + + + + + + + + + + + + + + + + + + 16 ms + + 1048576 + 2147483647 + + + 16 ms + + + + + + + + + + + + + + + + + + + + + + + 32 ms + + 1048576 + 2147483647 + + + 32 ms + + + + + + + + + + + + + + + + + + + + + + + 64 ms + + 1048576 + 2147483647 + + + 64 ms + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + System + + 1048576 + 2147483647 + + + System + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{275, 21}, {130, 16}} + + + + + + + + + + The real SNES is 32000 Hz. Any values other than 32000 Hz will cause resampling. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Playback Rate : + + + + + + + + 256 + {{275, 51}, {130, 16}} + + + + + + + + + + Make sure this value is smaller than the mix buffer length. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Output Interval : + + + + + + + + 256 + {{275, 81}, {130, 16}} + + + + + + + + + + Too short length will cause crackling noise. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Mix Buffer Length : + + + + + + + + 256 + {{319, 140}, {225, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + 256 + {{319, 170}, {225, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + 256 + {{226, 142}, {85, 16}} + + + + + + + + + + Volume of the whole Snes9x sounds. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Volume : + + + + + + + + 256 + {{526, 192}, {16, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Hz + + + + + + + + 256 + {{226, 172}, {85, 16}} + + + + + + + + + + Adjusts the sound rate through resampling. For every Input Rate samples generated by the SNES, Playback Rate samples will be produced. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Input Rate : + + + + + + + + 256 + {{465, 192}, {59, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 32000 + + + + + + + + 256 + {{14, 136}, {112, 32}} + + + + + + + + + + Opens 'Sound Effect' dialog. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Effect... + + + {{8, 36}, {562, 309}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Sound + + + + + 0 + YES + + + 256 + + YES + + + 256 + {{199, 17}, {227, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Snes9x Folder + + 1048576 + 2147483647 + + + Snes9x Folder + + + + + + + + + + + + + + + + + + + + + + + ROM Folder + + 1048576 + 2147483647 + + + ROM Folder + + + + + + + + + + + + + + + + + + + + + + + Application Support Folder + + 1048576 + 2147483647 + + + Application Support Folder + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + YES + None Selected + + 1048576 + 2147483647 + + + None Selected + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Other... + + 1048576 + 2147483647 + + + Other... + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{198, 55}, {87, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{79, 21}, {112, 16}} + + + + + + + + + + Choose the folder where Snes9x will look for files. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Save Data in : + + + + + + + + 256 + {{289, 62}, {116, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + sec after Modified + + + + + + + + 256 + {{79, 62}, {112, 16}} + + + + + + + + + + Updates SRAM file when SRAM contents are modified. This may cause frequent disk access. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Auto Save SRAM : + + + + + + + + 256 + {{414, 64}, {69, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + (0 : Disable) + + + + + + + {{8, 36}, {562, 309}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + File + + + + + 0 + YES + + + 256 + + YES + + + 256 + {{20, 59}, {133, 16}} + + + + + + + + + + Changes HDMA timing and will 'fix' some games' glitches, but breaks many other games. The default value is 100. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + HDMA Timing Hack : + + + + + + + + 256 + {{157, 52}, {88, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + 256 + {{20, 21}, {456, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Note : These Hacks Need to Reopen ROM Image to Achieve Effects. + + + + + + + + 256 + {{198, 216}, {19, 28}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + 256 + {{20, 221}, {145, 16}} + + + + + + + + + + The speed when turbo mode is on. Modify in-game with Fn+T, Fn+Y. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Speed in Turbo Mode : + + + + + + + + 256 + {{173, 221}, {20, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 10 + + + + + + + + 256 + {{12, 158}, {538, 1}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + 256 + {{105, 183}, {112, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup + + YES + + + Auto + + 1048576 + 2147483647 + + + Auto + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + 1048576 + 2147483647 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + 1 + + 1048576 + 2147483647 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + 2 + + 1048576 + 2147483647 + + + 2 + + + + + + + + + + + + + + + + + + + + + + + 3 + + 1048576 + 2147483647 + + + 3 + + + + + + + + + + + + + + + + + + + + + + + 4 + + 1048576 + 2147483647 + + + 4 + + + + + + + + + + + + + + + + + + + + + + Popup + + + + + + + + + + + + + 256 + {{20, 187}, {79, 16}} + + + + + + + + + + Adjust this value if your Mac is slow. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Frame Skip : + + + + + + + + 256 + {{18, 89}, {223, 18}} + + + + + + + + + + Allows to write to VRAM outside blank periods. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Allow Invalid VRAM Access + + + + 256 + {{18, 111}, {223, 18}} + + + + + + + + + + Applies special hacks for games that can't be emulated correctly. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Apply Specific Game Hacks + + + {{8, 36}, {562, 309}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Accuracy + + + + + 0 + YES + + + 256 + + YES + + + 256 + {{18, 64}, {302, 18}} + + + + + + + + + + Choose whether open dialog should be shown when Snes9x is launched. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Open Choose ROM Image Dialog at Startup + + + + 256 + {{18, 86}, {374, 18}} + + + + + + + + + + Shows time stamps on thumbnails in freeze/defrost screen. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Show Dates and Times in Freese State Selection Screen + + + + 256 + {{328, 134}, {76, 16}} + + + + + + + + + + Choose the behavior of Music Box: 'Sound Emulation Only' to only emulate the music system, and 'Whole Emulation' to also emulate the CPU. Music that depends on the CPU running will not sound right without 'Whole Emulation.' + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Music Box : + + + + + + + + 256 + {{326, 158}, {177, 39}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + YES + + Sound Emulation Only + + + Whole Emulation + + + + + + 256 + {{18, 20}, {207, 18}} + + + + + + + + + + Sets 'Turbo' button as a toggle switch. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Toggle Turbo Button + + + + 256 + {{326, 42}, {221, 18}} + + + + + + + + + + When this option is on, Snes9x automatically loads the .ips or .ups file and patch the ROM image. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Use IPS / UPS Patch + + + + 256 + {{18, 42}, {207, 18}} + + + + + + + + + + Shows messages from Snes9x on the game screen. When off, messages are put in the standard console. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Show Onscreen Information + + + + 256 + {{18, 158}, {266, 59}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + YES + + Keep on Emulation, Receive All Inputs + + + Keep on Emulation, Reject Any Inputs + + + Pause and Exit from Emulation Loop + + + + + + 256 + {{20, 134}, {146, 16}} + + + + + + + + + + Choose the behavior of Snes9x when it is in back of other applications. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + When in Background : + + + + + + + + 256 + {{326, 20}, {221, 18}} + + + + + + + + + + Saves the sizes and positions of the game window and dialogs so they come back to the same place. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Save Window Size and Position + + + + 256 + {{326, 64}, {221, 18}} + + + + + + + + + + When this option is on, BS-X ROM is loaded first, then you launch BS games from the menu in BS-X. + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Boot Up BS Games from BS-X + + + {{8, 36}, {562, 309}} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Others + + + + + + + + {605, 371} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{39, 80}, {605, 371}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SoundEffectUI + + + 256 + + YES + + + 256 + + YES + + + 256 + {{18, 73}, {136, 18}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Enable this Effect + + + + 256 + {{232, 18}, {218, 26}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Apple's Matrix Reverb + + 1048576 + 2147483647 + + + Apple's Matrix Reverb + + + + + + + + + + + + + + + + + + + + + + + Apple's Graphic Equalizer + + 1048576 + 2147483647 + + + Apple's Graphic Equalizer + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{20, 22}, {204, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Choose the Effect to Configure : + + + + + + + + 256 + {{12, 60}, {443, 1}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {467, 99} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {467, 99} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {467, 99}} + {{0, 0}, {1024, 768}} + + + YES + + + + {555, 272} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cheat Entry + + + 256 + + YES + + + 256 + {{20, 20}, {396, 232}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + Address + + + + + + + + + + + + Value + + + + + + + + + + + + Description + + + + + + + + + + + + 256 + {{426, 16}, {115, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + New + + + + 256 + {{426, 48}, {115, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Delete + + + + 256 + {{426, 88}, {115, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Enable All + + + {555, 272} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {555, 272}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 256 + + YES + + + 256 + {{20, 134}, {268, 88}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + wqkgQ29weXJpZ2h0IDE5OTYtMjAxMSBTbmVzOXggZGV2ZWxvcGVycwoKU25lczl4IGlzIGEgU3VwZXIg +TmludGVuZG8gRW50ZXJ0YWlubWVudCBTeXN0ZW0gZW11bGF0b3IKdGhhdCBhbGxvd3MgeW91IHRvIHBs +YXkgbW9zdCBnYW1lcwpkZXNpZ25lZCBmb3IgdGhlIFNORVMgb24geW91ciBQQy4KUGxlYXNlIHZpc2l0 +IGh0dHA6Ly93d3cuc25lczl4LmNvbS8KZm9yIHVwLXRvLXRoZS1taW51dGUgaW5mb3JtYXRpb24gYW5k +IGhlbHAgb24gU25lczl4LgpOaW50ZW5kbyBpcyBhIHRyYWRlIG1hcmsuA + + + + + + + + 256 + {{122, 12}, {64, 64}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{51, 110}, {206, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + versionstr + + + + + + + + 256 + {{62, 85}, {184, 18}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Snes9x + + + + + + + {308, 242} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {308, 242}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QTMovControl + + + 256 + + YES + + + 256 + + YES + + + 256 + {{7, 9}, {83, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Double Size + + + + 256 + {{99, 9}, {69, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + Overscan + + + + 256 + {{313, 4}, {117, 30}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Compression... + + + + 256 + {{255, 7}, {50, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + 0 + + 1048576 + 2147483647 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + 1 + + 1048576 + 2147483647 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + 2 + + 1048576 + 2147483647 + + + 2 + + + + + + + + + + + + + + + + + + + + + + + 3 + + 1048576 + 2147483647 + + + 3 + + + + + + + + + + + + + + + + + + + + + + + 4 + + 1048576 + 2147483647 + + + 4 + + + + + + + + + + + + + + + + + + + + + + + 5 + + 1048576 + 2147483647 + + + 5 + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{184, 10}, {69, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Frame Skip : + + + + + + + {433, 35} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {433, 33} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {433, 33}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenROMControl + + + 256 + + YES + + + 256 + + YES + + + 256 + {{6, 8}, {81, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Memory Type : + + + + + + + + 256 + {{214, 8}, {94, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Interleave Mode : + + + + + + + + 256 + {{91, 30}, {116, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Auto Detect + + 1048576 + 2147483647 + + + Auto Detect + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Force PAL + + 1048576 + 2147483647 + + + Force PAL + + + + + + + + + + + + + + + + + + + + + + + Force NTSC + + 1048576 + 2147483647 + + + Force NTSC + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{6, 33}, {81, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Video System : + + + + + + + + 256 + {{91, 5}, {116, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Auto Detect + + 1048576 + 2147483647 + + + Auto Detect + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Force LoROM + + 1048576 + 2147483647 + + + Force LoROM + + + + + + + + + + + + + + + + + + + + + + + Force HiROM + + 1048576 + 2147483647 + + + Force HiROM + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{312, 5}, {116, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Auto Detect + + 1048576 + 2147483647 + + + Auto Detect + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Force not Interleaved + + 1048576 + 2147483647 + + + Force not Interleaved + + + + + + + + + + + + + + + + + + + + + + + Force Mode 1 + + 1048576 + 2147483647 + + + Force Mode 1 + + + + + + + + + + + + + + + + + + + + + + + Force Mode 2 + + 1048576 + 2147483647 + + + Force Mode 2 + + + + + + + + + + + + + + + + + + + + + + + Force GD24 + + 1048576 + 2147483647 + + + Force GD24 + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + + 256 + {{214, 33}, {94, 13}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + Header : + + + + + + + + 256 + {{312, 30}, {116, 22}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + Popup: + + YES + + + Auto Detect + + 1048576 + 2147483647 + + + Auto Detect + + + + + + + + + + + + + + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + Force no Header + + 1048576 + 2147483647 + + + Force no Header + + + + + + + + + + + + + + + + + + + + + + + Force Header + + 1048576 + 2147483647 + + + Force Header + + + + + + + + + + + + + + + + + + + + + + Popup: + + + + + + + + + + + + {433, 56} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + {433, 54} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {433, 54}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Clients List + + + 256 + + YES + + + 256 + {{86, 20}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{20, 20}, {19, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 1 : + + + + + + + + 256 + {{20, 44}, {19, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 2 : + + + + + + + + 256 + {{20, 68}, {19, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 3 : + + + + + + + + 256 + {{20, 92}, {19, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 4 : + + + + + + + + 256 + {{20, 116}, {19, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 5 : + + + + + + + + 256 + {{86, 44}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{86, 68}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{86, 92}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{86, 116}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{345, 20}, {72, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{345, 44}, {72, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{345, 68}, {72, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{345, 92}, {72, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{345, 116}, {72, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{219, 20}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{219, 44}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{219, 68}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{219, 92}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{219, 116}, {118, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{341, 148}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Play + + + + 256 + {{259, 148}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + Cancel + + + + 256 + {{52, 20}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{52, 44}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{52, 68}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{52, 92}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{52, 116}, {26, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{18, 158}, {16, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {437, 192} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {437, 192}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Players List + + + 256 + + YES + + + 256 + {{20, 20}, {28, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 1P : + + + + + + + + 256 + {{20, 44}, {28, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 2P : + + + + + + + + 256 + {{20, 68}, {28, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 3P : + + + + + + + + 256 + {{20, 92}, {28, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 4P : + + + + + + + + 256 + {{20, 116}, {28, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + 5P : + + + + + + + + 256 + {{56, 20}, {122, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{56, 44}, {122, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{56, 68}, {122, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{56, 92}, {122, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{56, 116}, {122, 16}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + + + + + 256 + {{102, 148}, {82, 32}} + + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + + + OK + + + {198, 192} + + + + + + + + + + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + + + + {{40, 80}, {198, 192}} + {{0, 0}, {1024, 768}} + + + YES + + + + + + YES + + + + YES + + 0 + + + + + + 1695 + + + YES + + + + AutoFire + + + 166 + + + YES + + + + Controllers + + + 1338 + + + YES + + + + Connect + + + 1285 + + + YES + + + + CFDrawer + + + 1452 + + + YES + + + + RecordSMV + + + 1595 + + + YES + + + + GameWindow + + + 1677 + + + YES + + + + CIFilter + + + 573 + + + YES + + + + + + + + + + + + MenuBar + + + 845 + + + YES + + + + RomInfo + + + 884 + + + YES + + + + CheatFinder + + + 950 + + + YES + + + + CFAddEntry + + + 1904 + + + YES + + + + MultiCart + + + 934 + + + YES + + + + Keyboard + + + 1529 + + + YES + + + + PlaySMV + + + 1599 + + + YES + + + + ExtraOptions + + + 264 + + + YES + + + + Preferences + + + 1815 + + + YES + + + + SoundEffect + + + 1837 + + + YES + + + + CheatEntry + + + 697 + + + YES + + + + About + + + 1495 + + + YES + + + + QTMovie + + + 1105 + + + YES + + + + OpenROM + + + 1335 + + + YES + + + + ClientList + + + 1329 + + + YES + + + + PlayerList + + + 1696 + + + YES + + + + + + 167 + + + YES + + + + + + + + + + + + + + + + 1328 + + + YES + + + + + + + + + + + + 1284 + + + + + 1466 + + + YES + + + + + + 1596 + + + YES + + + + + + 1678 + + + YES + + + + + + + 631 + + + YES + + + + + + 593 + + + YES + + + + + + 685 + + + YES + + + + + + 599 + + + YES + + + + + + 1895 + + + YES + + + + + + 644 + + + YES + + + + + + 581 + + + YES + + + + + + 586 + + + YES + + + + + + 1365 + + + YES + + + + + + 846 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 885 + + + YES + + + + + + + + 951 + + + YES + + + + + + + + + + + + + + + 1905 + + + YES + + + + + + + + + + + + + + + + + + 933 + + + YES + + + + + + + + + + 1519 + + + YES + + + + + + 1598 + + + YES + + + + + + + + + + + + + 265 + + + YES + + + + + + 1816 + + + YES + + + + + + 1838 + + + YES + + + + + + + + + 698 + + + YES + + + + + + + + + 1498 + + + YES + + + + + + 1106 + + + YES + + + + + + 1341 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1333 + + + YES + + + + + + + + + + + + + + + + 1697 + + + YES + + + + + + + 962 + + + + + 1851 + + + YES + + + + + + + + + + + + + + + + + 961 + + + + + 544 + + + YES + + + + + + + + + + + + + + + + + + + + + + 504 + + + YES + + + + + + + + + + + + + + + + + 1864 + + + YES + + + + + + + + + + + + + + + + + 251 + + + YES + + + + + + + + + + + + + + + + + 515 + + + YES + + + + + + + + + + + + + + + + + 1877 + + + YES + + + + + + + + + + + + + + + + + 539 + + + YES + + + + + + + + + + + + + + + + + 495 + + + YES + + + + + + + + + + + + + + + + + 1316 + + + + + 1356 + + + + + 1362 + + + + + 1321 + + + + + 1357 + + + + + 1342 + + + + + 1314 + + + + + 1636 + + + YES + + + + + + + + + + + + + + 1597 + + + + + 1679 + + + + + 1684 + + + + + 627 + + + YES + + + + + + + + + 575 + + + YES + + + + + + 678 + + + YES + + + + + + + + + + + 600 + + + YES + + + + + + + + + + + 1896 + + + YES + + + + + + + + + + + 638 + + + YES + + + + + + + + + + + + + + + + + + + + + + 567 + + + YES + + + + + + + + + + + + + 568 + + + YES + + + + + + + + + + + + 1366 + + + YES + + + + + + + 850 + + + + + 847 + + + + + 860 + + + + + 866 + + + + + 855 + + + + + 875 + + + + + 877 + + + + + 864 + + + + + 848 + + + + + 858 + + + + + 1044 + + + + + 872 + + + + + 1047 + + + + + 853 + + + + + 870 + + + + + 862 + + + + + 852 + + + + + 878 + + + + + 856 + + + + + 868 + + + + + 851 + + + + + 876 + + + + + 859 + + + + + 849 + + + + + 865 + + + + + 873 + + + + + 854 + + + + + 2021 + + + + + 871 + + + + + 857 + + + + + 1043 + + + + + 867 + + + + + 869 + + + + + 2020 + + + + + 874 + + + + + 1587 + + + YES + + + + + + + + + + + + + + + + + + + + 1588 + + + YES + + + + + + + + 1558 + + + + + 954 + + + + + 956 + + + + + 958 + + + + + 957 + + + + + 952 + + + + + 1283 + + + + + 959 + + + + + 953 + + + + + 955 + + + + + 1282 + + + + + 1906 + + + + + 1944 + + + + + 1948 + + + YES + + + + + + 1910 + + + + + 1943 + + + + + 1952 + + + + + 1945 + + + + + 1950 + + + YES + + + + + + 1938 + + + + + 1936 + + + + + 1907 + + + + + 1909 + + + + + 1946 + + + + + 943 + + + + + 1980 + + + + + 946 + + + + + 1981 + + + + + 947 + + + + + 1637 + + + YES + + + + + + + 1624 + + + + + 1629 + + + YES + + + + + + 1631 + + + + + 1627 + + + + + 1621 + + + + + 1630 + + + + + 1600 + + + + + 1622 + + + + + 266 + + + YES + + + + + + + + + + 1824 + + + YES + + + + + + + + + 1841 + + + + + 1840 + + + + + 1995 + + + YES + + + + + + + + + 1842 + + + + + 702 + + + + + 1019 + + + + + 1281 + + + + + 705 + + + + + 1638 + + + YES + + + + + + + + + + 1635 + + + YES + + + + + + + + + + + + + 1344 + + + + + 1313 + + + + + 1331 + + + + + 1340 + + + + + 1317 + + + + + 1354 + + + + + 1320 + + + + + 1358 + + + + + 1325 + + + + + 1363 + + + + + 1326 + + + + + 1361 + + + + + 1322 + + + + + 1348 + + + + + 1330 + + + + + 1360 + + + + + 1336 + + + + + 1343 + + + + + 1349 + + + + + 1324 + + + + + 1337 + + + + + 1323 + + + + + 1355 + + + + + 1315 + + + + + 1351 + + + + + 1346 + + + + + 1339 + + + + + 1352 + + + + + 1345 + + + + + 1359 + + + + + 1332 + + + + + 1312 + + + + + 1350 + + + + + 1327 + + + + + 1318 + + + + + 1347 + + + + + 1334 + + + + + 1319 + + + + + 1353 + + + + + 1859 + + + + + 1856 + + + + + 1863 + + + + + 1857 + + + + + 1862 + + + + + 1860 + + + + + 1853 + + + + + 1852 + + + + + 1858 + + + + + 1854 + + + + + 1855 + + + + + 1861 + + + + + 562 + + + + + 557 + + + + + 560 + + + + + 558 + + + + + 561 + + + + + 555 + + + + + 1018 + + + + + 556 + + + + + 1694 + + + + + 563 + + + + + 1692 + + + + + 1674 + + + + + 564 + + + + + 1673 + + + + + 554 + + + + + 1693 + + + + + 559 + + + + + 505 + + + + + 506 + + + + + 509 + + + + + 513 + + + + + 503 + + + + + 514 + + + + + 502 + + + + + 507 + + + + + 512 + + + + + 508 + + + + + 511 + + + + + 510 + + + + + 1869 + + + + + 1874 + + + + + 1873 + + + + + 1871 + + + + + 1875 + + + + + 1865 + + + + + 1868 + + + + + 1866 + + + + + 1872 + + + + + 1870 + + + + + 1867 + + + + + 1876 + + + + + 192 + + + + + 231 + + + + + 209 + + + + + 208 + + + + + 204 + + + + + 194 + + + + + 191 + + + + + 203 + + + + + 193 + + + + + 230 + + + + + 205 + + + + + 202 + + + + + 522 + + + + + 520 + + + + + 521 + + + + + 519 + + + + + 524 + + + + + 526 + + + + + 517 + + + + + 518 + + + + + 525 + + + + + 523 + + + + + 516 + + + + + 527 + + + + + 1882 + + + + + 1881 + + + + + 1883 + + + + + 1887 + + + + + 1878 + + + + + 1888 + + + + + 1884 + + + + + 1889 + + + + + 1886 + + + + + 1885 + + + + + 1880 + + + + + 1879 + + + + + 533 + + + + + 538 + + + + + 530 + + + + + 528 + + + + + 536 + + + + + 535 + + + + + 531 + + + + + 534 + + + + + 529 + + + + + 532 + + + + + 540 + + + + + 537 + + + + + 499 + + + + + 493 + + + + + 490 + + + + + 492 + + + + + 500 + + + + + 497 + + + + + 494 + + + + + 496 + + + + + 489 + + + + + 491 + + + + + 498 + + + + + 501 + + + + + 1489 + + + + + 1487 + + + + + 1454 + + + + + 1488 + + + + + 1479 + + + + + 1477 + + + + + 1490 + + + + + 1486 + + + + + 1469 + + + + + 837 + + + + + 633 + + + + + 635 + + + + + 637 + + + + + 570 + + + + + 676 + + + + + 687 + + + YES + + + + + + 748 + + + + + 749 + + + + + 679 + + + + + 684 + + + + + 1017 + + + + + 611 + + + YES + + + + + + 607 + + + + + 609 + + + + + 1042 + + + + + 604 + + + + + 1902 + + + + + 1901 + + + + + 1900 + + + + + 1898 + + + + + 1899 + + + + + 1897 + + + + + 1278 + + + + + 1280 + + + + + 1845 + + + + + 1279 + + + + + 1444 + + + + + 788 + + + + + 1844 + + + + + 839 + + + + + 789 + + + + + 657 + + + + + 655 + + + + + 1440 + + + + + 1493 + + + + + 840 + + + + + 1494 + + + + + 1442 + + + + + 652 + + + + + 576 + + + + + 587 + + + + + 574 + + + + + 590 + + + + + 596 + + + + + 595 + + + + + 582 + + + + + 584 + + + + + 1893 + + + + + 880 + + + + + 571 + + + + + 1947 + + + + + 879 + + + + + 799 + + + + + 1894 + + + + + 1364 + + + + + 1368 + + + + + 1584 + + + + + 1579 + + + + + 1568 + + + + + 1564 + + + + + 1574 + + + + + 1575 + + + + + 1570 + + + + + 1580 + + + + + 1586 + + + YES + + + + + + 1569 + + + YES + + + + + + 1566 + + + + + 1576 + + + + + 1573 + + + + + 1582 + + + + + 1560 + + + + + 914 + + + + + 912 + + + + + 913 + + + + + 1949 + + + + + 1951 + + + + + 1520 + + + + + 1517 + + + + + 1626 + + + YES + + + + + + + + 1819 + + + + + 1820 + + + YES + + + + + + 1818 + + + + + 1817 + + + + + 1506 + + + + + 1504 + + + + + 1501 + + + + + 1509 + + + YES + + + + + + 1515 + + + + + 1156 + + + YES + + + + + + 1149 + + + YES + + + + + + 1151 + + + + + 1139 + + + + + 1165 + + + YES + + + + + + 1158 + + + + + 1152 + + + YES + + + + + + 1147 + + + + + 688 + + + YES + + + + + + + + + + 612 + + + YES + + + + + + + + + + + + + 1578 + + + YES + + + + + + + + + 1572 + + + YES + + + + + + + + + + + 1623 + + + + + 1625 + + + + + 1628 + + + + + 1821 + + + YES + + + + + + + 1510 + + + YES + + + + + + + + + + + 1143 + + + YES + + + + + + + + + + + 1167 + + + YES + + + + + + + + + 1153 + + + YES + + + + + + + + + 1161 + + + YES + + + + + + + + + 693 + + + + + 690 + + + + + 692 + + + + + 689 + + + + + 691 + + + + + 1015 + + + + + 1890 + + + + + 615 + + + + + 617 + + + + + 614 + + + + + 616 + + + + + 613 + + + + + 1016 + + + + + 1562 + + + + + 1565 + + + + + 1583 + + + + + 1567 + + + + + 1561 + + + + + 1563 + + + + + 1571 + + + + + 1577 + + + + + 1585 + + + + + 1581 + + + + + 1823 + + + + + 1822 + + + + + 1514 + + + + + 1512 + + + + + 1508 + + + + + 1513 + + + + + 1511 + + + + + 1507 + + + + + 1150 + + + + + 1290 + + + + + 1166 + + + + + 1164 + + + + + 1159 + + + + + 1148 + + + + + 1154 + + + + + 1141 + + + + + 1145 + + + + + 1146 + + + + + 1157 + + + + + 1163 + + + + + 1162 + + + + + 1160 + + + + + 1142 + + + + + 1144 + + + + + 1155 + + + + + 1140 + + + + + 2297 + + + + + 2298 + + + + + 2299 + + + + + 2300 + + + + + 2301 + + + YES + + + + + + 1756 + + + YES + + + + + + + + + + + 1770 + + + YES + + + + + + + + 1757 + + + YES + + + + + + + + + + + + + + + + + 1774 + + + + + 1801 + + + YES + + + + + + + + + + + + + + + + + 1788 + + + YES + + + + + + + + + + + + + + + + + 1775 + + + YES + + + + + + + + + + + + + + + + + 1781 + + + + + 1787 + + + + + 1784 + + + + + 1778 + + + + + 1779 + + + + + 1785 + + + + + 1783 + + + + + 1782 + + + + + 1780 + + + + + 1777 + + + + + 1776 + + + + + 1786 + + + + + 1796 + + + + + 1791 + + + + + 1797 + + + + + 1794 + + + + + 1800 + + + + + 1798 + + + + + 1790 + + + + + 1792 + + + + + 1793 + + + + + 1799 + + + + + 1789 + + + + + 1795 + + + + + 1812 + + + + + 1802 + + + + + 1811 + + + + + 1809 + + + + + 1810 + + + + + 1808 + + + + + 1805 + + + + + 1813 + + + + + 1807 + + + + + 1806 + + + + + 1804 + + + + + 1803 + + + + + 1766 + + + + + 1768 + + + + + 1761 + + + + + 1767 + + + + + 1760 + + + + + 1762 + + + + + 1758 + + + + + 1759 + + + + + 1763 + + + + + 1765 + + + + + 1764 + + + + + 1769 + + + + + 1773 + + + + + 1772 + + + + + 1771 + + + + + 2302 + + + YES + + + + + + 1698 + + + YES + + + + + + + + + + + 1712 + + + YES + + + + + + + + + + + + + + + + + 1751 + + + YES + + + + + + + + 1699 + + + YES + + + + + + + + + + + + + + + + + 1738 + + + YES + + + + + + + + + + + + + + + + + 1725 + + + YES + + + + + + + + + + + + + + + + + 1755 + + + + + 1737 + + + + + 1731 + + + + + 1730 + + + + + 1733 + + + + + 1727 + + + + + 1736 + + + + + 1735 + + + + + 1729 + + + + + 1726 + + + + + 1732 + + + + + 1734 + + + + + 1728 + + + + + 1743 + + + + + 1745 + + + + + 1749 + + + + + 1741 + + + + + 1740 + + + + + 1746 + + + + + 1747 + + + + + 1744 + + + + + 1748 + + + + + 1750 + + + + + 1742 + + + + + 1739 + + + + + 1709 + + + + + 1708 + + + + + 1711 + + + + + 1701 + + + + + 1706 + + + + + 1707 + + + + + 1700 + + + + + 1710 + + + + + 1703 + + + + + 1705 + + + + + 1702 + + + + + 1704 + + + + + 1754 + + + + + 1753 + + + + + 1752 + + + + + 1724 + + + + + 1717 + + + + + 1721 + + + + + 1714 + + + + + 1723 + + + + + 1716 + + + + + 1713 + + + + + 1719 + + + + + 1718 + + + + + 1722 + + + + + 1720 + + + + + 1715 + + + + + 2303 + + + YES + + + + + + 267 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + 1685 + + + + + 1304 + + + + + 278 + + + + + 1276 + + + + + 272 + + + + + 362 + + + + + 1308 + + + + + 674 + + + + + 276 + + + + + 1309 + + + + + 1307 + + + + + 1305 + + + + + 274 + + + + + 270 + + + + + 1843 + + + + + 273 + + + + + 279 + + + YES + + + + + + 275 + + + + + 672 + + + + + 1306 + + + + + 280 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + 710 + + + + + 2226 + + + + + 2227 + + + + + 714 + + + + + 1847 + + + + + 2225 + + + + + 2186 + + + + + 1892 + + + + + 1891 + + + + + 2228 + + + + + 1259 + + + + + 360 + + + + + 2283 + + + + + 2230 + + + + + 709 + + + + + 2229 + + + + + 2187 + + + + + 1849 + + + + + 361 + + + + + 2304 + + + YES + + + + + + 268 + + + YES + + + + + + + + + + + + + + + + + + + + + + + 288 + + + + + 2092 + + + + + 2147 + + + YES + + + + + + 2088 + + + + + 343 + + + + + 2122 + + + + + 303 + + + YES + + + + + + 1208 + + + + + 285 + + + + + 2087 + + + + + 2159 + + + + + 797 + + + + + 286 + + + + + 798 + + + + + 2086 + + + + + 2090 + + + + + 2071 + + + YES + + + + + + 2085 + + + + + 2072 + + + YES + + + + + + + + + + + + + + + 2119 + + + + + 2078 + + + + + 2120 + + + + + 2079 + + + + + 2074 + + + + + 2076 + + + + + 2117 + + + + + 2121 + + + + + 2080 + + + + + 2118 + + + + + 299 + + + YES + + + + + + + + + + + + + + 300 + + + + + 793 + + + + + 794 + + + + + 792 + + + + + 334 + + + + + 301 + + + + + 795 + + + + + 796 + + + + + 791 + + + + + 2148 + + + YES + + + + + + + + + + + 2153 + + + + + 2160 + + + + + 2161 + + + + + 2149 + + + + + 2150 + + + + + 2158 + + + + + 2305 + + + YES + + + + + + 269 + + + YES + + + + + + + + + + + 346 + + + + + 366 + + + + + 365 + + + + + 351 + + + + + 314 + + + YES + + + + + + 330 + + + + + 315 + + + YES + + + + + + + + + + + + 2255 + + + + + 2258 + + + + + 2256 + + + + + 671 + + + + + 2257 + + + + + 318 + + + + + 316 + + + + + 2306 + + + YES + + + + + + 397 + + + YES + + + + + + + + + + + + + + + + 2046 + + + + + 1827 + + + YES + + + + + + 408 + + + + + 1556 + + + + + 1554 + + + + + 1903 + + + + + 402 + + + + + 1557 + + + + + 1555 + + + + + 400 + + + + + 1832 + + + + + 1828 + + + YES + + + + + + + + + + + + 1831 + + + + + 1830 + + + + + 1833 + + + + + 1834 + + + + + 1829 + + + + + 1836 + + + + + 1835 + + + + + 2307 + + + YES + + + + + + 881 + + + YES + + + + + + + + + + + + + + + + 882 + + + + + 1291 + + + + + 1552 + + + + + 1040 + + + + + 1850 + + + + + 1041 + + + + + 1045 + + + + + 1292 + + + + + 963 + + + + + 1553 + + + + + 1050 + + + + + + + YES + + YES + 1837.windowTemplate.hasMinSize + 1837.windowTemplate.minSize + + + YES + + {555, 272} + + + + YES + + + YES + + + + + YES + + + YES + + + + 2307 + + + 0 + IBCarbonFramework + + com.apple.InterfaceBuilder.CarbonPlugin.macosx + + + + com.apple.InterfaceBuilder.CarbonPlugin.InterfaceBuilder3 + + + YES + ../cocoatest.xcodeproj + 3 + + diff --git a/macosx/English.lproj/musicbox.xib b/macosx/English.lproj/musicbox.xib new file mode 100644 index 00000000..f955ffcb --- /dev/null +++ b/macosx/English.lproj/musicbox.xib @@ -0,0 +1,2171 @@ + + + + 1040 + 10J869 + 851 + 1038.35 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 851 + + + YES + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + MusicBoxController + + + FirstResponder + + + NSApplication + + + 7 + 2 + {{100, 100}, {352, 242}} + 1685586944 + Music Box + NSWindow + + {352, 242} + {352, 61} + + + 256 + + YES + + + 268 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{30, 37}, {262, 142}} + + + YES + + 130560 + 33554432 + + NSImage + musicbox_indicator + + 0 + 2 + 0 + NO + + YES + + + + 268 + {{302, 158}, {30, 22}} + + + YES + + 67239424 + 134217728 + + + LucidaGrande + 13 + 1044 + + + 918831359 + 34 + + NSImage + musicbox_pause + + + + 400 + 75 + + + + + 268 + {{302, 134}, {30, 22}} + + + YES + + 67239424 + 134217728 + + + + -2033958657 + 34 + + NSImage + musicbox_rewind + + + + 400 + 75 + + + + + 268 + {{302, 110}, {30, 22}} + + + YES + + 67239424 + 134217728 + + + + -2033958657 + 34 + + NSImage + musicbox_effect + + + + 400 + 75 + + + + + 268 + {{36, 43}, {250, 130}} + + + MusicBoxIndicatorView + + + + 268 + {{41, 19}, {12, 14}} + + + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{111, 19}, {12, 14}} + + + 5 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{55, 19}, {12, 14}} + + + 1 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{69, 19}, {12, 14}} + + + 2 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{83, 19}, {12, 14}} + + + 3 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{97, 19}, {12, 14}} + + + 4 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{139, 19}, {12, 14}} + + + 7 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{125, 19}, {12, 14}} + + + 6 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{171, 19}, {12, 14}} + + + 8 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{241, 19}, {12, 14}} + + + 13 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{185, 19}, {12, 14}} + + + 9 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{199, 19}, {12, 14}} + + + 10 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{213, 19}, {12, 14}} + + + 11 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{227, 19}, {12, 14}} + + + 12 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{269, 19}, {12, 14}} + + + 15 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{255, 19}, {12, 14}} + + + 14 + YES + + 67239424 + 134217728 + + + + 918831359 + 34 + + + 400 + 75 + + + + + 268 + {{307, 198}, {29, 26}} + + + YES + + -2080244224 + 134217728 + + + + 918831359 + 38 + + + 400 + 75 + + + + + 268 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{153, 18}, {16, 16}} + + + YES + + 130560 + 33554432 + + NSImage + musicbox_ledoff + + 0 + 0 + 0 + NO + + YES + + + + 268 + {{17, 203}, {58, 17}} + + + YES + + 67239488 + 272635904 + Playing : + + + YES + 1 + + 6 + System + controlColor + + 3 + MC42NjY2NjY2ODY1AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 268 + {{77, 203}, {218, 17}} + + + YES + + 67239488 + 272635904 + Game Title + + + YES + 1 + + + + + + {352, 242} + + + + {{0, 0}, {1440, 878}} + {352, 83} + {352, 264} + + + + + + YES + + + disclosure + + + + 93 + + + + rewind + + + + 95 + + + + gametitle + + + + 113 + + + + indicator + + + + 114 + + + + led + + + + 115 + + + + window + + + + 116 + + + + handlePauseButton: + + + + 123 + + + + handleRewindButton: + + + + 124 + + + + handleEffectButton: + + + + 125 + + + + handleDisclosureButton: + + + + 126 + + + + handleChannelButton: + + + + 127 + + + + handleChannelButton: + + + + 129 + + + + handleChannelButton: + + + + 130 + + + + handleChannelButton: + + + + 131 + + + + handleChannelButton: + + + + 132 + + + + handleChannelButton: + + + + 133 + + + + handleChannelButton: + + + + 134 + + + + handleChannelButton: + + + + 135 + + + + handleChannelButton: + + + + 136 + + + + handleChannelButton: + + + + 137 + + + + handleChannelButton: + + + + 138 + + + + handleChannelButton: + + + + 139 + + + + handleChannelButton: + + + + 140 + + + + handleChannelButton: + + + + 141 + + + + handleChannelButton: + + + + 142 + + + + handleChannelButton: + + + + 143 + + + + delegate + + + + 146 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 2 + + + YES + + + + + + 3 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + YES + + + + + 14 + + + YES + + + + + + 15 + + + + + 26 + + + YES + + + + + + 27 + + + + + 28 + + + YES + + + + + + 29 + + + + + 30 + + + YES + + + + + + 31 + + + + + 32 + + + YES + + + + + + 33 + + + + + 34 + + + YES + + + + + + 35 + + + + + 36 + + + YES + + + + + + 37 + + + + + 38 + + + YES + + + + + + 39 + + + + + 40 + + + YES + + + + + + 41 + + + YES + + + + + + 42 + + + YES + + + + + + 43 + + + YES + + + + + + 44 + + + YES + + + + + + 45 + + + YES + + + + + + 46 + + + YES + + + + + + 47 + + + YES + + + + + + 48 + + + + + 49 + + + + + 50 + + + + + 51 + + + + + 52 + + + + + 53 + + + + + 54 + + + + + 55 + + + + + 62 + + + YES + + + + + + 63 + + + + + 64 + + + YES + + + + + + 65 + + + + + 66 + + + YES + + + + + + 67 + + + + + 68 + + + YES + + + + + + 69 + + + + + 70 + + + YES + + + + + + 71 + + + + + 72 + + + YES + + + + + + 73 + + + + + 6 + + + YES + + + + + + 7 + + + + + 120 + + + YES + + + + + + 121 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 1.IBViewBoundsToFrameTransform + 1.WindowOrigin + 1.editorWindowContentRectSynchronizationRect + 120.IBPluginDependency + 120.IBViewBoundsToFrameTransform + 120.IBViewIntegration.shadowColor + 121.IBPluginDependency + 14.IBPluginDependency + 14.IBViewBoundsToFrameTransform + 15.IBPluginDependency + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 2.IBWindowTemplateEditedContentRect + 2.NSWindowTemplate.visibleAtLaunch + 2.windowTemplate.hasMaxSize + 2.windowTemplate.hasMinSize + 2.windowTemplate.maxSize + 2.windowTemplate.minSize + 26.IBPluginDependency + 26.IBViewBoundsToFrameTransform + 27.IBPluginDependency + 28.IBPluginDependency + 28.IBViewBoundsToFrameTransform + 29.IBPluginDependency + 3.IBPluginDependency + 30.IBPluginDependency + 30.IBViewBoundsToFrameTransform + 31.IBPluginDependency + 32.IBPluginDependency + 32.IBViewBoundsToFrameTransform + 33.IBPluginDependency + 34.IBPluginDependency + 34.IBViewBoundsToFrameTransform + 35.IBPluginDependency + 36.IBPluginDependency + 36.IBViewBoundsToFrameTransform + 37.IBPluginDependency + 38.IBPluginDependency + 38.IBViewBoundsToFrameTransform + 39.IBPluginDependency + 40.IBPluginDependency + 40.IBViewBoundsToFrameTransform + 41.IBPluginDependency + 41.IBViewBoundsToFrameTransform + 42.IBPluginDependency + 42.IBViewBoundsToFrameTransform + 43.IBPluginDependency + 43.IBViewBoundsToFrameTransform + 44.IBPluginDependency + 44.IBViewBoundsToFrameTransform + 45.IBPluginDependency + 45.IBViewBoundsToFrameTransform + 46.IBPluginDependency + 46.IBViewBoundsToFrameTransform + 47.IBPluginDependency + 47.IBViewBoundsToFrameTransform + 48.IBPluginDependency + 49.IBPluginDependency + 50.IBPluginDependency + 51.IBPluginDependency + 52.IBPluginDependency + 53.IBPluginDependency + 54.IBPluginDependency + 55.IBPluginDependency + 6.IBPluginDependency + 6.IBViewBoundsToFrameTransform + 62.IBPluginDependency + 62.IBViewBoundsToFrameTransform + 63.IBPluginDependency + 64.IBPluginDependency + 64.IBViewBoundsToFrameTransform + 65.IBPluginDependency + 66.IBPluginDependency + 66.IBViewBoundsToFrameTransform + 67.IBPluginDependency + 68.IBPluginDependency + 68.IBViewBoundsToFrameTransform + 69.IBPluginDependency + 7.IBPluginDependency + 70.IBPluginDependency + 70.IBViewBoundsToFrameTransform + 71.IBPluginDependency + 72.IBPluginDependency + 72.IBViewBoundsToFrameTransform + 73.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{0, 573}, {480, 272}} + com.apple.InterfaceBuilder.CocoaPlugin + + AUIQAABCMAAAA + + {628, 654} + {{357, 416}, {480, 272}} + com.apple.InterfaceBuilder.CocoaPlugin + + AUOaAAAAAAAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCCAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + {{8, 606}, {352, 242}} + com.apple.InterfaceBuilder.CocoaPlugin + {{8, 606}, {352, 242}} + + + + {352, 242} + {352, 61} + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABC0AAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCQAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCeAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCmAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCtAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDBAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABC7AAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDJQAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDawAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDMwAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDQQAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDTwAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDXQAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDg4AAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDeQAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDlwAAwy0AAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDlwAAw1QAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + AUMZAABBkAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw1oAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDlwAAwx4AAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDlwAAwwAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCmgAAw1oAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 150 + + + + YES + + MusicBoxController + NSObject + + YES + + YES + handleChannelButton: + handleDisclosureButton: + handleEffectButton: + handlePauseButton: + handleRewindButton: + + + YES + id + id + id + id + id + + + + YES + + YES + handleChannelButton: + handleDisclosureButton: + handleEffectButton: + handlePauseButton: + handleRewindButton: + + + YES + + handleChannelButton: + id + + + handleDisclosureButton: + id + + + handleEffectButton: + id + + + handlePauseButton: + id + + + handleRewindButton: + id + + + + + YES + + YES + disclosure + gametitle + indicator + led + rewind + window + + + YES + id + id + id + id + id + id + + + + YES + + YES + disclosure + gametitle + indicator + led + rewind + window + + + YES + + disclosure + id + + + gametitle + id + + + indicator + id + + + led + id + + + rewind + id + + + window + id + + + + + IBProjectSource + mac-musicbox.h + + + + MusicBoxController + NSObject + + IBUserSource + + + + + MusicBoxIndicatorView + NSView + + + + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSImageCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSImageCell.h + + + + NSImageView + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSImageView.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CIImageProvider.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../cocoatest.xcodeproj + 3 + + YES + + YES + musicbox_effect + musicbox_indicator + musicbox_ledoff + musicbox_pause + musicbox_rewind + + + YES + {16, 16} + {262, 142} + {16, 16} + {16, 16} + {16, 16} + + + + diff --git a/macosx/docs/FAQ.rtf b/macosx/docs/FAQ.rtf index bc475465..b8154b44 100644 --- a/macosx/docs/FAQ.rtf +++ b/macosx/docs/FAQ.rtf @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf250 +{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red153\green102\blue51;\red0\green0\blue255;} -\paperw11900\paperh16840\margl1440\margr1440\vieww11500\viewh12780\viewkind0 +\paperw11900\paperh16840\margl1440\margr1440\vieww11500\viewh12340\viewkind0 \pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural \f0\fs24 \cf0 \ @@ -16,9 +16,6 @@ \b0\fs24 \cf0 \ \ \pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural -\cf3 Files created by Snes9x\cf0 \ - These files are compatible, except for the extension of the snapshot file. The only one difference is that the Mac port puts the thumbnail screenshot into the resource fork of .frz and .smv files, but the resource fork is usually deleted or separated when you send these files to your friends who don't use Mac.\ -\ \cf3 Key mapping\cf0 \ The default settings of key mapping are different. For example, the A-button is the command key on Mac, while it's the D key in Windows.\ \ diff --git a/macosx/icons.png b/macosx/icons.png index 0fb973bc..11beac8a 100644 Binary files a/macosx/icons.png and b/macosx/icons.png differ diff --git a/macosx/libz_u.a b/macosx/libz_u.a index 82761c5f..6bd032ef 100644 Binary files a/macosx/libz_u.a and b/macosx/libz_u.a differ diff --git a/macosx/logo_defrost.png b/macosx/logo_defrost.png index fea4873d..208704dd 100644 Binary files a/macosx/logo_defrost.png and b/macosx/logo_defrost.png differ diff --git a/macosx/logo_freeze.png b/macosx/logo_freeze.png index 3ea50877..8d6eaa0b 100644 Binary files a/macosx/logo_freeze.png and b/macosx/logo_freeze.png differ diff --git a/macosx/mac-appleevent.cpp b/macosx/mac-appleevent.cpp old mode 100644 new mode 100755 index 2c8a2b18..49f846b5 --- a/macosx/mac-appleevent.cpp +++ b/macosx/mac-appleevent.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-appleevent.h b/macosx/mac-appleevent.h old mode 100644 new mode 100755 index e3013d9b..93ed560c --- a/macosx/mac-appleevent.h +++ b/macosx/mac-appleevent.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-audio.h b/macosx/mac-audio.h index e08bf9aa..5e444647 100644 --- a/macosx/mac-audio.h +++ b/macosx/mac-audio.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-audio.cpp b/macosx/mac-audio.mm similarity index 99% rename from macosx/mac-audio.cpp rename to macosx/mac-audio.mm index ac64dd8a..11fe33b9 100644 --- a/macosx/mac-audio.cpp +++ b/macosx/mac-audio.mm @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander @@ -191,6 +192,7 @@ #include "snes9x.h" #include "apu.h" +#include #include #include #include diff --git a/macosx/mac-cart.h b/macosx/mac-cart.h index 8d07f555..ade454da 100755 --- a/macosx/mac-cart.h +++ b/macosx/mac-cart.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cart.mm b/macosx/mac-cart.mm index bd860ab7..059530e8 100755 --- a/macosx/mac-cart.mm +++ b/macosx/mac-cart.mm @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cheat.cpp b/macosx/mac-cheat.cpp old mode 100644 new mode 100755 index 18b72610..96db5637 --- a/macosx/mac-cheat.cpp +++ b/macosx/mac-cheat.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cheat.h b/macosx/mac-cheat.h old mode 100644 new mode 100755 index 5e1a2d29..090d8046 --- a/macosx/mac-cheat.h +++ b/macosx/mac-cheat.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cheatfinder.cpp b/macosx/mac-cheatfinder.cpp index 01187e81..35dfab22 100755 --- a/macosx/mac-cheatfinder.cpp +++ b/macosx/mac-cheatfinder.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cheatfinder.h b/macosx/mac-cheatfinder.h old mode 100644 new mode 100755 index 536b530c..10e3e68c --- a/macosx/mac-cheatfinder.h +++ b/macosx/mac-cheatfinder.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-client.cpp b/macosx/mac-client.cpp index 19763eb5..72bb0f76 100644 --- a/macosx/mac-client.cpp +++ b/macosx/mac-client.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-client.h b/macosx/mac-client.h index 20d2fae0..95701425 100644 --- a/macosx/mac-client.h +++ b/macosx/mac-client.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cocoatools.h b/macosx/mac-cocoatools.h index 460e85f6..4133fee1 100644 --- a/macosx/mac-cocoatools.h +++ b/macosx/mac-cocoatools.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-cocoatools.mm b/macosx/mac-cocoatools.mm index 05a60f3d..a5642280 100644 --- a/macosx/mac-cocoatools.mm +++ b/macosx/mac-cocoatools.mm @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-controls.cpp b/macosx/mac-controls.cpp index 919fb7c9..26e0d5b4 100644 --- a/macosx/mac-controls.cpp +++ b/macosx/mac-controls.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-controls.h b/macosx/mac-controls.h index 10daba6a..ddd1045d 100644 --- a/macosx/mac-controls.h +++ b/macosx/mac-controls.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-coreimage.h b/macosx/mac-coreimage.h index fd4b436f..3fa08803 100644 --- a/macosx/mac-coreimage.h +++ b/macosx/mac-coreimage.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-coreimage.mm b/macosx/mac-coreimage.mm index 741c33e1..9cf453c3 100644 --- a/macosx/mac-coreimage.mm +++ b/macosx/mac-coreimage.mm @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-dialog.cpp b/macosx/mac-dialog.cpp old mode 100644 new mode 100755 index 8fa3c8e7..a8919cfb --- a/macosx/mac-dialog.cpp +++ b/macosx/mac-dialog.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-dialog.h b/macosx/mac-dialog.h index 4d7b9dbc..9542aa82 100755 --- a/macosx/mac-dialog.h +++ b/macosx/mac-dialog.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-file.cpp b/macosx/mac-file.cpp index 35a6df67..0e25b66e 100644 --- a/macosx/mac-file.cpp +++ b/macosx/mac-file.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-file.h b/macosx/mac-file.h index aa6773cc..d383e1e0 100644 --- a/macosx/mac-file.h +++ b/macosx/mac-file.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-global_prefix.h b/macosx/mac-global_prefix.h index 8e98e089..e421b402 100644 --- a/macosx/mac-global_prefix.h +++ b/macosx/mac-global_prefix.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-gworld.cpp b/macosx/mac-gworld.cpp old mode 100644 new mode 100755 index cddcfb9c..dbbac099 --- a/macosx/mac-gworld.cpp +++ b/macosx/mac-gworld.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-gworld.h b/macosx/mac-gworld.h old mode 100644 new mode 100755 index 87b1e100..83a7fa35 --- a/macosx/mac-gworld.h +++ b/macosx/mac-gworld.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-joypad.cpp b/macosx/mac-joypad.cpp old mode 100644 new mode 100755 index c2b8f5b2..9e6bf579 --- a/macosx/mac-joypad.cpp +++ b/macosx/mac-joypad.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-joypad.h b/macosx/mac-joypad.h old mode 100644 new mode 100755 index 4cdf19cb..d9761767 --- a/macosx/mac-joypad.h +++ b/macosx/mac-joypad.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-keyboard.cpp b/macosx/mac-keyboard.cpp old mode 100644 new mode 100755 index b8377e07..8ea5771b --- a/macosx/mac-keyboard.cpp +++ b/macosx/mac-keyboard.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-keyboard.h b/macosx/mac-keyboard.h old mode 100644 new mode 100755 index c10e76dd..82a9d193 --- a/macosx/mac-keyboard.h +++ b/macosx/mac-keyboard.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-multicart.cpp b/macosx/mac-multicart.cpp index ff6e1ba9..67d4f816 100644 --- a/macosx/mac-multicart.cpp +++ b/macosx/mac-multicart.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-multicart.h b/macosx/mac-multicart.h index a7ed7018..26436aa7 100644 --- a/macosx/mac-multicart.h +++ b/macosx/mac-multicart.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-musicbox.cpp b/macosx/mac-musicbox.cpp deleted file mode 100755 index 644f8122..00000000 --- a/macosx/mac-musicbox.cpp +++ /dev/null @@ -1,867 +0,0 @@ -/*********************************************************************************** - Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. - - (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), - Jerremy Koot (jkoot@snes9x.com) - - (c) Copyright 2002 - 2004 Matthew Kendora - - (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) - - (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) - - (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) - - (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), - Kris Bleakley (codeviolation@hotmail.com) - - (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), - Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) - - (c) Copyright 2006 - 2007 nitsuja - - (c) Copyright 2009 - 2010 BearOso, - OV2 - - - BS-X C emulator code - (c) Copyright 2005 - 2006 Dreamer Nom, - zones - - C4 x86 assembler and some C emulation code - (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), - Nach, - zsKnight (zsknight@zsnes.com) - - C4 C++ code - (c) Copyright 2003 - 2006 Brad Jorsch, - Nach - - DSP-1 emulator code - (c) Copyright 1998 - 2006 _Demo_, - Andreas Naive (andreasnaive@gmail.com), - Gary Henderson, - Ivar (ivar@snes9x.com), - John Weidman, - Kris Bleakley, - Matthew Kendora, - Nach, - neviksti (neviksti@hotmail.com) - - DSP-2 emulator code - (c) Copyright 2003 John Weidman, - Kris Bleakley, - Lord Nightmare (lord_nightmare@users.sourceforge.net), - Matthew Kendora, - neviksti - - DSP-3 emulator code - (c) Copyright 2003 - 2006 John Weidman, - Kris Bleakley, - Lancer, - z80 gaiden - - DSP-4 emulator code - (c) Copyright 2004 - 2006 Dreamer Nom, - John Weidman, - Kris Bleakley, - Nach, - z80 gaiden - - OBC1 emulator code - (c) Copyright 2001 - 2004 zsKnight, - pagefault (pagefault@zsnes.com), - Kris Bleakley - Ported from x86 assembler to C by sanmaiwashi - - SPC7110 and RTC C++ emulator code used in 1.39-1.51 - (c) Copyright 2002 Matthew Kendora with research by - zsKnight, - John Weidman, - Dark Force - - SPC7110 and RTC C++ emulator code used in 1.52+ - (c) Copyright 2009 byuu, - neviksti - - S-DD1 C emulator code - (c) Copyright 2003 Brad Jorsch with research by - Andreas Naive, - John Weidman - - S-RTC C emulator code - (c) Copyright 2001 - 2006 byuu, - John Weidman - - ST010 C++ emulator code - (c) Copyright 2003 Feather, - John Weidman, - Kris Bleakley, - Matthew Kendora - - Super FX x86 assembler emulator code - (c) Copyright 1998 - 2003 _Demo_, - pagefault, - zsKnight - - Super FX C emulator code - (c) Copyright 1997 - 1999 Ivar, - Gary Henderson, - John Weidman - - Sound emulator code used in 1.5-1.51 - (c) Copyright 1998 - 2003 Brad Martin - (c) Copyright 1998 - 2006 Charles Bilyue' - - Sound emulator code used in 1.52+ - (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) - - SH assembler code partly based on x86 assembler code - (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) - - 2xSaI filter - (c) Copyright 1999 - 2001 Derek Liauw Kie Fa - - HQ2x, HQ3x, HQ4x filters - (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) - - NTSC filter - (c) Copyright 2006 - 2007 Shay Green - - GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso - - Win32 GUI code - (c) Copyright 2003 - 2006 blip, - funkyass, - Matthew Kendora, - Nach, - nitsuja - (c) Copyright 2009 - 2010 OV2 - - Mac OS GUI code - (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones - - - Specific ports contains the works of other authors. See headers in - individual files. - - - Snes9x homepage: http://www.snes9x.com/ - - Permission to use, copy, modify and/or distribute Snes9x in both binary - and source form, for non-commercial purposes, is hereby granted without - fee, providing that this license information and copyright notice appear - with all copies and any derived work. - - This software is provided 'as-is', without any express or implied - warranty. In no event shall the authors be held liable for any damages - arising from the use of this software or it's derivatives. - - Snes9x is freeware for PERSONAL USE only. Commercial users should - seek permission of the copyright holders first. Commercial use includes, - but is not limited to, charging money for Snes9x or software derived from - Snes9x, including Snes9x or derivatives in commercial game bundles, and/or - using Snes9x as a promotion for your commercial product. - - The copyright holders request that bug fixes and improvements to the code - should be forwarded to them so everyone can benefit from the modifications - in future versions. - - Super NES and Super Nintendo Entertainment System are trademarks of - Nintendo Co., Limited and its subsidiary companies. - ***********************************************************************************/ - -/*********************************************************************************** - SNES9X for Mac OS (c) Copyright John Stiles - - Snes9x for Mac OS X - - (c) Copyright 2001 - 2010 zones - (c) Copyright 2002 - 2005 107 - (c) Copyright 2002 PB1400c - (c) Copyright 2004 Alexander and Sander - (c) Copyright 2004 - 2005 Steven Seeger - (c) Copyright 2005 Ryan Vogt - ***********************************************************************************/ - - -#include "snes9x.h" -#include "memmap.h" -#include "apu.h" -#include "snapshot.h" - -#include - -#include "mac-prefix.h" -#include "mac-audio.h" -#include "mac-dialog.h" -#include "mac-file.h" -#include "mac-os.h" -#include "mac-stringtools.h" -#include "mac-musicbox.h" - -const float mbxOffsetX = 0.0f, - mbxOffsetY = 0.0f, - mbxBarWidth = 12.0f, - mbxBarHeight = 128.0f, - mbxBarSpace = 2.0f, - mbxLRSpace = 20.0f, - mbxRightBarX = (mbxLRSpace + (mbxBarWidth * 8.0f + mbxBarSpace * 7.0f)), - yyscale = (float) (128.0 / sqrt(64.0)); - -extern char gMacRomName[ROM_NAME_LEN]; - -volatile Boolean mboxPause = false; - -static uint8 storedSoundSnapshot[SPC_SAVE_STATE_BLOCK_SIZE]; -static int32 oldCPUCycles; - -static short mbxOpenedHeight, mbxClosedHeight; -static float mbxMarginX, mbxMarginY, mbxViewWidth, mbxViewHeight; - -static short prevLMax[8], prevRMax[8]; -static short prevLVol[8], prevRVol[8]; -static long long barTimeL[8], barTimeR[8]; - -static pthread_t mbxThread; - -static uint16 stereo_switch; - -static volatile Boolean stopNow, showIndicator, mbxFinished, headPressed; - -static void SPCPlayExec (void); -static void SPCPlayFreeze (void); -static void SPCPlayDefrost (void); -static void MusicBoxForceFreeze (void); -static void MusicBoxForceDefrost (void); -static void MusicBoxInitIndicator (void); -static void MusicBoxDrawIndicator (HIViewRef, CGContextRef); -static void * SoundTask (void *); -static pascal void MusicBoxTimerHandler (EventLoopTimerRef, void *); -static pascal OSStatus MusicBoxEventHandler (EventHandlerCallRef, EventRef, void *); -static pascal OSStatus IndicatorEventHandler (EventHandlerCallRef, EventRef, void *); - - -void MusicBoxDialog (void) -{ - OSStatus err; - IBNibRef nibRef; - - if (!cartOpen) - return; - - err = CreateNibReference(kMacS9XCFString, &nibRef); - if (err == noErr) - { - CFURLRef iconURL; - FSRef iconFSRef; - IconRef actIcon; - WindowRef tWindowRef; - - actIcon = NULL; - - if (musicboxmode == kMBXSoundEmulation) - iconURL = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("musicbox_ledoff"), CFSTR("icns"), NULL); - else - iconURL = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("musicbox_ledon" ), CFSTR("icns"), NULL); - - if (iconURL) - { - if (CFURLGetFSRef(iconURL, &iconFSRef)) - err = RegisterIconRefFromFSRef('~9X~', 'micn', &iconFSRef, &actIcon); - - CFRelease(iconURL); - } - - err = CreateWindowFromNib(nibRef, CFSTR("MusicBox"), &tWindowRef); - if (err == noErr) - { - EventHandlerRef mboxRef, paneRef; - EventHandlerUPP mboxUPP, paneUPP; - EventLoopTimerRef timeRef; - EventLoopTimerUPP timeUPP; - EventTypeSpec mboxEvents[] = { { kEventClassCommand, kEventCommandProcess }, - { kEventClassCommand, kEventCommandUpdateStatus } }, - paneEvents[] = { { kEventClassControl, kEventControlDraw } }; - CFStringRef sref; - CGDataProviderRef prov; - CGImageRef ipng; - CFURLRef iurl; - ControlButtonContentInfo info; - HIViewRef ctl, root, paneView, imageView, contentView; - HIViewID cid; - HIRect bounds; - Rect windowRect, barRect; - char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], fname[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; - - mboxPause = false; - mbxFinished = false; - showIndicator = false; - headPressed = false; - - stereo_switch = ~0; - spc_core->dsp_set_stereo_switch(stereo_switch); - - for (int i = 0; i < MAC_MAX_PLAYERS; i++) - controlPad[i] = 0; - - // 107's enhanced SPC player - - root = HIViewGetRoot(tWindowRef); - cid.id = 0; - - if (musicboxmode == kMBXSoundEmulation) - { - cid.signature = 'HEAD'; - HIViewFindByID(root, cid, &ctl); - EnableControl(ctl); - - SPCPlayFreeze(); - } - else - MusicBoxForceFreeze(); - - cid.signature = 'Kart'; - HIViewFindByID(root, cid, &ctl); - SetStaticTextTrunc(ctl, truncEnd, false); - _splitpath(Memory.ROMFilename, drive, dir, fname, ext); - sref = CFStringCreateWithCString(kCFAllocatorDefault, fname, kCFStringEncodingUTF8); - if (sref) - { - SetStaticTextCFString(ctl, sref, false); - CFRelease(sref); - } - - ipng = NULL; - - iurl = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("musicbox_indicator"), CFSTR("png"), NULL); - if (iurl) - { - prov = CGDataProviderCreateWithURL(iurl); - if (prov) - { - ipng = CGImageCreateWithPNGDataProvider(prov, NULL, false, kCGRenderingIntentDefault); - CGDataProviderRelease(prov); - } - - CFRelease(iurl); - } - - imageView = NULL; - - if (ipng) - { - HIViewFindByID(root, kHIViewWindowContentID, &contentView); - - err = HIImageViewCreate(ipng, &imageView); - if (err == noErr) - { - bounds = CGRectMake(30, 64, CGImageGetWidth(ipng), CGImageGetHeight(ipng)); - HIViewSetFrame(imageView, &bounds); - HIImageViewSetOpaque(imageView, false); - HIViewSetVisible(imageView, true); - HIViewAddSubview(contentView, imageView); - cid.signature = 'iMaG'; - SetControlID(imageView, &cid); - } - - CGImageRelease(ipng); - } - - cid.signature = 'Pane'; - HIViewFindByID(root, cid, &paneView); - HIViewGetBounds(paneView, &bounds); - mbxViewWidth = bounds.size.width; - mbxViewHeight = bounds.size.height; - mbxMarginY = (mbxViewHeight - mbxBarHeight) / 2.0f; - mbxMarginX = (mbxViewWidth - ((mbxBarWidth * 8.0f + mbxBarSpace * 7.0f) * 2.0f + mbxLRSpace)) / 2.0f; - - if (imageView) - { - HIViewSetZOrder(imageView, kHIViewZOrderBelow, paneView); - HIViewAddSubview(imageView, paneView); - } - - if (systemVersion >= 0x1040) - { - info.contentType = kControlContentCGImageRef; - cid.signature = 'Paus'; - HIViewFindByID(root, cid, &ctl); - info.u.imageRef = macIconImage[98]; - err = SetBevelButtonContentInfo(ctl, &info); - cid.signature = 'HEAD'; - HIViewFindByID(root, cid, &ctl); - info.u.imageRef = macIconImage[99]; - err = SetBevelButtonContentInfo(ctl, &info); - cid.signature = 'S_EF'; - HIViewFindByID(root, cid, &ctl); - info.u.imageRef = macIconImage[100]; - err = SetBevelButtonContentInfo(ctl, &info); - } - #ifdef MAC_PANTHER_SUPPORT - else - { - info.contentType = kControlContentIconRef; - cid.signature = 'Paus'; - HIViewFindByID(root, cid, &ctl); - info.u.iconRef = macIconRef[98]; - err = SetBevelButtonContentInfo(ctl, &info); - cid.signature = 'HEAD'; - HIViewFindByID(root, cid, &ctl); - info.u.iconRef = macIconRef[99]; - err = SetBevelButtonContentInfo(ctl, &info); - cid.signature = 'S_EF'; - HIViewFindByID(root, cid, &ctl); - info.u.iconRef = macIconRef[100]; - err = SetBevelButtonContentInfo(ctl, &info); - } - #endif - - cid.signature = 'Tr_i'; - HIViewFindByID(root, cid, &ctl); - HIViewGetFrame(ctl, &bounds); - GetWindowBounds(tWindowRef, kWindowTitleBarRgn, &barRect); - mbxClosedHeight = (short) (bounds.origin.y + bounds.size.height + 7.0) + (barRect.bottom - barRect.top); - - GetWindowBounds(tWindowRef, kWindowStructureRgn, &windowRect); - mbxOpenedHeight = windowRect.bottom - windowRect.top; - - windowRect.bottom = windowRect.top + mbxClosedHeight; - SetWindowBounds(tWindowRef, kWindowStructureRgn, &windowRect); - - paneUPP = NewEventHandlerUPP(IndicatorEventHandler); - err = InstallControlEventHandler(paneView, paneUPP, GetEventTypeCount(paneEvents), paneEvents, (void *) paneView, &paneRef); - - mboxUPP = NewEventHandlerUPP(MusicBoxEventHandler); - err = InstallWindowEventHandler(tWindowRef, mboxUPP, GetEventTypeCount(mboxEvents), mboxEvents, (void *) tWindowRef, &mboxRef); - - timeUPP = NewEventLoopTimerUPP(MusicBoxTimerHandler); - err = InstallEventLoopTimer(GetCurrentEventLoop(), kEventDurationNoWait, kEventDurationSecond * 2.0 / (double) Memory.ROMFramesPerSecond, timeUPP, (void *) paneView, &timeRef); - - MusicBoxInitIndicator(); - - stopNow = false; - MacStartSound(); - pthread_create(&mbxThread, NULL, SoundTask, NULL); - - MoveWindowPosition(tWindowRef, kWindowMusicBox, true); - GetWindowBounds(tWindowRef, kWindowStructureRgn, &windowRect); - if (windowRect.bottom - windowRect.top > mbxClosedHeight) - { - showIndicator = true; - SetControl32BitValue(ctl, 1); // Tr_i - } - - ShowWindow(tWindowRef); - err = RunAppModalLoopForWindow(tWindowRef); - HideWindow(tWindowRef); - SaveWindowPosition(tWindowRef, kWindowMusicBox); - - stopNow = true; - pthread_join(mbxThread, NULL); - MacStopSound(); - - err = RemoveEventLoopTimer(timeRef); - DisposeEventLoopTimerUPP(timeUPP); - - err = RemoveEventHandler(mboxRef); - DisposeEventHandlerUPP(mboxUPP); - - err = RemoveEventHandler(paneRef); - DisposeEventHandlerUPP(paneUPP); - - CFRelease(tWindowRef); - - stereo_switch = ~0; - spc_core->dsp_set_stereo_switch(stereo_switch); - - mbxFinished = true; - - if (musicboxmode == kMBXSoundEmulation) - SPCPlayDefrost(); - else - MusicBoxForceDefrost(); - } - - if (actIcon) - err = UnregisterIconRef('~9X~', 'micn'); - - DisposeNibReference(nibRef); - } -} - -static pascal OSStatus MusicBoxEventHandler (EventHandlerCallRef inHandlerCallRef, EventRef inEvent, void *userData) -{ - OSStatus err, result = eventNotHandledErr; - WindowRef tWindowRef = (WindowRef) userData; - - switch (GetEventClass(inEvent)) - { - case kEventClassCommand: - { - switch (GetEventKind(inEvent)) - { - HICommand cmd; - - case kEventCommandUpdateStatus: - { - err = GetEventParameter(inEvent, kEventParamDirectObject, typeHICommand, NULL, sizeof(HICommand), NULL, &cmd); - if (err == noErr && cmd.commandID == 'clos') - { - UpdateMenuCommandStatus(false); - result = noErr; - } - - break; - } - - case kEventCommandProcess: - { - err = GetEventParameter(inEvent, kEventParamDirectObject, typeHICommand, NULL, sizeof(HICommand), NULL, &cmd); - if (err == noErr) - { - HIViewRef root, c1, c2, c3, c4; - HIViewID cid; - Rect rct; - - switch (cmd.commandID) - { - case 'bar1': stereo_switch ^= (1 << 0); result = noErr; break; - case 'bar2': stereo_switch ^= (1 << 1); result = noErr; break; - case 'bar3': stereo_switch ^= (1 << 2); result = noErr; break; - case 'bar4': stereo_switch ^= (1 << 3); result = noErr; break; - case 'bar5': stereo_switch ^= (1 << 4); result = noErr; break; - case 'bar6': stereo_switch ^= (1 << 5); result = noErr; break; - case 'bar7': stereo_switch ^= (1 << 6); result = noErr; break; - case 'bar8': stereo_switch ^= (1 << 7); result = noErr; break; - case 'bar9': stereo_switch ^= (1 << 8); result = noErr; break; - case 'bara': stereo_switch ^= (1 << 9); result = noErr; break; - case 'barb': stereo_switch ^= (1 << 10); result = noErr; break; - case 'barc': stereo_switch ^= (1 << 11); result = noErr; break; - case 'bard': stereo_switch ^= (1 << 12); result = noErr; break; - case 'bare': stereo_switch ^= (1 << 13); result = noErr; break; - case 'barf': stereo_switch ^= (1 << 14); result = noErr; break; - case 'bar0': stereo_switch ^= (1 << 15); result = noErr; break; - - case 'Paus': - { - mboxPause = !mboxPause; - S9xSetSoundMute(mboxPause); - result = noErr; - break; - } - - case 'Tr_i': - { - showIndicator = !showIndicator; - - root = HIViewGetRoot(tWindowRef); - cid.id = 0; - - cid.signature = 'Pane'; - HIViewFindByID(root, cid, &c1); - HIViewSetVisible(c1, false); - cid.signature = 'iMaG'; - HIViewFindByID(root, cid, &c2); - HIViewSetVisible(c2, false); - cid.signature = 'rCTL'; - HIViewFindByID(root, cid, &c3); - HIViewSetVisible(c3, false); - cid.signature = 'bCTL'; - HIViewFindByID(root, cid, &c4); - HIViewSetVisible(c4, false); - - GetWindowBounds(tWindowRef, kWindowStructureRgn, &rct); - rct.bottom = rct.top + (showIndicator ? mbxOpenedHeight : mbxClosedHeight); - - err = TransitionWindow(tWindowRef, kWindowSlideTransitionEffect, kWindowResizeTransitionAction, &rct); - - HIViewSetVisible(c1, true); - HIViewSetVisible(c2, true); - HIViewSetVisible(c3, true); - HIViewSetVisible(c4, true); - - result = noErr; - break; - } - - case 'DONE': - { - QuitAppModalLoopForWindow(tWindowRef); - result = noErr; - break; - } - - case 'HEAD': - { - headPressed = true; - result = noErr; - break; - } - - case 'S_EF': - { - HideWindow(tWindowRef); - showIndicator = !showIndicator; - ConfigureSoundEffects(); - showIndicator = !showIndicator; - ShowWindow(tWindowRef); - result = noErr; - } - } - - spc_core->dsp_set_stereo_switch(stereo_switch); - } - } - } - } - } - - return (result); -} - -static void * SoundTask (void *) -{ - static long long last; - long long curt; - - Microseconds((UnsignedWide *) &last); - - while (!stopNow) - { - if (!mboxPause) - { - if (musicboxmode == kMBXSoundEmulation) - SPCPlayExec(); - else - S9xMainLoop(); - } - - if (headPressed) - { - showIndicator = !showIndicator; - SPCPlayDefrost(); - showIndicator = !showIndicator; - headPressed = false; - } - - last += (1000000 / Memory.ROMFramesPerSecond); - Microseconds((UnsignedWide *) &curt); - - if (last > curt) - usleep((useconds_t) (last - curt)); - } - - return (NULL); -} - -static void SPCPlayExec (void) -{ - for (int v = 0; v < Timings.V_Max; v++) - { - CPU.Cycles = Timings.H_Max; - S9xAPUEndScanline(); - CPU.Cycles = 0; - S9xAPUSetReferenceTime(0); - } -} - -static void MusicBoxForceFreeze (void) -{ - char filename[PATH_MAX + 1]; - - strcpy(filename, S9xGetFreezeFilename(999)); - strcat(filename, ".tmp"); - - S9xFreezeGame(filename); -} - -static void MusicBoxForceDefrost (void) -{ - char filename[PATH_MAX + 1]; - - strcpy(filename, S9xGetFreezeFilename(999)); - strcat(filename, ".tmp"); - - S9xUnfreezeGame(filename); - remove(filename); -} - -static void SPCPlayFreeze (void) -{ - oldCPUCycles = CPU.Cycles; - CPU.Cycles = Timings.H_Max; - - S9xSetSoundMute(true); - S9xAPUSaveState(storedSoundSnapshot); - S9xSetSoundMute(false); -} - -static void SPCPlayDefrost (void) -{ - CPU.Cycles = oldCPUCycles; - - S9xSetSoundMute(true); - S9xAPULoadState(storedSoundSnapshot); - S9xSetSoundMute(false); -} - -static void MusicBoxInitIndicator (void) -{ - long long currentTime; - - Microseconds((UnsignedWide *) ¤tTime); - - for (int i = 0; i < 8; i++) - { - prevLMax[i] = prevRMax[i] = 0; - prevLVol[i] = prevRVol[i] = 0; - barTimeL[i] = barTimeR[i] = currentTime; - } -} - -static pascal void MusicBoxTimerHandler (EventLoopTimerRef inHandlerCallRef, void *userData) -{ - OSStatus err; - - if (showIndicator) - err = HIViewSetNeedsDisplay((HIViewRef) userData, true); -} - -static pascal OSStatus IndicatorEventHandler (EventHandlerCallRef inHandlerCallRef, EventRef inEvent, void *userData) -{ - OSStatus err, result = eventNotHandledErr; - HIViewRef view = (HIViewRef) userData; - - switch (GetEventClass(inEvent)) - { - case kEventClassControl: - switch (GetEventKind(inEvent)) - { - case kEventControlDraw: - CGContextRef ctx; - - err = GetEventParameter(inEvent, kEventParamCGContextRef, typeCGContextRef, NULL, sizeof(CGContextRef), NULL, &ctx); - if (err == noErr) - { - HIRect bounds; - - HIViewGetBounds(view, &bounds); - CGContextTranslateCTM(ctx, 0, bounds.size.height); - CGContextScaleCTM(ctx, 1.0f, -1.0f); - MusicBoxDrawIndicator(view, ctx); - - result = noErr; - } - } - } - - return (result); -} - -static void MusicBoxDrawIndicator (HIViewRef view, CGContextRef mboxctx) -{ - if (!showIndicator) - return; - - // Bar - - const float length[] = { 1.0f, 1.0f }; - - CGContextSetLineWidth(mboxctx, mbxBarWidth); - CGContextSetLineDash(mboxctx, 0, length, 2); - CGContextSetLineJoin(mboxctx, kCGLineJoinMiter); - - CGContextBeginPath(mboxctx); - - float x = mbxOffsetX + mbxMarginX + mbxBarWidth / 2.0f; - - for (int h = 0; h < 8; h++) - { - // Inactive - - CGContextSetRGBStrokeColor(mboxctx, (196.0f / 256.0f), (200.0f / 256.0f), (176.0f / 256.0f), 1.0f); - - CGContextMoveToPoint (mboxctx, x, mbxOffsetY + mbxMarginY); - CGContextAddLineToPoint(mboxctx, x, mbxOffsetY + mbxMarginY + mbxBarHeight); - - CGContextMoveToPoint (mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY); - CGContextAddLineToPoint(mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + mbxBarHeight); - - CGContextStrokePath(mboxctx); - - // Max - - short vl = (spc_core->dsp_reg_value(h, 0x00) * spc_core->dsp_envx_value(h)) >> 11; - short vr = (spc_core->dsp_reg_value(h, 0x01) * spc_core->dsp_envx_value(h)) >> 11; - long long currentTime; - - if (vl <= 0) vl = 0; else if (vl > 64) vl = 64; else vl = (short) (yyscale * sqrt((double) vl)) & (~0 << 1); - if (vr <= 0) vr = 0; else if (vr > 64) vr = 64; else vr = (short) (yyscale * sqrt((double) vr)) & (~0 << 1); - - if (vl < prevLVol[h]) vl = ((prevLVol[h] + vl) >> 1); - if (vr < prevRVol[h]) vr = ((prevRVol[h] + vr) >> 1); - - Microseconds((UnsignedWide *) ¤tTime); - - // left - - if ((vl >= prevLMax[h]) && (vl > prevLVol[h])) - { - barTimeL[h] = currentTime; - prevLMax[h] = vl; - } - else - if ((prevLMax[h] > 0) && (barTimeL[h] + 1000000 > currentTime)) - { - CGContextSetRGBStrokeColor(mboxctx, (22.0f / 256.0f), (156.0f / 256.0f), (20.0f / 256.0f), (float) (barTimeL[h] + 1000000 - currentTime) / 1000000.0f); - - CGContextMoveToPoint (mboxctx, x, mbxOffsetY + mbxMarginY + (float) (prevLMax[h] - 2)); - CGContextAddLineToPoint(mboxctx, x, mbxOffsetY + mbxMarginY + (float) (prevLMax[h] )); - - CGContextStrokePath(mboxctx); - } - else - prevLMax[h] = 0; - - prevLVol[h] = vl; - - // right - - if ((vr >= prevRMax[h]) && (vr > prevRVol[h])) - { - barTimeR[h] = currentTime; - prevRMax[h] = vr; - } - else - if ((prevRMax[h] > 0) && (barTimeR[h] + 1000000 > currentTime)) - { - CGContextSetRGBStrokeColor(mboxctx, (22.0f / 256.0f), (156.0f / 256.0f), (20.0f / 256.0f), (float) (barTimeR[h] + 1000000 - currentTime) / 1000000.0f); - - CGContextMoveToPoint (mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + (float) (prevRMax[h] - 2)); - CGContextAddLineToPoint(mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + (float) (prevRMax[h] )); - - CGContextStrokePath(mboxctx); - } - else - prevRMax[h] = 0; - - prevRVol[h] = vr; - - // Active - - CGContextSetRGBStrokeColor(mboxctx, (22.0f / 256.0f), (22.0f / 256.0f), (20.0f / 256.0f), 1.0f); - - CGContextMoveToPoint (mboxctx, x, mbxOffsetY + mbxMarginY); - CGContextAddLineToPoint(mboxctx, x, mbxOffsetY + mbxMarginY + (float) vl); - CGContextStrokePath(mboxctx); - CGContextMoveToPoint (mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY); - CGContextAddLineToPoint(mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + (float) vr); - CGContextStrokePath(mboxctx); - - x += (mbxBarWidth + mbxBarSpace); - } -} diff --git a/macosx/mac-musicbox.h b/macosx/mac-musicbox.h old mode 100644 new mode 100755 index c50879f7..786c051e --- a/macosx/mac-musicbox.h +++ b/macosx/mac-musicbox.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander @@ -194,6 +195,65 @@ #define kMBXSoundEmulation 1 #define kMBXWholeEmulation 2 +@interface MusicBoxController : NSObject +{ + IBOutlet id window; + IBOutlet id gametitle; + IBOutlet id disclosure; + IBOutlet id rewind; + IBOutlet id indicator; + IBOutlet id led; + + float mbxClosedHeight, + mbxOpenedHeight; + + NSTimer *timer; + pthread_t mbxThread; +} + +- (id) init; +- (void) dealloc; +- (void) windowWillClose: (NSNotification *) aNotification; +- (NSWindow *) window; +- (IBAction) handlePauseButton: (id) sender; +- (IBAction) handleRewindButton: (id) sender; +- (IBAction) handleEffectButton: (id) sender; +- (IBAction) handleChannelButton: (id) sender; +- (IBAction) handleDisclosureButton: (id) sender; +- (void) updateIndicator: (NSTimer *) aTimer; + +@end + +@interface MusicBoxIndicatorView : NSView +{ + float mbxOffsetX, + mbxOffsetY, + mbxBarWidth, + mbxBarHeight, + mbxBarSpace, + mbxLRSpace, + mbxRightBarX, + yyscale; + + float mbxViewWidth, + mbxViewHeight, + mbxMarginX, + mbxMarginY; + + short prevLMax[8], + prevRMax[8], + prevLVol[8], + prevRVol[8]; + + long long barTimeL[8], + barTimeR[8]; +} + +- (id) initWithFrame: (NSRect) frame; +- (void) drawRect: (NSRect) rect; + +@end + extern volatile Boolean mboxPause; void MusicBoxDialog (void); diff --git a/macosx/mac-musicbox.mm b/macosx/mac-musicbox.mm new file mode 100755 index 00000000..3ad4caf3 --- /dev/null +++ b/macosx/mac-musicbox.mm @@ -0,0 +1,647 @@ +/*********************************************************************************** + Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. + + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), + Jerremy Koot (jkoot@snes9x.com) + + (c) Copyright 2002 - 2004 Matthew Kendora + + (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) + + (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) + + (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) + + (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), + Kris Bleakley (codeviolation@hotmail.com) + + (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), + Nach (n-a-c-h@users.sourceforge.net), + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2006 - 2007 nitsuja + + (c) Copyright 2009 - 2011 BearOso, + OV2 + + + BS-X C emulator code + (c) Copyright 2005 - 2006 Dreamer Nom, + zones + + C4 x86 assembler and some C emulation code + (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), + Nach, + zsKnight (zsknight@zsnes.com) + + C4 C++ code + (c) Copyright 2003 - 2006 Brad Jorsch, + Nach + + DSP-1 emulator code + (c) Copyright 1998 - 2006 _Demo_, + Andreas Naive (andreasnaive@gmail.com), + Gary Henderson, + Ivar (ivar@snes9x.com), + John Weidman, + Kris Bleakley, + Matthew Kendora, + Nach, + neviksti (neviksti@hotmail.com) + + DSP-2 emulator code + (c) Copyright 2003 John Weidman, + Kris Bleakley, + Lord Nightmare (lord_nightmare@users.sourceforge.net), + Matthew Kendora, + neviksti + + DSP-3 emulator code + (c) Copyright 2003 - 2006 John Weidman, + Kris Bleakley, + Lancer, + z80 gaiden + + DSP-4 emulator code + (c) Copyright 2004 - 2006 Dreamer Nom, + John Weidman, + Kris Bleakley, + Nach, + z80 gaiden + + OBC1 emulator code + (c) Copyright 2001 - 2004 zsKnight, + pagefault (pagefault@zsnes.com), + Kris Bleakley + Ported from x86 assembler to C by sanmaiwashi + + SPC7110 and RTC C++ emulator code used in 1.39-1.51 + (c) Copyright 2002 Matthew Kendora with research by + zsKnight, + John Weidman, + Dark Force + + SPC7110 and RTC C++ emulator code used in 1.52+ + (c) Copyright 2009 byuu, + neviksti + + S-DD1 C emulator code + (c) Copyright 2003 Brad Jorsch with research by + Andreas Naive, + John Weidman + + S-RTC C emulator code + (c) Copyright 2001 - 2006 byuu, + John Weidman + + ST010 C++ emulator code + (c) Copyright 2003 Feather, + John Weidman, + Kris Bleakley, + Matthew Kendora + + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 _Demo_, + pagefault, + zsKnight + + Super FX C emulator code + (c) Copyright 1997 - 1999 Ivar, + Gary Henderson, + John Weidman + + Sound emulator code used in 1.5-1.51 + (c) Copyright 1998 - 2003 Brad Martin + (c) Copyright 1998 - 2006 Charles Bilyue' + + Sound emulator code used in 1.52+ + (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) + + SH assembler code partly based on x86 assembler code + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + + 2xSaI filter + (c) Copyright 1999 - 2001 Derek Liauw Kie Fa + + HQ2x, HQ3x, HQ4x filters + (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) + + NTSC filter + (c) Copyright 2006 - 2007 Shay Green + + GTK+ GUI code + (c) Copyright 2004 - 2011 BearOso + + Win32 GUI code + (c) Copyright 2003 - 2006 blip, + funkyass, + Matthew Kendora, + Nach, + nitsuja + (c) Copyright 2009 - 2011 OV2 + + Mac OS GUI code + (c) Copyright 1998 - 2001 John Stiles + (c) Copyright 2001 - 2011 zones + + + Specific ports contains the works of other authors. See headers in + individual files. + + + Snes9x homepage: http://www.snes9x.com/ + + Permission to use, copy, modify and/or distribute Snes9x in both binary + and source form, for non-commercial purposes, is hereby granted without + fee, providing that this license information and copyright notice appear + with all copies and any derived work. + + This software is provided 'as-is', without any express or implied + warranty. In no event shall the authors be held liable for any damages + arising from the use of this software or it's derivatives. + + Snes9x is freeware for PERSONAL USE only. Commercial users should + seek permission of the copyright holders first. Commercial use includes, + but is not limited to, charging money for Snes9x or software derived from + Snes9x, including Snes9x or derivatives in commercial game bundles, and/or + using Snes9x as a promotion for your commercial product. + + The copyright holders request that bug fixes and improvements to the code + should be forwarded to them so everyone can benefit from the modifications + in future versions. + + Super NES and Super Nintendo Entertainment System are trademarks of + Nintendo Co., Limited and its subsidiary companies. + ***********************************************************************************/ + +/*********************************************************************************** + SNES9X for Mac OS (c) Copyright John Stiles + + Snes9x for Mac OS X + + (c) Copyright 2001 - 2011 zones + (c) Copyright 2002 - 2005 107 + (c) Copyright 2002 PB1400c + (c) Copyright 2004 Alexander and Sander + (c) Copyright 2004 - 2005 Steven Seeger + (c) Copyright 2005 Ryan Vogt + ***********************************************************************************/ + + +#import "snes9x.h" +#import "memmap.h" +#import "apu.h" +#import "snapshot.h" + +#import +#import +#import + +#import "mac-prefix.h" +#import "mac-audio.h" +#import "mac-file.h" +#import "mac-os.h" +#import "mac-musicbox.h" + +volatile bool8 mboxPause = false; + +static volatile bool8 stopNow, showIndicator, headPressed; +static int32 oldCPUCycles; +static uint16 stereo_switch; +static uint8 storedSoundSnapshot[SPC_SAVE_STATE_BLOCK_SIZE]; + +static void SPCPlayExec (void); +static void SPCPlayFreeze (void); +static void SPCPlayDefrost (void); +static void MusicBoxForceFreeze (void); +static void MusicBoxForceDefrost (void); +static void * SoundTask (void *); + + +@implementation MusicBoxController + +- (id) init +{ + NSUserDefaults *defaults; + NSString *s; + NSRect rect; + NSSize size; + BOOL apuonly, r; + char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], fname[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; + + self = [super init]; + if (!self) + return (self); + + r = [NSBundle loadNibNamed: @"musicbox" owner: self]; + if (!r) + return (self); + + apuonly = (musicboxmode == kMBXSoundEmulation); + + if (apuonly) + SPCPlayFreeze(); + else + MusicBoxForceFreeze(); + + _splitpath(Memory.ROMFilename, drive, dir, fname, ext); + [gametitle setStringValue: [NSString stringWithUTF8String: fname]]; + + [led setImage: [NSImage imageNamed: (apuonly ? @"musicbox_ledoff.icns" : @"musicbox_ledon.icns")]]; + + if (!apuonly) + { + [rewind setState: NSOffState]; + [rewind setEnabled: NO]; + } + + defaults = [NSUserDefaults standardUserDefaults]; + s = [defaults stringForKey: @"frame_musicbox"]; + if (s) + { + rect = NSRectFromString(s); + [window setFrame: rect display: NO]; + } + + if (!savewindowpos) + [window center]; + + size = [window minSize]; + mbxClosedHeight = size.height; + size = [window maxSize]; + mbxOpenedHeight = size.height; + + rect = [window frame]; + showIndicator = (rect.size.height > mbxClosedHeight) ? true : false; + + [disclosure setState: (showIndicator ? NSOnState : NSOffState)]; + + [window makeKeyAndOrderFront: self]; + + mboxPause = false; + headPressed = false; + + stereo_switch = ~0; + spc_core->dsp_set_stereo_switch(stereo_switch); + + for (int i = 0; i < MAC_MAX_PLAYERS; i++) + controlPad[i] = 0; + + stopNow = false; + MacStartSound(); + pthread_create(&mbxThread, NULL, SoundTask, NULL); + + timer = [[NSTimer scheduledTimerWithTimeInterval: (2.0 / (double) Memory.ROMFramesPerSecond) target: self selector: @selector(updateIndicator:) userInfo: nil repeats: YES] retain]; + + return (self); +} + +- (void) windowWillClose: (NSNotification *) aNotification +{ + NSUserDefaults *defaults; + NSString *s; + BOOL r; + + [timer invalidate]; + [timer release]; + + showIndicator = false; + + stopNow = true; + pthread_join(mbxThread, NULL); + MacStopSound(); + + defaults = [NSUserDefaults standardUserDefaults]; + s = NSStringFromRect([window frame]); + [defaults setObject: s forKey: @"frame_musicbox"]; + r = [defaults synchronize]; + + [NSApp stopModal]; +} + +- (void) dealloc +{ + stereo_switch = ~0; + spc_core->dsp_set_stereo_switch(stereo_switch); + + if (musicboxmode == kMBXSoundEmulation) + SPCPlayDefrost(); + else + MusicBoxForceDefrost(); + + [window release]; + + [super dealloc]; +} + +- (NSWindow *) window +{ + return (window); +} + +- (IBAction) handlePauseButton: (id) sender +{ + mboxPause = !mboxPause; + S9xSetSoundMute(mboxPause); +} + +- (IBAction) handleRewindButton: (id) sender +{ + headPressed = true; +} + +- (IBAction) handleEffectButton: (id) sender +{ + [window orderOut: self]; + showIndicator = false; + ConfigureSoundEffects(); + showIndicator = true; + [window makeKeyAndOrderFront: self]; +} + +- (IBAction) handleChannelButton: (id) sender +{ + stereo_switch ^= (1 << [sender tag]); + spc_core->dsp_set_stereo_switch(stereo_switch); +} + +- (IBAction) handleDisclosureButton: (id) sender +{ + NSRect rect; + float h; + + showIndicator = !showIndicator; + rect = [window frame]; + h = rect.size.height; + rect.size.height = showIndicator ? mbxOpenedHeight : mbxClosedHeight; + rect.origin.y += (h - rect.size.height); + [window setFrame: rect display: YES animate: YES]; +} + +- (void) updateIndicator: (NSTimer *) aTimer +{ + if (showIndicator) + [indicator setNeedsDisplay: YES]; +} + +@end + +@implementation MusicBoxIndicatorView + +- (id) initWithFrame: (NSRect) frame +{ + self = [super initWithFrame: frame]; + if (self) + { + NSRect rect; + long long currentTime; + struct timeval tv; + + mbxOffsetX = 0.0f; + mbxOffsetY = 0.0f; + mbxBarWidth = 12.0f; + mbxBarHeight = 128.0f; + mbxBarSpace = 2.0f; + mbxLRSpace = 20.0f; + mbxRightBarX = (mbxLRSpace + (mbxBarWidth * 8.0f + mbxBarSpace * 7.0f)); + yyscale = (float) (128.0 / sqrt(64.0)); + + rect = [self bounds]; + mbxViewWidth = rect.size.width; + mbxViewHeight = rect.size.height; + mbxMarginX = (mbxViewWidth - ((mbxBarWidth * 8.0f + mbxBarSpace * 7.0f) * 2.0f + mbxLRSpace)) / 2.0f; + mbxMarginY = (mbxViewHeight - mbxBarHeight) / 2.0f; + + gettimeofday(&tv, NULL); + currentTime = tv.tv_sec * 1000000 + tv.tv_usec; + + for (int i = 0; i < 8; i++) + { + prevLMax[i] = prevRMax[i] = 0; + prevLVol[i] = prevRVol[i] = 0; + barTimeL[i] = barTimeR[i] = currentTime; + } + } + + return (self); +} + +- (void) drawRect: (NSRect) rect +{ + CGContextRef mboxctx; + + mboxctx = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; + + // Bar + + const float length[] = { 1.0f, 1.0f }; + + CGContextSetLineWidth(mboxctx, mbxBarWidth); + CGContextSetLineDash(mboxctx, 0, length, 2); + CGContextSetLineJoin(mboxctx, kCGLineJoinMiter); + + CGContextBeginPath(mboxctx); + + float x = mbxOffsetX + mbxMarginX + mbxBarWidth / 2.0f; + + for (int h = 0; h < 8; h++) + { + // Inactive + + CGContextSetRGBStrokeColor(mboxctx, (196.0f / 256.0f), (200.0f / 256.0f), (176.0f / 256.0f), 1.0f); + + CGContextMoveToPoint (mboxctx, x, mbxOffsetY + mbxMarginY); + CGContextAddLineToPoint(mboxctx, x, mbxOffsetY + mbxMarginY + mbxBarHeight); + + CGContextMoveToPoint (mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY); + CGContextAddLineToPoint(mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + mbxBarHeight); + + CGContextStrokePath(mboxctx); + + // Max + + short vl = (spc_core->dsp_reg_value(h, 0x00) * spc_core->dsp_envx_value(h)) >> 11; + short vr = (spc_core->dsp_reg_value(h, 0x01) * spc_core->dsp_envx_value(h)) >> 11; + long long currentTime; + struct timeval tv; + + if (vl <= 0) vl = 0; else if (vl > 64) vl = 64; else vl = (short) (yyscale * sqrt((double) vl)) & (~0 << 1); + if (vr <= 0) vr = 0; else if (vr > 64) vr = 64; else vr = (short) (yyscale * sqrt((double) vr)) & (~0 << 1); + + if (vl < prevLVol[h]) vl = ((prevLVol[h] + vl) >> 1); + if (vr < prevRVol[h]) vr = ((prevRVol[h] + vr) >> 1); + + gettimeofday(&tv, NULL); + currentTime = tv.tv_sec * 1000000 + tv.tv_usec; + + // left + + if ((vl >= prevLMax[h]) && (vl > prevLVol[h])) + { + barTimeL[h] = currentTime; + prevLMax[h] = vl; + } + else + if ((prevLMax[h] > 0) && (barTimeL[h] + 1000000 > currentTime)) + { + CGContextSetRGBStrokeColor(mboxctx, (22.0f / 256.0f), (156.0f / 256.0f), (20.0f / 256.0f), (float) (barTimeL[h] + 1000000 - currentTime) / 1000000.0f); + + CGContextMoveToPoint (mboxctx, x, mbxOffsetY + mbxMarginY + (float) (prevLMax[h] - 2)); + CGContextAddLineToPoint(mboxctx, x, mbxOffsetY + mbxMarginY + (float) (prevLMax[h] )); + + CGContextStrokePath(mboxctx); + } + else + prevLMax[h] = 0; + + prevLVol[h] = vl; + + // right + + if ((vr >= prevRMax[h]) && (vr > prevRVol[h])) + { + barTimeR[h] = currentTime; + prevRMax[h] = vr; + } + else + if ((prevRMax[h] > 0) && (barTimeR[h] + 1000000 > currentTime)) + { + CGContextSetRGBStrokeColor(mboxctx, (22.0f / 256.0f), (156.0f / 256.0f), (20.0f / 256.0f), (float) (barTimeR[h] + 1000000 - currentTime) / 1000000.0f); + + CGContextMoveToPoint (mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + (float) (prevRMax[h] - 2)); + CGContextAddLineToPoint(mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + (float) (prevRMax[h] )); + + CGContextStrokePath(mboxctx); + } + else + prevRMax[h] = 0; + + prevRVol[h] = vr; + + // Active + + CGContextSetRGBStrokeColor(mboxctx, (22.0f / 256.0f), (22.0f / 256.0f), (20.0f / 256.0f), 1.0f); + + CGContextMoveToPoint (mboxctx, x, mbxOffsetY + mbxMarginY); + CGContextAddLineToPoint(mboxctx, x, mbxOffsetY + mbxMarginY + (float) vl); + CGContextStrokePath(mboxctx); + CGContextMoveToPoint (mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY); + CGContextAddLineToPoint(mboxctx, x + mbxRightBarX, mbxOffsetY + mbxMarginY + (float) vr); + CGContextStrokePath(mboxctx); + + x += (mbxBarWidth + mbxBarSpace); + } +} + +@end + +static void * SoundTask (void *) +{ + long long last, curr; + struct timeval tv; + + gettimeofday(&tv, NULL); + last = tv.tv_sec * 1000000 + tv.tv_usec; + + while (!stopNow) + { + if (!mboxPause) + { + if (musicboxmode == kMBXSoundEmulation) + SPCPlayExec(); + else + S9xMainLoop(); + } + + if (headPressed) + { + showIndicator = false; + SPCPlayDefrost(); + showIndicator = true; + + headPressed = false; + } + + last += (1000000 / Memory.ROMFramesPerSecond); + gettimeofday(&tv, NULL); + curr = tv.tv_sec * 1000000 + tv.tv_usec; + + if (last > curr) + usleep((useconds_t) (last - curr)); + } + + return (NULL); +} + +static void SPCPlayExec (void) +{ + for (int v = 0; v < Timings.V_Max; v++) + { + CPU.Cycles = Timings.H_Max; + S9xAPUEndScanline(); + CPU.Cycles = 0; + S9xAPUSetReferenceTime(0); + } +} + +static void MusicBoxForceFreeze (void) +{ + char filename[PATH_MAX + 1]; + + strcpy(filename, S9xGetFreezeFilename(999)); + strcat(filename, ".tmp"); + + S9xFreezeGame(filename); +} + +static void MusicBoxForceDefrost (void) +{ + char filename[PATH_MAX + 1]; + + strcpy(filename, S9xGetFreezeFilename(999)); + strcat(filename, ".tmp"); + + S9xUnfreezeGame(filename); + remove(filename); +} + +static void SPCPlayFreeze (void) +{ + oldCPUCycles = CPU.Cycles; + + S9xSetSoundMute(true); + S9xAPUSaveState(storedSoundSnapshot); + S9xSetSoundMute(false); +} + +static void SPCPlayDefrost (void) +{ + CPU.Cycles = oldCPUCycles; + + S9xSetSoundMute(true); + S9xAPULoadState(storedSoundSnapshot); + S9xSetSoundMute(false); +} + +void MusicBoxDialog (void) +{ + MusicBoxController *controller; + NSAutoreleasePool *pool; + + if (!cartOpen) + return; + + pool = [[NSAutoreleasePool alloc] init]; + controller = [[MusicBoxController alloc] init]; + [pool release]; + + if (!controller) + return; + + [NSApp runModalForWindow: [controller window]]; + + pool = [[NSAutoreleasePool alloc] init]; + [controller release]; + [pool release]; +} diff --git a/macosx/mac-netplay.cpp b/macosx/mac-netplay.cpp index 0207c9f6..4479b259 100644 --- a/macosx/mac-netplay.cpp +++ b/macosx/mac-netplay.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-netplay.h b/macosx/mac-netplay.h index 9b788fb8..d063f823 100644 --- a/macosx/mac-netplay.h +++ b/macosx/mac-netplay.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-os.h b/macosx/mac-os.h index f25bb334..e5d78b5f 100644 --- a/macosx/mac-os.h +++ b/macosx/mac-os.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander @@ -204,7 +205,6 @@ enum kWindowPreferences, kWindowAbout, kWindowAutoFire, - kWindowMusicBox, kWindowRomInfo, kWindowCheatFinder, kWindowKeyConfig, diff --git a/macosx/mac-os.mm b/macosx/mac-os.mm index b35f27a1..32fb4861 100644 --- a/macosx/mac-os.mm +++ b/macosx/mac-os.mm @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander @@ -530,19 +531,25 @@ static pascal OSStatus GameWindowUserPaneEventHandler (EventHandlerCallRef, Even int main (int argc, char **argv) { - OSStatus err; - EventHandlerRef eref; - EventHandlerUPP eUPP; - EventTypeSpec mEvents[] = { { kEventClassCommand, kEventCommandProcess }, - { kEventClassCommand, kEventCommandUpdateStatus } }, - sEvents[] = { { kEventClassCommand, kEventCommandProcess }, - { kEventClassCommand, kEventCommandUpdateStatus }, - { kEventClassMouse, kEventMouseUp }, - { kEventClassMouse, kEventMouseMoved }, - { kEventClassMouse, kEventMouseDragged } }; +#ifdef MAC_PANTHER_SUPPORT + NSAutoreleasePool *pool; +#endif + OSStatus err; + EventHandlerRef eref; + EventHandlerUPP eUPP; + EventTypeSpec mEvents[] = { { kEventClassCommand, kEventCommandProcess }, + { kEventClassCommand, kEventCommandUpdateStatus } }, + sEvents[] = { { kEventClassCommand, kEventCommandProcess }, + { kEventClassCommand, kEventCommandUpdateStatus }, + { kEventClassMouse, kEventMouseUp }, + { kEventClassMouse, kEventMouseMoved }, + { kEventClassMouse, kEventMouseDragged } }; +#ifdef MAC_PANTHER_SUPPORT + pool = [[NSAutoreleasePool alloc] init]; +#endif eUPP = NewEventHandlerUPP(MainEventHandler); - err = InstallApplicationEventHandler(eUPP, GetEventTypeCount(mEvents), mEvents, NULL, &eref); + err = InstallApplicationEventHandler(eUPP, GetEventTypeCount(mEvents), mEvents, NULL, &eref); Initialize(); @@ -566,7 +573,11 @@ int main (int argc, char **argv) err = RemoveEventHandler(eref); DisposeEventHandlerUPP(eUPP); + #ifdef MAC_PANTHER_SUPPORT + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; + #endif eUPP = NewEventHandlerUPP(SubEventHandler); err = InstallApplicationEventHandler(eUPP, GetEventTypeCount(sEvents), sEvents, NULL, &eref); @@ -627,7 +638,11 @@ int main (int argc, char **argv) err = RemoveEventHandler(eref); DisposeEventHandlerUPP(eUPP); + #ifdef MAC_PANTHER_SUPPORT + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; + #endif eUPP = NewEventHandlerUPP(MainEventHandler); err = InstallApplicationEventHandler(eUPP, GetEventTypeCount(mEvents), mEvents, NULL, &eref); } @@ -642,7 +657,10 @@ int main (int argc, char **argv) Deinitialize(); err = RemoveEventHandler(eref); - DisposeEventHandlerUPP(eUPP); + DisposeEventHandlerUPP(eUPP); +#ifdef MAC_PANTHER_SUPPORT + [pool release]; +#endif return (0); } diff --git a/macosx/mac-prefix.h b/macosx/mac-prefix.h index 448cd0c3..23ff58f1 100755 --- a/macosx/mac-prefix.h +++ b/macosx/mac-prefix.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander @@ -196,7 +197,7 @@ #define kMacS9XCFString CFSTR("Snes9x") -#define MAC_VERSION "102" +#define MAC_VERSION "112" #include diff --git a/macosx/mac-prefs.cpp b/macosx/mac-prefs.cpp index 1d5aa4d8..36ca925b 100755 --- a/macosx/mac-prefs.cpp +++ b/macosx/mac-prefs.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander @@ -361,9 +362,9 @@ static PrefList prefList[] = { 'chea', &applycheat, sizeof(bool8 ) }, { 'ARec', autofireRec, sizeof(autofireRec) }, - { 'WPos', windowPos, sizeof(windowPos ) }, - { 'WSiz', windowSize, sizeof(windowSize ) }, - { 'WExt', (void *) &windowExtend, sizeof(bool8 ) }, + { 'wPos', windowPos, sizeof(windowPos ) }, + { 'wSiz', windowSize, sizeof(windowSize ) }, + { 'wExt', (void *) &windowExtend, sizeof(bool8 ) }, { 'NPIP', npServerIP, sizeof(npServerIP ) }, { 'NPNM', npName, sizeof(npName ) }, diff --git a/macosx/mac-prefs.h b/macosx/mac-prefs.h old mode 100644 new mode 100755 index d3ff8d07..269fc7e5 --- a/macosx/mac-prefs.h +++ b/macosx/mac-prefs.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-quicktime.cpp b/macosx/mac-quicktime.cpp index 7692a934..d90969b5 100644 --- a/macosx/mac-quicktime.cpp +++ b/macosx/mac-quicktime.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-quicktime.h b/macosx/mac-quicktime.h index f5249856..ec6fedcc 100644 --- a/macosx/mac-quicktime.h +++ b/macosx/mac-quicktime.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-render.cpp b/macosx/mac-render.cpp index 60341293..155401a8 100644 --- a/macosx/mac-render.cpp +++ b/macosx/mac-render.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-render.h b/macosx/mac-render.h index 5e0880a8..472ba4ee 100644 --- a/macosx/mac-render.h +++ b/macosx/mac-render.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-screenshot.cpp b/macosx/mac-screenshot.cpp index f35bb219..e44bfba7 100644 --- a/macosx/mac-screenshot.cpp +++ b/macosx/mac-screenshot.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-screenshot.h b/macosx/mac-screenshot.h index 6cba7cf8..091b4aed 100644 --- a/macosx/mac-screenshot.h +++ b/macosx/mac-screenshot.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-server.cpp b/macosx/mac-server.cpp index 659cb2c5..4a1502e8 100644 --- a/macosx/mac-server.cpp +++ b/macosx/mac-server.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-server.h b/macosx/mac-server.h index d94bc10b..91f344c9 100644 --- a/macosx/mac-server.h +++ b/macosx/mac-server.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-snes9x.cpp b/macosx/mac-snes9x.cpp index 388e077f..77be6ee0 100755 --- a/macosx/mac-snes9x.cpp +++ b/macosx/mac-snes9x.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-snes9x.h b/macosx/mac-snes9x.h index 3e631d12..3fd33516 100755 --- a/macosx/mac-snes9x.h +++ b/macosx/mac-snes9x.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-stringtools.cpp b/macosx/mac-stringtools.cpp old mode 100644 new mode 100755 index 7de4c273..ef8fd7a6 --- a/macosx/mac-stringtools.cpp +++ b/macosx/mac-stringtools.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/mac-stringtools.h b/macosx/mac-stringtools.h old mode 100644 new mode 100755 index ec89d955..667b9d0f --- a/macosx/mac-stringtools.h +++ b/macosx/mac-stringtools.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -179,7 +180,7 @@ Snes9x for Mac OS X - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones (c) Copyright 2002 - 2005 107 (c) Copyright 2002 PB1400c (c) Copyright 2004 Alexander and Sander diff --git a/macosx/musicbox_effect.png b/macosx/musicbox_effect.png new file mode 100644 index 00000000..4ed8c771 Binary files /dev/null and b/macosx/musicbox_effect.png differ diff --git a/macosx/musicbox_indicator.png b/macosx/musicbox_indicator.png index 58c232d2..3dd42062 100644 Binary files a/macosx/musicbox_indicator.png and b/macosx/musicbox_indicator.png differ diff --git a/macosx/musicbox_pause.png b/macosx/musicbox_pause.png new file mode 100644 index 00000000..64a20e5b Binary files /dev/null and b/macosx/musicbox_pause.png differ diff --git a/macosx/musicbox_rewind.png b/macosx/musicbox_rewind.png new file mode 100644 index 00000000..4a0ce1aa Binary files /dev/null and b/macosx/musicbox_rewind.png differ diff --git a/macosx/snes9x.xcodeproj/project.pbxproj b/macosx/snes9x.xcodeproj/project.pbxproj index 09e4016a..000d5ddd 100755 --- a/macosx/snes9x.xcodeproj/project.pbxproj +++ b/macosx/snes9x.xcodeproj/project.pbxproj @@ -116,7 +116,6 @@ CF047DA7109D0E0600FD0754 /* freeze_defrost.aiff in Resources */ = {isa = PBXBuildFile; fileRef = EA85C3560B4ECBD900F5F9C9 /* freeze_defrost.aiff */; }; CF047DA8109D0E0600FD0754 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA9E0A28384E00A8FAE5 /* InfoPlist.strings */; }; CF047DA9109D0E0600FD0754 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA980A28384E00A8FAE5 /* Localizable.strings */; }; - CF047DAA109D0E0600FD0754 /* Snes9x.nib in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA9C0A28384E00A8FAE5 /* Snes9x.nib */; }; CF047DAB109D0E0600FD0754 /* Snes9x Help in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEAA80A28386500A8FAE5 /* Snes9x Help */; }; CF047DAF109D0E0600FD0754 /* bsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2F380F09B17E070078DCA7 /* bsx.cpp */; }; CF047DB0109D0E0600FD0754 /* c4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0615F0526CCB900A80003 /* c4.cpp */; }; @@ -175,7 +174,7 @@ CF047DE8109D0E0600FD0754 /* s9x-jma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAA7B5F007609F76001BAB8B /* s9x-jma.cpp */; settings = {COMPILER_FLAGS = "-fexceptions"; }; }; CF047DE9109D0E0600FD0754 /* winout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAA7B5F207609F76001BAB8B /* winout.cpp */; settings = {COMPILER_FLAGS = "-fexceptions"; }; }; CF047DEA109D0E0600FD0754 /* mac-appleevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EACDDBB004D6A89700A80003 /* mac-appleevent.cpp */; }; - CF047DEB109D0E0600FD0754 /* mac-audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EADE6347052E5C4300A80003 /* mac-audio.cpp */; }; + CF047DEB109D0E0600FD0754 /* mac-audio.mm in Sources */ = {isa = PBXBuildFile; fileRef = EADE6347052E5C4300A80003 /* mac-audio.mm */; }; CF047DEC109D0E0600FD0754 /* mac-cart.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67004AC7FCE00A80003 /* mac-cart.mm */; }; CF047DED109D0E0600FD0754 /* mac-cheat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67204AC7FCE00A80003 /* mac-cheat.cpp */; }; CF047DEE109D0E0600FD0754 /* mac-cheatfinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67404AC7FCE00A80003 /* mac-cheatfinder.cpp */; }; @@ -189,7 +188,7 @@ CF047DF6109D0E0600FD0754 /* mac-joypad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67B04AC7FCE00A80003 /* mac-joypad.cpp */; }; CF047DF7109D0E0600FD0754 /* mac-keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67D04AC7FCE00A80003 /* mac-keyboard.cpp */; }; CF047DF8109D0E0600FD0754 /* mac-multicart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA26BBD50B3676E800A570B5 /* mac-multicart.cpp */; }; - CF047DF9109D0E0600FD0754 /* mac-musicbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67F04AC7FCE00A80003 /* mac-musicbox.cpp */; }; + CF047DF9109D0E0600FD0754 /* mac-musicbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67F04AC7FCE00A80003 /* mac-musicbox.mm */; }; CF047DFA109D0E0600FD0754 /* mac-netplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA1605500639E735004412AB /* mac-netplay.cpp */; }; CF047DFB109D0E0600FD0754 /* mac-os.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96604D582B700A80003 /* mac-os.mm */; }; CF047DFC109D0E0600FD0754 /* mac-prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96B04D584B700A80003 /* mac-prefs.cpp */; }; @@ -312,7 +311,6 @@ CF0566FC0CF98E7E00C7877C /* freeze_defrost.aiff in Resources */ = {isa = PBXBuildFile; fileRef = EA85C3560B4ECBD900F5F9C9 /* freeze_defrost.aiff */; }; CF0566FD0CF98E7E00C7877C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA9E0A28384E00A8FAE5 /* InfoPlist.strings */; }; CF0566FE0CF98E7E00C7877C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA980A28384E00A8FAE5 /* Localizable.strings */; }; - CF0566FF0CF98E7E00C7877C /* Snes9x.nib in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA9C0A28384E00A8FAE5 /* Snes9x.nib */; }; CF0567000CF98E7E00C7877C /* Snes9x Help in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEAA80A28386500A8FAE5 /* Snes9x Help */; }; CF0567030CF98E7E00C7877C /* bsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2F380F09B17E070078DCA7 /* bsx.cpp */; }; CF0567040CF98E7E00C7877C /* c4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0615F0526CCB900A80003 /* c4.cpp */; }; @@ -359,7 +357,7 @@ CF0567350CF98E7E00C7877C /* s9x-jma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAA7B5F007609F76001BAB8B /* s9x-jma.cpp */; settings = {COMPILER_FLAGS = "-fexceptions"; }; }; CF0567360CF98E7E00C7877C /* winout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAA7B5F207609F76001BAB8B /* winout.cpp */; settings = {COMPILER_FLAGS = "-fexceptions"; }; }; CF0567380CF98E7E00C7877C /* mac-appleevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EACDDBB004D6A89700A80003 /* mac-appleevent.cpp */; }; - CF0567390CF98E7E00C7877C /* mac-audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EADE6347052E5C4300A80003 /* mac-audio.cpp */; }; + CF0567390CF98E7E00C7877C /* mac-audio.mm in Sources */ = {isa = PBXBuildFile; fileRef = EADE6347052E5C4300A80003 /* mac-audio.mm */; }; CF05673B0CF98E7E00C7877C /* mac-cart.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67004AC7FCE00A80003 /* mac-cart.mm */; }; CF05673C0CF98E7E00C7877C /* mac-cheat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67204AC7FCE00A80003 /* mac-cheat.cpp */; }; CF05673D0CF98E7E00C7877C /* mac-cheatfinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67404AC7FCE00A80003 /* mac-cheatfinder.cpp */; }; @@ -373,7 +371,7 @@ CF0567470CF98E7E00C7877C /* mac-joypad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67B04AC7FCE00A80003 /* mac-joypad.cpp */; }; CF0567480CF98E7E00C7877C /* mac-keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67D04AC7FCE00A80003 /* mac-keyboard.cpp */; }; CF0567490CF98E7E00C7877C /* mac-multicart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA26BBD50B3676E800A570B5 /* mac-multicart.cpp */; }; - CF05674A0CF98E7E00C7877C /* mac-musicbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67F04AC7FCE00A80003 /* mac-musicbox.cpp */; }; + CF05674A0CF98E7E00C7877C /* mac-musicbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67F04AC7FCE00A80003 /* mac-musicbox.mm */; }; CF05674B0CF98E7E00C7877C /* mac-netplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA1605500639E735004412AB /* mac-netplay.cpp */; }; CF05674C0CF98E7E00C7877C /* mac-os.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96604D582B700A80003 /* mac-os.mm */; }; CF05674D0CF98E7E00C7877C /* mac-prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96B04D584B700A80003 /* mac-prefs.cpp */; }; @@ -396,6 +394,9 @@ CF0567600CF98E7E00C7877C /* libHIDUtilities_u.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA3D2F580A26085800BDACCC /* libHIDUtilities_u.a */; }; CF0567810CF9971000C7877C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CF05677E0CF9971000C7877C /* QuartzCore.framework */; }; CF10B8F20F63BF8A009C81CD /* libz_u.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CF10B8EF0F63BF8A009C81CD /* libz_u.a */; }; + CF14733E132DA4E1000D0F91 /* Snes9x.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF14733C132DA4E1000D0F91 /* Snes9x.xib */; }; + CF14733F132DA4E1000D0F91 /* Snes9x.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF14733C132DA4E1000D0F91 /* Snes9x.xib */; }; + CF147340132DA4E1000D0F91 /* Snes9x.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF14733C132DA4E1000D0F91 /* Snes9x.xib */; }; CF2F46121095EE72007D33FA /* 65c816.h in Headers */ = {isa = PBXBuildFile; fileRef = EAE0615A0526CCB900A80003 /* 65c816.h */; }; CF2F46151095EE72007D33FA /* bsx.h in Headers */ = {isa = PBXBuildFile; fileRef = EA2F381A09B17E9E0078DCA7 /* bsx.h */; }; CF2F46161095EE72007D33FA /* c4.h in Headers */ = {isa = PBXBuildFile; fileRef = EAE061600526CCB900A80003 /* c4.h */; }; @@ -505,7 +506,6 @@ CF2F46811095EE72007D33FA /* freeze_defrost.aiff in Resources */ = {isa = PBXBuildFile; fileRef = EA85C3560B4ECBD900F5F9C9 /* freeze_defrost.aiff */; }; CF2F46821095EE72007D33FA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA9E0A28384E00A8FAE5 /* InfoPlist.strings */; }; CF2F46831095EE72007D33FA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA980A28384E00A8FAE5 /* Localizable.strings */; }; - CF2F46841095EE72007D33FA /* Snes9x.nib in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA9C0A28384E00A8FAE5 /* Snes9x.nib */; }; CF2F46851095EE72007D33FA /* Snes9x Help in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEAA80A28386500A8FAE5 /* Snes9x Help */; }; CF2F46891095EE72007D33FA /* bsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2F380F09B17E070078DCA7 /* bsx.cpp */; }; CF2F468A1095EE72007D33FA /* c4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0615F0526CCB900A80003 /* c4.cpp */; }; @@ -564,7 +564,7 @@ CF2F46C21095EE72007D33FA /* s9x-jma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAA7B5F007609F76001BAB8B /* s9x-jma.cpp */; settings = {COMPILER_FLAGS = "-fexceptions"; }; }; CF2F46C31095EE72007D33FA /* winout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAA7B5F207609F76001BAB8B /* winout.cpp */; settings = {COMPILER_FLAGS = "-fexceptions"; }; }; CF2F46C41095EE72007D33FA /* mac-appleevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EACDDBB004D6A89700A80003 /* mac-appleevent.cpp */; }; - CF2F46C51095EE72007D33FA /* mac-audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EADE6347052E5C4300A80003 /* mac-audio.cpp */; }; + CF2F46C51095EE72007D33FA /* mac-audio.mm in Sources */ = {isa = PBXBuildFile; fileRef = EADE6347052E5C4300A80003 /* mac-audio.mm */; }; CF2F46C61095EE72007D33FA /* mac-cart.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67004AC7FCE00A80003 /* mac-cart.mm */; }; CF2F46C71095EE72007D33FA /* mac-cheat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67204AC7FCE00A80003 /* mac-cheat.cpp */; }; CF2F46C81095EE72007D33FA /* mac-cheatfinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67404AC7FCE00A80003 /* mac-cheatfinder.cpp */; }; @@ -578,7 +578,7 @@ CF2F46D01095EE72007D33FA /* mac-joypad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67B04AC7FCE00A80003 /* mac-joypad.cpp */; }; CF2F46D11095EE72007D33FA /* mac-keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67D04AC7FCE00A80003 /* mac-keyboard.cpp */; }; CF2F46D21095EE72007D33FA /* mac-multicart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA26BBD50B3676E800A570B5 /* mac-multicart.cpp */; }; - CF2F46D31095EE72007D33FA /* mac-musicbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67F04AC7FCE00A80003 /* mac-musicbox.cpp */; }; + CF2F46D31095EE72007D33FA /* mac-musicbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAECB67F04AC7FCE00A80003 /* mac-musicbox.mm */; }; CF2F46D41095EE72007D33FA /* mac-netplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA1605500639E735004412AB /* mac-netplay.cpp */; }; CF2F46D51095EE72007D33FA /* mac-os.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96604D582B700A80003 /* mac-os.mm */; }; CF2F46D61095EE72007D33FA /* mac-prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96B04D584B700A80003 /* mac-prefs.cpp */; }; @@ -651,6 +651,12 @@ CF37579110A6AEA1001BF7C5 /* SPC_DSP.h in Headers */ = {isa = PBXBuildFile; fileRef = CF37575B10A6AEA1001BF7C5 /* SPC_DSP.h */; }; CF37579210A6AEA1001BF7C5 /* SPC_Filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF37575C10A6AEA1001BF7C5 /* SPC_Filter.cpp */; }; CF37579310A6AEA1001BF7C5 /* SPC_Filter.h in Headers */ = {isa = PBXBuildFile; fileRef = CF37575D10A6AEA1001BF7C5 /* SPC_Filter.h */; }; + CF46BEAA133E2559005A17A5 /* musicbox.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF46BEA8133E2559005A17A5 /* musicbox.xib */; }; + CF46BEAB133E2559005A17A5 /* musicbox.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF46BEA8133E2559005A17A5 /* musicbox.xib */; }; + CF46BEAC133E2559005A17A5 /* musicbox.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF46BEA8133E2559005A17A5 /* musicbox.xib */; }; + CF46BEAE133E256D005A17A5 /* musicbox_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = CF46BEAD133E256D005A17A5 /* musicbox_pause.png */; }; + CF46BEAF133E256D005A17A5 /* musicbox_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = CF46BEAD133E256D005A17A5 /* musicbox_pause.png */; }; + CF46BEB0133E256D005A17A5 /* musicbox_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = CF46BEAD133E256D005A17A5 /* musicbox_pause.png */; }; CF5553C90EA24C36005957E4 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF5553B10EA24C36005957E4 /* 2xsai.cpp */; }; CF5553CA0EA24C36005957E4 /* 2xsai.h in Headers */ = {isa = PBXBuildFile; fileRef = CF5553B20EA24C36005957E4 /* 2xsai.h */; }; CF5553CB0EA24C36005957E4 /* blit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF5553B30EA24C36005957E4 /* blit.cpp */; }; @@ -675,6 +681,12 @@ CFAEC7E11113149B00E0A846 /* linear_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = CFAEC7DD1113149B00E0A846 /* linear_resampler.h */; }; CFAEC7E21113149B00E0A846 /* hermite_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = CFAEC7DC1113149B00E0A846 /* hermite_resampler.h */; }; CFAEC7E31113149B00E0A846 /* linear_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = CFAEC7DD1113149B00E0A846 /* linear_resampler.h */; }; + CFCE2D47133F591900DF6C4E /* musicbox_effect.png in Resources */ = {isa = PBXBuildFile; fileRef = CFCE2D45133F591900DF6C4E /* musicbox_effect.png */; }; + CFCE2D48133F591900DF6C4E /* musicbox_rewind.png in Resources */ = {isa = PBXBuildFile; fileRef = CFCE2D46133F591900DF6C4E /* musicbox_rewind.png */; }; + CFCE2D49133F591900DF6C4E /* musicbox_effect.png in Resources */ = {isa = PBXBuildFile; fileRef = CFCE2D45133F591900DF6C4E /* musicbox_effect.png */; }; + CFCE2D4A133F591900DF6C4E /* musicbox_rewind.png in Resources */ = {isa = PBXBuildFile; fileRef = CFCE2D46133F591900DF6C4E /* musicbox_rewind.png */; }; + CFCE2D4B133F591900DF6C4E /* musicbox_effect.png in Resources */ = {isa = PBXBuildFile; fileRef = CFCE2D45133F591900DF6C4E /* musicbox_effect.png */; }; + CFCE2D4C133F591900DF6C4E /* musicbox_rewind.png in Resources */ = {isa = PBXBuildFile; fileRef = CFCE2D46133F591900DF6C4E /* musicbox_rewind.png */; }; CFE7FBB10D2F6755002F3102 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE061710526CCB900A80003 /* debug.cpp */; }; CFE7FBB40D2F67BA002F3102 /* fxemu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EAE0617C0526CCB900A80003 /* fxemu.cpp */; }; CFE7FBB80D2F683C002F3102 /* debug.h in Headers */ = {isa = PBXBuildFile; fileRef = EA6E6C0E08F9734500CB3555 /* debug.h */; }; @@ -699,6 +711,7 @@ CF0567660CF98E7E00C7877C /* Snes9x.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Snes9x.app; sourceTree = BUILT_PRODUCTS_DIR; }; CF05677E0CF9971000C7877C /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = ""; }; CF10B8EF0F63BF8A009C81CD /* libz_u.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libz_u.a; sourceTree = ""; }; + CF14733D132DA4E1000D0F91 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Snes9x.xib; sourceTree = ""; }; CF2CFFD30F10F2C000B8B35E /* spc7110emu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spc7110emu.cpp; sourceTree = ""; }; CF2CFFD40F10F2C000B8B35E /* spc7110dec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spc7110dec.cpp; sourceTree = ""; }; CF2CFFDB0F10F2DD00B8B35E /* spc7110emu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spc7110emu.h; sourceTree = ""; }; @@ -722,6 +735,8 @@ CF37575B10A6AEA1001BF7C5 /* SPC_DSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPC_DSP.h; sourceTree = ""; }; CF37575C10A6AEA1001BF7C5 /* SPC_Filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SPC_Filter.cpp; sourceTree = ""; }; CF37575D10A6AEA1001BF7C5 /* SPC_Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPC_Filter.h; sourceTree = ""; }; + CF46BEA9133E2559005A17A5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/musicbox.xib; sourceTree = ""; }; + CF46BEAD133E256D005A17A5 /* musicbox_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicbox_pause.png; sourceTree = ""; }; CF4B7C420CF841580080E643 /* icons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icons.png; sourceTree = ""; }; CF5553B10EA24C36005957E4 /* 2xsai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = 2xsai.cpp; sourceTree = ""; }; CF5553B20EA24C36005957E4 /* 2xsai.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = 2xsai.h; sourceTree = ""; }; @@ -745,6 +760,8 @@ CFA82C3E0F1B43A60089C17F /* srtcemu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = srtcemu.cpp; sourceTree = ""; }; CFAEC7DC1113149B00E0A846 /* hermite_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hermite_resampler.h; sourceTree = ""; }; CFAEC7DD1113149B00E0A846 /* linear_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linear_resampler.h; sourceTree = ""; }; + CFCE2D45133F591900DF6C4E /* musicbox_effect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicbox_effect.png; sourceTree = ""; }; + CFCE2D46133F591900DF6C4E /* musicbox_rewind.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicbox_rewind.png; sourceTree = ""; }; CFEFAE8A10EAC92300FB081A /* snes_ntsc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snes_ntsc.c; sourceTree = ""; }; CFEFAE8E10EAC92B00FB081A /* snes_ntsc_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = snes_ntsc_config.h; sourceTree = ""; }; CFEFAE8F10EAC92B00FB081A /* snes_ntsc_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = snes_ntsc_impl.h; sourceTree = ""; }; @@ -774,7 +791,6 @@ EA31FE2D05F7743E00E13748 /* gfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = gfx.cpp; sourceTree = ""; }; EA362C3E086119D100FBE476 /* HID_Utilities_External.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = HID_Utilities_External.h; sourceTree = ""; }; EA3BEA990A28384E00A8FAE5 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; - EA3BEA9D0A28384E00A8FAE5 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Snes9x.nib; sourceTree = ""; }; EA3BEA9F0A28384E00A8FAE5 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; EA3BEAA90A28386500A8FAE5 /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = "English.lproj/Snes9x Help"; sourceTree = ""; }; EA3D2F360A26083B00BDACCC /* SRAM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SRAM.icns; sourceTree = ""; }; @@ -841,7 +857,7 @@ EAC5E47003D2D9C800A80004 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; EACDDBB004D6A89700A80003 /* mac-appleevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "mac-appleevent.cpp"; sourceTree = ""; }; EAD978980555059300E8BBFD /* mac-global_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-global_prefix.h"; sourceTree = ""; }; - EADE6347052E5C4300A80003 /* mac-audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "mac-audio.cpp"; sourceTree = ""; }; + EADE6347052E5C4300A80003 /* mac-audio.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = "mac-audio.mm"; sourceTree = ""; }; EADE6349052E5C5300A80003 /* mac-audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-audio.h"; sourceTree = ""; }; EADE634B052E5D3600A80003 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; EADE634C052E5D3600A80003 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; @@ -922,7 +938,7 @@ EAECB67C04AC7FCE00A80003 /* mac-joypad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-joypad.h"; sourceTree = ""; }; EAECB67D04AC7FCE00A80003 /* mac-keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "mac-keyboard.cpp"; sourceTree = ""; }; EAECB67E04AC7FCE00A80003 /* mac-keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-keyboard.h"; sourceTree = ""; }; - EAECB67F04AC7FCE00A80003 /* mac-musicbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "mac-musicbox.cpp"; sourceTree = ""; }; + EAECB67F04AC7FCE00A80003 /* mac-musicbox.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = "mac-musicbox.mm"; sourceTree = ""; }; EAECB68004AC7FCE00A80003 /* mac-musicbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-musicbox.h"; sourceTree = ""; }; EAECB68204AC7FCE00A80003 /* mac-os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-os.h"; sourceTree = ""; }; EAECB68304AC7FCE00A80003 /* mac-prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "mac-prefix.h"; sourceTree = ""; }; @@ -1268,7 +1284,7 @@ EAD978980555059300E8BBFD /* mac-global_prefix.h */, EA362C3E086119D100FBE476 /* HID_Utilities_External.h */, EACDDBB004D6A89700A80003 /* mac-appleevent.cpp */, - EADE6347052E5C4300A80003 /* mac-audio.cpp */, + EADE6347052E5C4300A80003 /* mac-audio.mm */, EAECB67004AC7FCE00A80003 /* mac-cart.mm */, EAECB67204AC7FCE00A80003 /* mac-cheat.cpp */, EAECB67404AC7FCE00A80003 /* mac-cheatfinder.cpp */, @@ -1282,7 +1298,7 @@ EAECB67B04AC7FCE00A80003 /* mac-joypad.cpp */, EAECB67D04AC7FCE00A80003 /* mac-keyboard.cpp */, EA26BBD50B3676E800A570B5 /* mac-multicart.cpp */, - EAECB67F04AC7FCE00A80003 /* mac-musicbox.cpp */, + EAECB67F04AC7FCE00A80003 /* mac-musicbox.mm */, EA1605500639E735004412AB /* mac-netplay.cpp */, EAE0E96604D582B700A80003 /* mac-os.mm */, EAE0E96B04D584B700A80003 /* mac-prefs.cpp */, @@ -1302,12 +1318,16 @@ EA3D300B0A260A3200BDACCC /* logo_freeze.png */, EA3D300C0A260A3200BDACCC /* logo_defrost.png */, EA3D300A0A260A3200BDACCC /* musicbox_indicator.png */, + CF46BEAD133E256D005A17A5 /* musicbox_pause.png */, + CFCE2D46133F591900DF6C4E /* musicbox_rewind.png */, + CFCE2D45133F591900DF6C4E /* musicbox_effect.png */, EA3D2F380A26083B00BDACCC /* musicbox_ledon.icns */, EA3D2F390A26083B00BDACCC /* musicbox_ledoff.icns */, EA85C3560B4ECBD900F5F9C9 /* freeze_defrost.aiff */, EA3BEA9E0A28384E00A8FAE5 /* InfoPlist.strings */, EA3BEA980A28384E00A8FAE5 /* Localizable.strings */, - EA3BEA9C0A28384E00A8FAE5 /* Snes9x.nib */, + CF14733C132DA4E1000D0F91 /* Snes9x.xib */, + CF46BEA8133E2559005A17A5 /* musicbox.xib */, EA3BEAA80A28386500A8FAE5 /* Snes9x Help */, EA3D2F580A26085800BDACCC /* libHIDUtilities_u.a */, CF10B8EF0F63BF8A009C81CD /* libz_u.a */, @@ -1371,6 +1391,8 @@ CF37577310A6AEA1001BF7C5 /* blargg_config.h in Headers */, CF37577410A6AEA1001BF7C5 /* blargg_endian.h in Headers */, CF37577510A6AEA1001BF7C5 /* blargg_source.h in Headers */, + CFAEC7E01113149B00E0A846 /* hermite_resampler.h in Headers */, + CFAEC7E11113149B00E0A846 /* linear_resampler.h in Headers */, CF37577710A6AEA1001BF7C5 /* resampler.h in Headers */, CF37577810A6AEA1001BF7C5 /* ring_buffer.h in Headers */, CF37577A10A6AEA1001BF7C5 /* SNES_SPC.h in Headers */, @@ -1433,8 +1455,6 @@ CF047D97109D0E0600FD0754 /* mac-prefix.h in Headers */, CF047D98109D0E0600FD0754 /* mac-global_prefix.h in Headers */, CF047D99109D0E0600FD0754 /* HID_Utilities_External.h in Headers */, - CFAEC7E01113149B00E0A846 /* hermite_resampler.h in Headers */, - CFAEC7E11113149B00E0A846 /* linear_resampler.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1488,6 +1508,8 @@ CF37578510A6AEA1001BF7C5 /* blargg_config.h in Headers */, CF37578610A6AEA1001BF7C5 /* blargg_endian.h in Headers */, CF37578710A6AEA1001BF7C5 /* blargg_source.h in Headers */, + CFAEC7DE1113149B00E0A846 /* hermite_resampler.h in Headers */, + CFAEC7DF1113149B00E0A846 /* linear_resampler.h in Headers */, CF37578910A6AEA1001BF7C5 /* resampler.h in Headers */, CF37578A10A6AEA1001BF7C5 /* ring_buffer.h in Headers */, CF37578C10A6AEA1001BF7C5 /* SNES_SPC.h in Headers */, @@ -1550,8 +1572,6 @@ CF0566EC0CF98E7E00C7877C /* mac-prefix.h in Headers */, CF0566ED0CF98E7E00C7877C /* mac-global_prefix.h in Headers */, CF0566EE0CF98E7E00C7877C /* HID_Utilities_External.h in Headers */, - CFAEC7DE1113149B00E0A846 /* hermite_resampler.h in Headers */, - CFAEC7DF1113149B00E0A846 /* linear_resampler.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1605,6 +1625,8 @@ CF37576110A6AEA1001BF7C5 /* blargg_config.h in Headers */, CF37576210A6AEA1001BF7C5 /* blargg_endian.h in Headers */, CF37576310A6AEA1001BF7C5 /* blargg_source.h in Headers */, + CFAEC7E21113149B00E0A846 /* hermite_resampler.h in Headers */, + CFAEC7E31113149B00E0A846 /* linear_resampler.h in Headers */, CF37576510A6AEA1001BF7C5 /* resampler.h in Headers */, CF37576610A6AEA1001BF7C5 /* ring_buffer.h in Headers */, CF37576810A6AEA1001BF7C5 /* SNES_SPC.h in Headers */, @@ -1667,8 +1689,6 @@ CF2F46711095EE72007D33FA /* mac-prefix.h in Headers */, CF2F46721095EE72007D33FA /* mac-global_prefix.h in Headers */, CF2F46731095EE72007D33FA /* HID_Utilities_External.h in Headers */, - CFAEC7E21113149B00E0A846 /* hermite_resampler.h in Headers */, - CFAEC7E31113149B00E0A846 /* linear_resampler.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1737,7 +1757,7 @@ /* Begin PBXProject section */ 20286C28FDCF999611CA2CEA /* Project object */ = { isa = PBXProject; - buildConfigurationList = EA6A1100085808D200A1CF18 /* Build configuration list for PBXProject "macpdate" */; + buildConfigurationList = EA6A1100085808D200A1CF18 /* Build configuration list for PBXProject "snes9x" */; compatibilityVersion = "Xcode 2.4"; developmentRegion = English; hasScannedForEncodings = 1; @@ -1772,13 +1792,17 @@ CF047DA1109D0E0600FD0754 /* icons.png in Resources */, CF047DA2109D0E0600FD0754 /* logo_freeze.png in Resources */, CF047DA3109D0E0600FD0754 /* logo_defrost.png in Resources */, + CF047DA6109D0E0600FD0754 /* musicbox_indicator.png in Resources */, + CF46BEAF133E256D005A17A5 /* musicbox_pause.png in Resources */, + CFCE2D4A133F591900DF6C4E /* musicbox_rewind.png in Resources */, + CFCE2D49133F591900DF6C4E /* musicbox_effect.png in Resources */, CF047DA4109D0E0600FD0754 /* musicbox_ledon.icns in Resources */, CF047DA5109D0E0600FD0754 /* musicbox_ledoff.icns in Resources */, - CF047DA6109D0E0600FD0754 /* musicbox_indicator.png in Resources */, CF047DA7109D0E0600FD0754 /* freeze_defrost.aiff in Resources */, CF047DA8109D0E0600FD0754 /* InfoPlist.strings in Resources */, CF047DA9109D0E0600FD0754 /* Localizable.strings in Resources */, - CF047DAA109D0E0600FD0754 /* Snes9x.nib in Resources */, + CF14733F132DA4E1000D0F91 /* Snes9x.xib in Resources */, + CF46BEAB133E2559005A17A5 /* musicbox.xib in Resources */, CF047DAB109D0E0600FD0754 /* Snes9x Help in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1796,13 +1820,17 @@ CF0566F60CF98E7E00C7877C /* icons.png in Resources */, CF0566F70CF98E7E00C7877C /* logo_freeze.png in Resources */, CF0566F80CF98E7E00C7877C /* logo_defrost.png in Resources */, + CF0566FB0CF98E7E00C7877C /* musicbox_indicator.png in Resources */, + CF46BEAE133E256D005A17A5 /* musicbox_pause.png in Resources */, + CFCE2D48133F591900DF6C4E /* musicbox_rewind.png in Resources */, + CFCE2D47133F591900DF6C4E /* musicbox_effect.png in Resources */, CF0566F90CF98E7E00C7877C /* musicbox_ledon.icns in Resources */, CF0566FA0CF98E7E00C7877C /* musicbox_ledoff.icns in Resources */, - CF0566FB0CF98E7E00C7877C /* musicbox_indicator.png in Resources */, CF0566FC0CF98E7E00C7877C /* freeze_defrost.aiff in Resources */, CF0566FD0CF98E7E00C7877C /* InfoPlist.strings in Resources */, CF0566FE0CF98E7E00C7877C /* Localizable.strings in Resources */, - CF0566FF0CF98E7E00C7877C /* Snes9x.nib in Resources */, + CF147340132DA4E1000D0F91 /* Snes9x.xib in Resources */, + CF46BEAA133E2559005A17A5 /* musicbox.xib in Resources */, CF0567000CF98E7E00C7877C /* Snes9x Help in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1820,13 +1848,17 @@ CF2F467B1095EE72007D33FA /* icons.png in Resources */, CF2F467C1095EE72007D33FA /* logo_freeze.png in Resources */, CF2F467D1095EE72007D33FA /* logo_defrost.png in Resources */, + CF2F46801095EE72007D33FA /* musicbox_indicator.png in Resources */, + CF46BEB0133E256D005A17A5 /* musicbox_pause.png in Resources */, + CFCE2D4C133F591900DF6C4E /* musicbox_rewind.png in Resources */, + CFCE2D4B133F591900DF6C4E /* musicbox_effect.png in Resources */, CF2F467E1095EE72007D33FA /* musicbox_ledon.icns in Resources */, CF2F467F1095EE72007D33FA /* musicbox_ledoff.icns in Resources */, - CF2F46801095EE72007D33FA /* musicbox_indicator.png in Resources */, CF2F46811095EE72007D33FA /* freeze_defrost.aiff in Resources */, CF2F46821095EE72007D33FA /* InfoPlist.strings in Resources */, CF2F46831095EE72007D33FA /* Localizable.strings in Resources */, - CF2F46841095EE72007D33FA /* Snes9x.nib in Resources */, + CF14733E132DA4E1000D0F91 /* Snes9x.xib in Resources */, + CF46BEAC133E2559005A17A5 /* musicbox.xib in Resources */, CF2F46851095EE72007D33FA /* Snes9x Help in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1926,7 +1958,7 @@ CF047DE8109D0E0600FD0754 /* s9x-jma.cpp in Sources */, CF047DE9109D0E0600FD0754 /* winout.cpp in Sources */, CF047DEA109D0E0600FD0754 /* mac-appleevent.cpp in Sources */, - CF047DEB109D0E0600FD0754 /* mac-audio.cpp in Sources */, + CF047DEB109D0E0600FD0754 /* mac-audio.mm in Sources */, CF047DEC109D0E0600FD0754 /* mac-cart.mm in Sources */, CF047DED109D0E0600FD0754 /* mac-cheat.cpp in Sources */, CF047DEE109D0E0600FD0754 /* mac-cheatfinder.cpp in Sources */, @@ -1940,7 +1972,7 @@ CF047DF6109D0E0600FD0754 /* mac-joypad.cpp in Sources */, CF047DF7109D0E0600FD0754 /* mac-keyboard.cpp in Sources */, CF047DF8109D0E0600FD0754 /* mac-multicart.cpp in Sources */, - CF047DF9109D0E0600FD0754 /* mac-musicbox.cpp in Sources */, + CF047DF9109D0E0600FD0754 /* mac-musicbox.mm in Sources */, CF047DFA109D0E0600FD0754 /* mac-netplay.cpp in Sources */, CF047DFB109D0E0600FD0754 /* mac-os.mm in Sources */, CF047DFC109D0E0600FD0754 /* mac-prefs.cpp in Sources */, @@ -2021,7 +2053,7 @@ CF0567350CF98E7E00C7877C /* s9x-jma.cpp in Sources */, CF0567360CF98E7E00C7877C /* winout.cpp in Sources */, CF0567380CF98E7E00C7877C /* mac-appleevent.cpp in Sources */, - CF0567390CF98E7E00C7877C /* mac-audio.cpp in Sources */, + CF0567390CF98E7E00C7877C /* mac-audio.mm in Sources */, CF05673B0CF98E7E00C7877C /* mac-cart.mm in Sources */, CF05673C0CF98E7E00C7877C /* mac-cheat.cpp in Sources */, CF05673D0CF98E7E00C7877C /* mac-cheatfinder.cpp in Sources */, @@ -2035,7 +2067,7 @@ CF0567470CF98E7E00C7877C /* mac-joypad.cpp in Sources */, CF0567480CF98E7E00C7877C /* mac-keyboard.cpp in Sources */, CF0567490CF98E7E00C7877C /* mac-multicart.cpp in Sources */, - CF05674A0CF98E7E00C7877C /* mac-musicbox.cpp in Sources */, + CF05674A0CF98E7E00C7877C /* mac-musicbox.mm in Sources */, CF05674B0CF98E7E00C7877C /* mac-netplay.cpp in Sources */, CF05674C0CF98E7E00C7877C /* mac-os.mm in Sources */, CF05674D0CF98E7E00C7877C /* mac-prefs.cpp in Sources */, @@ -2116,7 +2148,7 @@ CF2F46C21095EE72007D33FA /* s9x-jma.cpp in Sources */, CF2F46C31095EE72007D33FA /* winout.cpp in Sources */, CF2F46C41095EE72007D33FA /* mac-appleevent.cpp in Sources */, - CF2F46C51095EE72007D33FA /* mac-audio.cpp in Sources */, + CF2F46C51095EE72007D33FA /* mac-audio.mm in Sources */, CF2F46C61095EE72007D33FA /* mac-cart.mm in Sources */, CF2F46C71095EE72007D33FA /* mac-cheat.cpp in Sources */, CF2F46C81095EE72007D33FA /* mac-cheatfinder.cpp in Sources */, @@ -2130,7 +2162,7 @@ CF2F46D01095EE72007D33FA /* mac-joypad.cpp in Sources */, CF2F46D11095EE72007D33FA /* mac-keyboard.cpp in Sources */, CF2F46D21095EE72007D33FA /* mac-multicart.cpp in Sources */, - CF2F46D31095EE72007D33FA /* mac-musicbox.cpp in Sources */, + CF2F46D31095EE72007D33FA /* mac-musicbox.mm in Sources */, CF2F46D41095EE72007D33FA /* mac-netplay.cpp in Sources */, CF2F46D51095EE72007D33FA /* mac-os.mm in Sources */, CF2F46D61095EE72007D33FA /* mac-prefs.cpp in Sources */, @@ -2146,6 +2178,22 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ + CF14733C132DA4E1000D0F91 /* Snes9x.xib */ = { + isa = PBXVariantGroup; + children = ( + CF14733D132DA4E1000D0F91 /* English */, + ); + name = Snes9x.xib; + sourceTree = ""; + }; + CF46BEA8133E2559005A17A5 /* musicbox.xib */ = { + isa = PBXVariantGroup; + children = ( + CF46BEA9133E2559005A17A5 /* English */, + ); + name = musicbox.xib; + sourceTree = ""; + }; EA3BEA980A28384E00A8FAE5 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( @@ -2154,14 +2202,6 @@ name = Localizable.strings; sourceTree = ""; }; - EA3BEA9C0A28384E00A8FAE5 /* Snes9x.nib */ = { - isa = PBXVariantGroup; - children = ( - EA3BEA9D0A28384E00A8FAE5 /* English */, - ); - name = Snes9x.nib; - sourceTree = ""; - }; EA3BEA9E0A28384E00A8FAE5 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -2231,7 +2271,7 @@ DEAD_CODE_STRIPPING = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; - GCC_MODEL_TUNING = G4; + GCC_MODEL_TUNING = G3; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREFIX_HEADER = "mac-global_prefix.h"; @@ -2414,7 +2454,7 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G4; + GCC_MODEL_TUNING = G3; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREFIX_HEADER = "mac-global_prefix.h"; @@ -2448,7 +2488,7 @@ LIBRARY_SEARCH_PATHS = .; MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( - "-mcpu=G4", + "-mcpu=G3", "-fomit-frame-pointer", "-fast", ); @@ -2498,7 +2538,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EA6A1100085808D200A1CF18 /* Build configuration list for PBXProject "macpdate" */ = { + EA6A1100085808D200A1CF18 /* Build configuration list for PBXProject "snes9x" */ = { isa = XCConfigurationList; buildConfigurations = ( EA6A1102085808D200A1CF18 /* Release */, diff --git a/memmap.cpp b/memmap.cpp index 4844e52c..bc5feba3 100644 --- a/memmap.cpp +++ b/memmap.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -3545,7 +3546,8 @@ void CMemory::ApplyROMFixes (void) match_na ("NBA Hangtime") || // NBA Hang Time match_na ("MSPACMAN") || // Ms Pacman match_na ("THE MASK") || // The Mask - match_na ("PRIMAL RAGE")) // Primal Rage + match_na ("PRIMAL RAGE") || // Primal Rage + match_na ("DOOM TROOPERS")) // Doom Troopers Timings.APUAllowTimeOverflow = TRUE; } diff --git a/memmap.h b/memmap.h index 99dd8f7e..2b05de61 100644 --- a/memmap.h +++ b/memmap.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/messages.h b/messages.h index f346a7ce..ad981b7a 100644 --- a/messages.h +++ b/messages.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/missing.h b/missing.h index 9a41fab1..d3c39d88 100644 --- a/missing.h +++ b/missing.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/movie.cpp b/movie.cpp index f4b018bd..982b9ebd 100644 --- a/movie.cpp +++ b/movie.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/movie.h b/movie.h index f1fb2bb0..508ad307 100644 --- a/movie.h +++ b/movie.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/netplay.cpp b/netplay.cpp index facacc19..dff5d0a3 100644 --- a/netplay.cpp +++ b/netplay.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/netplay.h b/netplay.h index b28bcace..805442bb 100644 --- a/netplay.h +++ b/netplay.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/obc1.cpp b/obc1.cpp index 9fe98de5..130bfc50 100644 --- a/obc1.cpp +++ b/obc1.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/obc1.h b/obc1.h index 836850b7..8b2a5547 100644 --- a/obc1.h +++ b/obc1.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/pixform.h b/pixform.h index 1760899c..ffabde4a 100644 --- a/pixform.h +++ b/pixform.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/port.h b/port.h index 9e1117c6..0e8192e5 100644 --- a/port.h +++ b/port.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -248,6 +249,7 @@ typedef signed int int32; typedef unsigned int uint32; #endif typedef unsigned char uint8_t; +typedef signed char int8_t; typedef signed __int64 int64; typedef unsigned __int64 uint64; typedef int socklen_t; diff --git a/ppu.cpp b/ppu.cpp index 95ad4b43..7733baaf 100644 --- a/ppu.cpp +++ b/ppu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/ppu.h b/ppu.h index c5cb9d7a..a35d70ac 100644 --- a/ppu.h +++ b/ppu.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/reader.cpp b/reader.cpp index fa7ba1ec..8ad1ed44 100644 --- a/reader.cpp +++ b/reader.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/reader.h b/reader.h index 2019cc1a..80e92e4d 100644 --- a/reader.h +++ b/reader.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sa1.cpp b/sa1.cpp index a35e5537..3852860d 100644 --- a/sa1.cpp +++ b/sa1.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sa1.h b/sa1.h index eef38a20..112553a8 100644 --- a/sa1.h +++ b/sa1.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sa1cpu.cpp b/sa1cpu.cpp index 994e240c..b5f82974 100644 --- a/sa1cpu.cpp +++ b/sa1cpu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sar.h b/sar.h index f53de57a..194245cd 100644 --- a/sar.h +++ b/sar.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/screenshot.cpp b/screenshot.cpp index ec8f7503..c3231575 100644 --- a/screenshot.cpp +++ b/screenshot.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/screenshot.h b/screenshot.h index 6839ba09..3fd96361 100644 --- a/screenshot.h +++ b/screenshot.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sdd1.cpp b/sdd1.cpp index 40cd4c9b..0e2ebfc4 100644 --- a/sdd1.cpp +++ b/sdd1.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sdd1.h b/sdd1.h index 7419b5ba..be3961a2 100644 --- a/sdd1.h +++ b/sdd1.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sdd1emu.cpp b/sdd1emu.cpp index c4f4d36b..a55e63ea 100644 --- a/sdd1emu.cpp +++ b/sdd1emu.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/sdd1emu.h b/sdd1emu.h index 5722b4b6..18eae17d 100644 --- a/sdd1emu.h +++ b/sdd1emu.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/server.cpp b/server.cpp index ad505ad6..fc2f3fa4 100644 --- a/server.cpp +++ b/server.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/seta.cpp b/seta.cpp index e7fd24c9..d5f25548 100644 --- a/seta.cpp +++ b/seta.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/seta.h b/seta.h index ee49097c..9b5a6d42 100644 --- a/seta.h +++ b/seta.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/seta010.cpp b/seta010.cpp index 45cf8779..30f83986 100644 --- a/seta010.cpp +++ b/seta010.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/seta011.cpp b/seta011.cpp index b49a8b8b..80d21f7a 100644 --- a/seta011.cpp +++ b/seta011.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/seta018.cpp b/seta018.cpp index 24efb5c8..e92cef8c 100644 --- a/seta018.cpp +++ b/seta018.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/snapshot.cpp b/snapshot.cpp index b0d7791e..7b758b42 100644 --- a/snapshot.cpp +++ b/snapshot.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/snapshot.h b/snapshot.h index 55c72d7f..d55b8b7e 100644 --- a/snapshot.h +++ b/snapshot.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/snes9x.cpp b/snes9x.cpp index a4676144..148073e8 100644 --- a/snes9x.cpp +++ b/snes9x.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/snes9x.h b/snes9x.h index ccab8775..4e09c0dd 100644 --- a/snes9x.h +++ b/snes9x.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/spc7110.cpp b/spc7110.cpp index 4f9c0fc4..c44f55a0 100644 --- a/spc7110.cpp +++ b/spc7110.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/spc7110.h b/spc7110.h index 7002b509..9a605c51 100644 --- a/spc7110.h +++ b/spc7110.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/srtc.cpp b/srtc.cpp index 9c7e28ab..5971870c 100644 --- a/srtc.cpp +++ b/srtc.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/srtc.h b/srtc.h index 8bc441cb..75567244 100644 --- a/srtc.h +++ b/srtc.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/tile.cpp b/tile.cpp index f8d20827..12ad6274 100644 --- a/tile.cpp +++ b/tile.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/tile.h b/tile.h index d4bd94f9..9ef3c693 100644 --- a/tile.h +++ b/tile.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/unix/configure b/unix/configure old mode 100644 new mode 100755 index 22cf14c9..000fcc93 --- a/unix/configure +++ b/unix/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.52 . +# From configure.ac Revision: 1.53 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Snes9x 1.52. +# Generated by GNU Autoconf 2.61 for Snes9x 1.53. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -573,8 +573,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Snes9x' PACKAGE_TARNAME='snes9x' -PACKAGE_VERSION='1.52' -PACKAGE_STRING='Snes9x 1.52' +PACKAGE_VERSION='1.53' +PACKAGE_STRING='Snes9x 1.53' PACKAGE_BUGREPORT='' ac_unique_file="unix.cpp" @@ -673,7 +673,6 @@ OBJEXT CXX CXXFLAGS ac_ct_CXX -S9XNASM CXXCPP GREP EGREP @@ -685,8 +684,6 @@ X_EXTRA_LIBS S9XFLGS S9XDEFS S9XLIBS -S9XZSNESFX -S9XZSNESC4 S9XDEBUGGER S9XNETPLAY S9XZIP @@ -1209,7 +1206,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Snes9x 1.52 to adapt to many kinds of systems. +\`configure' configures Snes9x 1.53 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1279,7 +1276,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Snes9x 1.52:";; + short | recursive ) echo "Configuration of Snes9x 1.53:";; esac cat <<\_ACEOF @@ -1290,8 +1287,6 @@ Optional Features: (default: no) --enable-mtune use the specified value for the -mtune/-mcpu flag (default: no) - --enable-zsnes-asm build with ZSNES C4 and SuperFX assembler cores if - available (default: no) --enable-gamepad enable gamepad support if available (default: yes) --enable-debugger enable debugger (default: no) --enable-netplay enable netplay support (default: no) @@ -1383,7 +1378,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Snes9x configure 1.52 +Snes9x configure 1.53 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1397,7 +1392,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Snes9x $as_me 1.52, which was +It was created by Snes9x $as_me 1.53, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -4488,103 +4483,6 @@ echo "${ECHO_T}no" >&6; } fi -# Check if the CPU is x86. - -{ echo "$as_me:$LINENO: checking whether the CPU is x86" >&5 -echo $ECHO_N "checking whether the CPU is x86... $ECHO_C" >&6; } - -if test "${snes9x_cv_x86_cpu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - case "$target" in - i686-*-* | i586-*-* | i486-*-* | i386-*-*) - snes9x_cv_x86_cpu="yes" - ;; - *) - snes9x_cv_x86_cpu="no" - ;; - esac - -fi - - -{ echo "$as_me:$LINENO: result: $snes9x_cv_x86_cpu" >&5 -echo "${ECHO_T}$snes9x_cv_x86_cpu" >&6; } - -# Enable ZSNES C4 and SuperFX assembler cores if CPU is x86. - -S9XZSNESFX="#S9XZSNESFX=1" -S9XZSNESC4="#S9XZSNESC4=1" -S9XNASM="" - -# Check whether --enable-zsnes_asm was given. -if test "${enable_zsnes_asm+set}" = set; then - enableval=$enable_zsnes_asm; -else - enable_zsnes_asm="no" -fi - - -if test "x$enable_zsnes_asm" = "xyes"; then - if test "x$snes9x_cv_x86_cpu" = "xyes"; then - # Extract the first word of "nasm", so it can be a program name with args. -set dummy nasm; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_S9XNASM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $S9XNASM in - [\\/]* | ?:[\\/]*) - ac_cv_path_S9XNASM="$S9XNASM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_S9XNASM="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_S9XNASM" && ac_cv_path_S9XNASM="no" - ;; -esac -fi -S9XNASM=$ac_cv_path_S9XNASM -if test -n "$S9XNASM"; then - { echo "$as_me:$LINENO: result: $S9XNASM" >&5 -echo "${ECHO_T}$S9XNASM" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test "x$S9XNASM" != "xno"; then - S9XZSNESFX="S9XZSNESFX=1" - S9XZSNESC4="S9XZSNESC4=1" - S9XDEFS="$S9XDEFS -DZSNES_FX -DZSNES_C4" - else - { echo "$as_me:$LINENO: WARNING: nasm not found. Build without ZSNES assembler cores." >&5 -echo "$as_me: WARNING: nasm not found. Build without ZSNES assembler cores." >&2;} - enable_zsnes_asm="no" - fi - else - { echo "$as_me:$LINENO: WARNING: Your CPU is not x86. Build without ZSNES assembler cores." >&5 -echo "$as_me: WARNING: Your CPU is not x86. Build without ZSNES assembler cores." >&2;} - enable_zsnes_asm="no" - fi -fi - # Check if the OS is Linux. { echo "$as_me:$LINENO: checking whether the OS is Linux" >&5 @@ -8391,9 +8289,6 @@ S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/^ *//'`" - - - rm config.info 2>/dev/null cat >config.info <&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Snes9x $as_me 1.52, which was +This file was extended by Snes9x $as_me 1.53, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8891,7 +8785,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Snes9x config.status 1.52 +Snes9x config.status 1.53 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -9109,7 +9003,6 @@ OBJEXT!$OBJEXT$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim -S9XNASM!$S9XNASM$ac_delim CXXCPP!$CXXCPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim @@ -9121,8 +9014,6 @@ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim S9XFLGS!$S9XFLGS$ac_delim S9XDEFS!$S9XDEFS$ac_delim S9XLIBS!$S9XLIBS$ac_delim -S9XZSNESFX!$S9XZSNESFX$ac_delim -S9XZSNESC4!$S9XZSNESC4$ac_delim S9XDEBUGGER!$S9XDEBUGGER$ac_delim S9XNETPLAY!$S9XNETPLAY$ac_delim S9XZIP!$S9XZIP$ac_delim @@ -9131,7 +9022,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/unix/docs/readme_unix.html b/unix/docs/readme_unix.html index 3dea24e7..20028ecf 100644 --- a/unix/docs/readme_unix.html +++ b/unix/docs/readme_unix.html @@ -48,7 +48,7 @@ Use -help option to see available options.

    - SNES ROM images come in lots of different formats. Snes9x supports zipped ROMs as long as there is only 1 per zip file. Also Snes9x can open gzip/jma compressed file. + SNES ROM images come in lots of different formats. Snes9x supports zipped ROMs as long as there is only 1 per zip file. Also Snes9x can open gzip and jma compressed files.

    Game Color System

    @@ -234,7 +234,7 @@

    Software

    - You will need access to SNES ROM images in .smc, .sfc, .fig, etc., format otherwise you will have nothing to run! Some home-brewed ROM images can be downloaded from http://www.zophar.com/.
    + You will need access to SNES ROM images otherwise you will have nothing to run! Some home-brewed ROM images can be downloaded from http://www.zophar.com/.
    Please note, it is illegal in most countries to have commercial ROM images without also owning the actual SNES ROM cartridges, and even then you may be liable under various EULAs.

    Controllers Support

    @@ -689,7 +689,7 @@
  • Sound DSP, with eight 16-bit, stereo channels, compressed samples, hardware envelope processing, echo, pitch modulation and digital FIR sound filter.
  • SRAM, a battery-backed RAM.
  • All background modes, 0 to 7.
  • -
  • All screen resolutions, 256x224, 256x239, 512x224, 512x239, 512x448 and 512x478.
  • +
  • All screen resolutions including interlace mode.
  • Pseudo hi-res mode.
  • 8x8, 16x8 and 16x16 tile sizes, flipped in either direction.
  • 32x32, 32x64, 64x32 and 64x64 screen tile sizes.
  • @@ -802,7 +802,7 @@

    Edited for Unix port by: zones (kasumitokoduck@yahoo.com)
    - Updated most recently by: 2009/12/20 zones + Updated most recently by: 2011/04/10 zones

    diff --git a/unix/unix.cpp b/unix/unix.cpp index aaec24f7..c5f6da26 100644 --- a/unix/unix.cpp +++ b/unix/unix.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/unix/x11.cpp b/unix/x11.cpp index 8b35b1c0..cb76f82d 100644 --- a/unix/x11.cpp +++ b/unix/x11.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/unzip/crypt.h b/unzip/crypt.h index 622f4bc2..2d69da4a 100644 --- a/unzip/crypt.h +++ b/unzip/crypt.h @@ -1,9 +1,9 @@ /* crypt.h -- base code for crypt/uncrypt ZIPfile - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant This code is a modified version of crypting code in Infozip distribution diff --git a/unzip/ioapi.c b/unzip/ioapi.c index f1bee23e..51a90581 100644 --- a/unzip/ioapi.c +++ b/unzip/ioapi.c @@ -1,9 +1,9 @@ /* ioapi.c -- IO base function header for compress/uncompress .zip files using zlib + zip or unzip API - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant */ #include @@ -141,7 +141,8 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) default: return -1; } ret = 0; - fseek((FILE *)stream, offset, fseek_origin); + if (fseek((FILE *)stream, offset, fseek_origin) != 0) + ret = -1; return ret; } diff --git a/unzip/ioapi.h b/unzip/ioapi.h index 7d457baa..1dba776c 100644 --- a/unzip/ioapi.h +++ b/unzip/ioapi.h @@ -1,9 +1,9 @@ /* ioapi.h -- IO base function header for compress/uncompress .zip files using zlib + zip or unzip API - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant */ #ifndef _ZLIBIOAPI_H diff --git a/unzip/iowin32.c b/unzip/iowin32.c index a9b5f783..e502139a 100644 --- a/unzip/iowin32.c +++ b/unzip/iowin32.c @@ -2,9 +2,9 @@ files using zlib + zip or unzip API This IO API version uses the Win32 API (for Microsoft Windows) - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant */ #include diff --git a/unzip/iowin32.h b/unzip/iowin32.h index a3a437ad..c128770f 100644 --- a/unzip/iowin32.h +++ b/unzip/iowin32.h @@ -2,9 +2,9 @@ files using zlib + zip or unzip API This IO API version uses the Win32 API (for Microsoft Windows) - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant */ #include diff --git a/unzip/miniunz.c b/unzip/miniunz.c index f5999388..b5bc8b54 100644 --- a/unzip/miniunz.c +++ b/unzip/miniunz.c @@ -1,8 +1,8 @@ /* miniunz.c - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant */ @@ -112,6 +112,11 @@ int makedir (newdir) return 0; buffer = (char*)malloc(len+1); + if (buffer==NULL) + { + printf("Error allocating memory\n"); + return UNZ_INTERNALERROR; + } strcpy(buffer,newdir); if (buffer[len-1] == '/') { @@ -210,6 +215,11 @@ int do_list(uf) else if ((iLevel==2) || (iLevel==3)) string_method="Defl:F"; /* 2:fast , 3 : extra fast*/ } + else + if (file_info.compression_method==Z_BZIP2ED) + { + string_method="BZip2 "; + } else string_method="Unkn. "; @@ -470,6 +480,7 @@ int main(argc,argv) const char *password=NULL; char filename_try[MAXFILENAME+16] = ""; int i; + int ret_value=0; int opt_do_list=0; int opt_do_extract=1; int opt_do_extract_withoutpath=0; @@ -564,7 +575,7 @@ int main(argc,argv) printf("%s opened\n",filename_try); if (opt_do_list==1) - return do_list(uf); + ret_value = do_list(uf); else if (opt_do_extract==1) { if (opt_extractdir && chdir(dirname)) @@ -574,12 +585,13 @@ int main(argc,argv) } if (filename_to_extract == NULL) - return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password); + ret_value = do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password); else - return do_extract_onefile(uf,filename_to_extract, + ret_value = do_extract_onefile(uf,filename_to_extract, opt_do_extract_withoutpath,opt_overwrite,password); } - unzCloseCurrentFile(uf); - return 0; + unzClose(uf); + + return ret_value ; } diff --git a/unzip/minizip.c b/unzip/minizip.c index f2dfecd8..25f83898 100644 --- a/unzip/minizip.c +++ b/unzip/minizip.c @@ -1,8 +1,12 @@ /* minizip.c - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant + +Changes: + Aug 3, 2006. jg. support storing files with out paths. (-j) + Aug 3, 2006. jg. files with paths should not have leading slashes. */ #include @@ -44,9 +48,9 @@ uLong filetime(f, tmzip, dt) { FILETIME ftLocal; HANDLE hFind; - WIN32_FIND_DATA ff32; + WIN32_FIND_DATAA ff32; - hFind = FindFirstFile(f,&ff32); + hFind = FindFirstFileA(f,&ff32); if (hFind != INVALID_HANDLE_VALUE) { FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal); @@ -129,18 +133,20 @@ int check_exist_file(filename) void do_banner() { - printf("MiniZip 1.01b, demo of zLib + Zip package written by Gilles Vollant\n"); - printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); + printf("MiniZip 1.01e-jg, demo of zLib + Zip package written by Gilles Vollant\n"); + printf("minor updates, jg.\n"); + printf("more info at http://www.winimage.com/zLibDll/minizip.html\n\n"); } void do_help() { - printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] file.zip [files_to_add]\n\n" \ + printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \ " -o Overwrite existing file.zip\n" \ " -a Append to existing file.zip\n" \ " -0 Store only\n" \ " -1 Compress faster\n" \ - " -9 Compress better\n\n"); + " -9 Compress better\n" \ + " -j exclude path. store only the file name.\n\n"); } /* calculate the CRC32 of a file, @@ -179,7 +185,7 @@ int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigne fclose(fin); *result_crc=calculate_crc; - printf("file %s crc %x\n",filenameinzip,calculate_crc); + printf("file %s crc %lx\n",filenameinzip,calculate_crc); return err; } @@ -190,6 +196,7 @@ int main(argc,argv) int i; int opt_overwrite=0; int opt_compress_level=Z_DEFAULT_COMPRESSION; + int opt_exclude_path=0; int zipfilenamearg = 0; char filename_try[MAXFILENAME+16]; int zipok; @@ -222,6 +229,8 @@ int main(argc,argv) opt_overwrite = 2; if ((c>='0') && (c<='9')) opt_compress_level = c-'0'; + if ((c=='j') || (c=='J')) + opt_exclude_path = 1; if (((c=='p') || (c=='P')) && (i+1cur_file_info.compression_method!=0) && +/* #ifdef HAVE_BZIP2 */ + (s->cur_file_info.compression_method!=Z_BZIP2ED) && +/* #endif */ (s->cur_file_info.compression_method!=Z_DEFLATED)) err=UNZ_BADZIPFILE; @@ -1121,6 +1130,9 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) } if ((s->cur_file_info.compression_method!=0) && +/* #ifdef HAVE_BZIP2 */ + (s->cur_file_info.compression_method!=Z_BZIP2ED) && +/* #endif */ (s->cur_file_info.compression_method!=Z_DEFLATED)) err=UNZ_BADZIPFILE; @@ -1134,6 +1146,34 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) pfile_in_zip_read_info->stream.total_out = 0; + if ((s->cur_file_info.compression_method==Z_BZIP2ED) && + (!raw)) + { +#ifdef HAVE_BZIP2 + pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0; + pfile_in_zip_read_info->bstream.bzfree = (free_func)0; + pfile_in_zip_read_info->bstream.opaque = (voidpf)0; + pfile_in_zip_read_info->bstream.state = (voidpf)0; + + pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; + pfile_in_zip_read_info->stream.zfree = (free_func)0; + pfile_in_zip_read_info->stream.opaque = (voidpf)0; + pfile_in_zip_read_info->stream.next_in = (voidpf)0; + pfile_in_zip_read_info->stream.avail_in = 0; + + err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0); + if (err == Z_OK) + pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED; + else + { + TRYFREE(pfile_in_zip_read_info); + return err; + } +#else + pfile_in_zip_read_info->raw=1; +#endif + } + else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw)) { @@ -1145,7 +1185,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); if (err == Z_OK) - pfile_in_zip_read_info->stream_initialised=1; + pfile_in_zip_read_info->stream_initialised=Z_DEFLATED; else { TRYFREE(pfile_in_zip_read_info); @@ -1173,6 +1213,8 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) s->pfile_in_zip_read = pfile_in_zip_read_info; + s->encrypted = 0; + # ifndef NOUNCRYPT if (password != NULL) { @@ -1344,6 +1386,53 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len) iRead += uDoCopy; } else + if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED) + { +#ifdef HAVE_BZIP2 + uLong uTotalOutBefore,uTotalOutAfter; + const Bytef *bufBefore; + uLong uOutThis; + + pfile_in_zip_read_info->bstream.next_in = pfile_in_zip_read_info->stream.next_in; + pfile_in_zip_read_info->bstream.avail_in = pfile_in_zip_read_info->stream.avail_in; + pfile_in_zip_read_info->bstream.total_in_lo32 = pfile_in_zip_read_info->stream.total_in; + pfile_in_zip_read_info->bstream.total_in_hi32 = 0; + pfile_in_zip_read_info->bstream.next_out = pfile_in_zip_read_info->stream.next_out; + pfile_in_zip_read_info->bstream.avail_out = pfile_in_zip_read_info->stream.avail_out; + pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out; + pfile_in_zip_read_info->bstream.total_out_hi32 = 0; + + uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32; + bufBefore = pfile_in_zip_read_info->bstream.next_out; + + err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream); + + uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32; + uOutThis = uTotalOutAfter-uTotalOutBefore; + + pfile_in_zip_read_info->crc32 = + crc32(pfile_in_zip_read_info->crc32,bufBefore, + (uInt)(uOutThis)); + + pfile_in_zip_read_info->rest_read_uncompressed -= + uOutThis; + + iRead += (uInt)(uTotalOutAfter - uTotalOutBefore); + + pfile_in_zip_read_info->stream.next_in = pfile_in_zip_read_info->bstream.next_in; + pfile_in_zip_read_info->stream.avail_in = pfile_in_zip_read_info->bstream.avail_in; + pfile_in_zip_read_info->stream.total_in = pfile_in_zip_read_info->bstream.total_in_lo32; + pfile_in_zip_read_info->stream.next_out = pfile_in_zip_read_info->bstream.next_out; + pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out; + pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32; + + if (err==BZ_STREAM_END) + return (iRead==0) ? UNZ_EOF : iRead; + if (err!=BZ_OK) + break; +#endif + } + else { uLong uTotalOutBefore,uTotalOutAfter; const Bytef *bufBefore; @@ -1522,8 +1611,12 @@ extern int ZEXPORT unzCloseCurrentFile (file) TRYFREE(pfile_in_zip_read_info->read_buffer); pfile_in_zip_read_info->read_buffer = NULL; - if (pfile_in_zip_read_info->stream_initialised) + if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED) inflateEnd(&pfile_in_zip_read_info->stream); +#ifdef HAVE_BZIP2 + else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED) + BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream); +#endif pfile_in_zip_read_info->stream_initialised = 0; TRYFREE(pfile_in_zip_read_info); @@ -1544,7 +1637,6 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) char *szComment; uLong uSizeBuf; { - /* int err=UNZ_OK; */ unz_s* s; uLong uReadThis ; if (file==NULL) @@ -1577,7 +1669,7 @@ extern uLong ZEXPORT unzGetOffset (file) unz_s* s; if (file==NULL) - return UNZ_PARAMERROR; + return 0; s=(unz_s*)file; if (!s->current_file_ok) return 0; diff --git a/unzip/unzip.h b/unzip/unzip.h index b247937c..94c1b69b 100644 --- a/unzip/unzip.h +++ b/unzip/unzip.h @@ -1,7 +1,7 @@ /* unzip.h -- IO for uncompress .zip files using zlib - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g WinZip, InfoZip tools and compatible. @@ -57,6 +57,12 @@ extern "C" { #include "ioapi.h" #endif +#ifdef HAVE_BZIP2 +#include "bzlib.h" +#endif + +#define Z_BZIP2ED 12 + #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) /* like the STRICT of WIN32, we define a pointer that cannot be converted from (void*) without cast */ diff --git a/unzip/zip.c b/unzip/zip.c index f1948013..1451d61d 100644 --- a/unzip/zip.c +++ b/unzip/zip.c @@ -1,10 +1,10 @@ /* zip.c -- IO on .zip files using zlib - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 27 Dec 2004 Rolf Kalbermatter Modification to zipOpen2 to support globalComment retrieval. - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant Read zip.h for more info */ @@ -189,14 +189,13 @@ local void init_linkedlist(ll) ll->first_block = ll->last_block = NULL; } -/* Unused local void free_linkedlist(ll) linkedlist_data* ll; { free_datablock(ll->first_block); ll->first_block = ll->last_block = NULL; } -*/ + local int add_data_in_datablock(ll,buf,len) linkedlist_data* ll; @@ -321,9 +320,9 @@ local uLong ziplocal_TmzDateToDosDate(ptm,dosDate) uLong dosDate; { uLong year = (uLong)ptm->tm_year; - if (year>1980) + if (year>=1980) year-=1980; - else if (year>80) + else if (year>=80) year-=80; return (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) | @@ -433,67 +432,69 @@ local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX) /* Locate the Central directory of a zipfile (at the end, just before the global comment) + Fix from Riccardo Cohen */ local uLong ziplocal_SearchCentralDir OF(( const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream)); local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; { - unsigned char* buf; - uLong uSizeFile; - uLong uBackRead; - uLong uMaxBack=0xffff; /* maximum size of global comment */ - uLong uPosFound=0; + unsigned char* buf; + uLong uSizeFile; + uLong uBackRead; + uLong uMaxBack=0xffff; /* maximum size of global comment */ + uLong uPosFound=0; - if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) - return 0; + if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) + return 0; - uSizeFile = ZTELL(*pzlib_filefunc_def,filestream); + uSizeFile = ZTELL(*pzlib_filefunc_def,filestream); - if (uMaxBack>uSizeFile) - uMaxBack = uSizeFile; + if (uMaxBack>uSizeFile) + uMaxBack = uSizeFile; - buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4); - if (buf==NULL) - return 0; + buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4); + if (buf==NULL) + return 0; - uBackRead = 4; - while (uBackReaduMaxBack) - uBackRead = uMaxBack; - else - uBackRead+=BUFREADCOMMENT; - uReadPos = uSizeFile-uBackRead ; + uBackRead = 4; + while (uBackReaduMaxBack) + uBackRead = uMaxBack; + else + uBackRead+=BUFREADCOMMENT; + uReadPos = uSizeFile-uBackRead ; - uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? - (BUFREADCOMMENT+4) : (uSizeFile-uReadPos); - if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0) - break; + uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? + (BUFREADCOMMENT+4) : (uSizeFile-uReadPos); + if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0) + break; - if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize) - break; + if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize) + break; - for (i=(int)uReadSize-3; (i--)>0;) - if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && - ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) - { - uPosFound = uReadPos+i; - break; - } + for (i=(int)uReadSize-3; (i--)>0;) + if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && + ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) + { + uPosFound = uReadPos+i; + break; + } - if (uPosFound!=0) - break; - } - TRYFREE(buf); - return uPosFound; + if (uPosFound!=0) + break; + } + TRYFREE(buf); + return uPosFound; } + #endif /* !NO_ADDFILEINEXISTINGZIP*/ /************************************************************/ @@ -522,6 +523,8 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc if (ziinit.filestream == NULL) return NULL; + if (append == APPEND_STATUS_CREATEAFTER) + ZSEEK(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END); ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream); ziinit.in_opened_file_inzip = 0; ziinit.ci.stream_initialised = 0; @@ -559,9 +562,10 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc uLong size_comment; central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream); +/* disable to allow appending to empty ZIP archive if (central_pos==0) err=ZIP_ERRNO; - +*/ if (ZSEEK(ziinit.z_filefunc, ziinit.filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0) err=ZIP_ERRNO; @@ -616,7 +620,7 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc if (size_comment>0) { - ziinit.globalcomment = ALLOC(size_comment+1); + ziinit.globalcomment = (char*)ALLOC(size_comment+1); if (ziinit.globalcomment) { size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment); @@ -688,12 +692,12 @@ extern zipFile ZEXPORT zipOpen (pathname, append) return zipOpen2(pathname,append,NULL,NULL); } -extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, +extern int ZEXPORT zipOpenNewFileInZip4 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, comment, method, level, raw, windowBits, memLevel, strategy, - password, crcForCrypting) + password, crcForCrypting, versionMadeBy, flagBase) zipFile file; const char* filename; const zip_fileinfo* zipfi; @@ -710,6 +714,8 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, int strategy; const char* password; uLong crcForCrypting; + uLong versionMadeBy; + uLong flagBase; { zip_internal* zi; uInt size_filename; @@ -756,7 +762,7 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate); } - zi->ci.flag = 0; + zi->ci.flag = flagBase; if ((level==8) || (level==9)) zi->ci.flag |= 2; if ((level==2)) @@ -779,7 +785,7 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4); /* version info */ - ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2); + ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2); ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2); ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2); ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2); @@ -858,6 +864,7 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, zi->ci.stream.next_out = zi->ci.buffered_data; zi->ci.stream.total_in = 0; zi->ci.stream.total_out = 0; + zi->ci.stream.data_type = Z_BINARY; if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) { @@ -913,14 +920,46 @@ extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, int level; int raw; { - return zipOpenNewFileInZip3 (file, filename, zipfi, + return zipOpenNewFileInZip4 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, comment, method, level, raw, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, - NULL, 0); + NULL, 0, VERSIONMADEBY, 0); } +extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level, raw, + windowBits, memLevel, strategy, + password, crcForCrypting) + zipFile file; + const char* filename; + const zip_fileinfo* zipfi; + const void* extrafield_local; + uInt size_extrafield_local; + const void* extrafield_global; + uInt size_extrafield_global; + const char* comment; + int method; + int level; + int raw; + int windowBits; + int memLevel; + int strategy; + const char* password; + uLong crcForCrypting; +{ + return zipOpenNewFileInZip4 (file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level, raw, + windowBits, memLevel, strategy, + password, crcForCrypting, VERSIONMADEBY, 0); +} + + extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, @@ -936,10 +975,12 @@ extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, int method; int level; { - return zipOpenNewFileInZip2 (file, filename, zipfi, + return zipOpenNewFileInZip4 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, - comment, method, level, 0); + comment, method, level, 0, + -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, + NULL, 0, VERSIONMADEBY, 0); } local int zipFlushWriteBuffer(zi) @@ -979,9 +1020,9 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len) if (zi->in_opened_file_inzip == 0) return ZIP_PARAMERROR; - zi->ci.stream.next_in = (void*)buf; + zi->ci.stream.next_in = (Bytef*)buf; zi->ci.stream.avail_in = len; - zi->ci.crc32 = crc32(zi->ci.crc32,buf,len); + zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len); while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0)) { @@ -1071,7 +1112,9 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) { - err=deflateEnd(&zi->ci.stream); + int tmp_err=deflateEnd(&zi->ci.stream); + if (err == ZIP_OK) + err = tmp_err; zi->ci.stream_initialised = 0; } @@ -1174,7 +1217,7 @@ extern int ZEXPORT zipClose (file, global_comment) ldi = ldi->next_datablock; } } - free_datablock(zi->central_dir.first_block); + free_linkedlist(&(zi->central_dir)); if (err==ZIP_OK) /* Magic End */ err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4); diff --git a/unzip/zip.h b/unzip/zip.h index acacce83..39215cad 100644 --- a/unzip/zip.h +++ b/unzip/zip.h @@ -1,7 +1,7 @@ /* zip.h -- IO for compress .zip files using zlib - Version 1.01e, February 12th, 2005 + Version 1.01h, December 28th, 2009 - Copyright (C) 1998-2005 Gilles Vollant + Copyright (C) 1998-2009 Gilles Vollant This unzip package allow creates .ZIP file, compatible with PKZip 2.04g WinZip, InfoZip tools and compatible. @@ -191,8 +191,7 @@ extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file, int memLevel, int strategy, const char* password, - uLong crcForCtypting)); - + uLong crcForCrypting)); /* Same than zipOpenNewFileInZip2, except windowBits,memLevel,,strategy : see parameter strategy in deflateInit2 @@ -200,6 +199,29 @@ extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file, crcForCtypting : crc of file to compress (needed for crypting) */ +extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level, + int raw, + int windowBits, + int memLevel, + int strategy, + const char* password, + uLong crcForCrypting, + uLong versionMadeBy, + uLong flagBase)); +/* + Same than zipOpenNewFileInZip4, except + versionMadeBy : value for Version made by field + flag : value for flag field (compression level info will be added) + */ extern int ZEXPORT zipWriteInFileInZip OF((zipFile file, const void* buf, diff --git a/win32/AVIOutput.cpp b/win32/AVIOutput.cpp index 1f565d4b..9aead973 100644 --- a/win32/AVIOutput.cpp +++ b/win32/AVIOutput.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/AVIOutput.h b/win32/AVIOutput.h index 40a55edd..779167d4 100644 --- a/win32/AVIOutput.h +++ b/win32/AVIOutput.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CDirect3D.cpp b/win32/CDirect3D.cpp index 9bf37919..c0f09a9d 100644 --- a/win32/CDirect3D.cpp +++ b/win32/CDirect3D.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -178,9 +179,6 @@ #pragma comment( lib, "d3dx9" ) #pragma comment( lib, "DxErr" ) -#pragma comment( lib, "cg.lib" ) -#pragma comment( lib, "cgd3d9.lib" ) - #include "cdirect3d.h" #include "win32_display.h" #include "../snes9x.h" @@ -225,6 +223,7 @@ CDirect3D::CDirect3D() shaderTimeElapsed = 0; cgContext = NULL; cgVertexProgram = cgFragmentProgram = NULL; + cgAvailable = false; } /* CDirect3D::~CDirect3D() @@ -279,10 +278,14 @@ bool CDirect3D::Initialize(HWND hWnd) return false; } - cgContext = cgCreateContext(); - hr = cgD3D9SetDevice(pDevice); - if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(TEXT("Error setting cg device"), hr); + cgAvailable = loadCgFunctions(); + + if(cgAvailable) { + cgContext = cgCreateContext(); + hr = cgD3D9SetDevice(pDevice); + if(FAILED(hr)) { + DXTRACE_ERR_MSGBOX(TEXT("Error setting cg device"), hr); + } } pDevice->SetRenderState(D3DRS_LIGHTING, FALSE); @@ -304,6 +307,14 @@ void CDirect3D::DeInitialize() DestroyDrawSurface(); SetShader(NULL); + if(cgContext) { + cgDestroyContext(cgContext); + cgContext = NULL; + } + + if(cgAvailable) + cgD3D9SetDevice(NULL); + if(vertexBuffer) { vertexBuffer->Release(); vertexBuffer = NULL; @@ -319,19 +330,15 @@ void CDirect3D::DeInitialize() pD3D = NULL; } - if(cgContext) { - cgDestroyContext(cgContext); - cgContext = NULL; - } - - cgD3D9SetDevice(NULL); - init_done = false; afterRenderWidth = 0; afterRenderHeight = 0; quadTextureSize = 0; fullscreen = false; filterScale = 0; + if(cgAvailable) + unloadCgLibrary(); + cgAvailable = false; } bool CDirect3D::SetShader(const TCHAR *file) @@ -383,6 +390,12 @@ bool CDirect3D::SetShaderCG(const TCHAR *file) if (file == NULL || *file==TEXT('\0')) return true; + if(!cgAvailable) { + MessageBox(NULL, TEXT("The CG runtime is unavailable, CG shaders will not run.\nConsult the snes9x readme for information on how to obtain the runtime."), TEXT("CG Error"), + MB_OK|MB_ICONEXCLAMATION); + return false; + } + CGprofile vertexProfile = cgD3D9GetLatestVertexProfile(); CGprofile pixelProfile = cgD3D9GetLatestPixelProfile(); @@ -933,6 +946,10 @@ bool CDirect3D::ResetDevice() //release prior to reset DestroyDrawSurface(); + if(cgAvailable) { + cgD3D9SetDevice(NULL); + } + if(effect) effect->OnLostDevice(); @@ -965,6 +982,10 @@ bool CDirect3D::ResetDevice() if(effect) effect->OnResetDevice(); + if(cgAvailable) { + cgD3D9SetDevice(pDevice); + } + if(GUI.BilinearFilter) { pDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); pDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); diff --git a/win32/CDirect3D.h b/win32/CDirect3D.h index 813b4078..92b1a9ae 100644 --- a/win32/CDirect3D.h +++ b/win32/CDirect3D.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -183,8 +184,7 @@ #include #include -#include -#include +#include "cgFunctions.h" #include "render.h" #include "wsnes9x.h" @@ -225,6 +225,7 @@ private: CGcontext cgContext; CGprogram cgVertexProgram, cgFragmentProgram; current_d3d_shader_type shader_type; + bool cgAvailable; float shaderTimer; int shaderTimeStart; diff --git a/win32/CDirectDraw.cpp b/win32/CDirectDraw.cpp index e890c1b0..4943a226 100644 --- a/win32/CDirectDraw.cpp +++ b/win32/CDirectDraw.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CDirectDraw.h b/win32/CDirectDraw.h index 0b0c45c0..afb8ec7a 100644 --- a/win32/CDirectDraw.h +++ b/win32/CDirectDraw.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CDirectSound.cpp b/win32/CDirectSound.cpp index 8cccc6e0..8dc6c948 100644 --- a/win32/CDirectSound.cpp +++ b/win32/CDirectSound.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CDirectSound.h b/win32/CDirectSound.h index d1b80e7d..c569f1cf 100644 --- a/win32/CDirectSound.h +++ b/win32/CDirectSound.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CFMOD.cpp b/win32/CFMOD.cpp index 13f99aed..2c2c9a14 100644 --- a/win32/CFMOD.cpp +++ b/win32/CFMOD.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CFMOD.h b/win32/CFMOD.h index 9ecfe6a5..d67c7359 100644 --- a/win32/CFMOD.h +++ b/win32/CFMOD.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/COpenGL.cpp b/win32/COpenGL.cpp index 0b14c952..4775cbca 100644 --- a/win32/COpenGL.cpp +++ b/win32/COpenGL.cpp @@ -1,3 +1,182 @@ +/*********************************************************************************** + Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. + + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), + Jerremy Koot (jkoot@snes9x.com) + + (c) Copyright 2002 - 2004 Matthew Kendora + + (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) + + (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) + + (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) + + (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), + Kris Bleakley (codeviolation@hotmail.com) + + (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), + Nach (n-a-c-h@users.sourceforge.net), + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2006 - 2007 nitsuja + + (c) Copyright 2009 - 2011 BearOso, + OV2 + + + BS-X C emulator code + (c) Copyright 2005 - 2006 Dreamer Nom, + zones + + C4 x86 assembler and some C emulation code + (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), + Nach, + zsKnight (zsknight@zsnes.com) + + C4 C++ code + (c) Copyright 2003 - 2006 Brad Jorsch, + Nach + + DSP-1 emulator code + (c) Copyright 1998 - 2006 _Demo_, + Andreas Naive (andreasnaive@gmail.com), + Gary Henderson, + Ivar (ivar@snes9x.com), + John Weidman, + Kris Bleakley, + Matthew Kendora, + Nach, + neviksti (neviksti@hotmail.com) + + DSP-2 emulator code + (c) Copyright 2003 John Weidman, + Kris Bleakley, + Lord Nightmare (lord_nightmare@users.sourceforge.net), + Matthew Kendora, + neviksti + + DSP-3 emulator code + (c) Copyright 2003 - 2006 John Weidman, + Kris Bleakley, + Lancer, + z80 gaiden + + DSP-4 emulator code + (c) Copyright 2004 - 2006 Dreamer Nom, + John Weidman, + Kris Bleakley, + Nach, + z80 gaiden + + OBC1 emulator code + (c) Copyright 2001 - 2004 zsKnight, + pagefault (pagefault@zsnes.com), + Kris Bleakley + Ported from x86 assembler to C by sanmaiwashi + + SPC7110 and RTC C++ emulator code used in 1.39-1.51 + (c) Copyright 2002 Matthew Kendora with research by + zsKnight, + John Weidman, + Dark Force + + SPC7110 and RTC C++ emulator code used in 1.52+ + (c) Copyright 2009 byuu, + neviksti + + S-DD1 C emulator code + (c) Copyright 2003 Brad Jorsch with research by + Andreas Naive, + John Weidman + + S-RTC C emulator code + (c) Copyright 2001 - 2006 byuu, + John Weidman + + ST010 C++ emulator code + (c) Copyright 2003 Feather, + John Weidman, + Kris Bleakley, + Matthew Kendora + + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 _Demo_, + pagefault, + zsKnight + + Super FX C emulator code + (c) Copyright 1997 - 1999 Ivar, + Gary Henderson, + John Weidman + + Sound emulator code used in 1.5-1.51 + (c) Copyright 1998 - 2003 Brad Martin + (c) Copyright 1998 - 2006 Charles Bilyue' + + Sound emulator code used in 1.52+ + (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) + + SH assembler code partly based on x86 assembler code + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + + 2xSaI filter + (c) Copyright 1999 - 2001 Derek Liauw Kie Fa + + HQ2x, HQ3x, HQ4x filters + (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) + + NTSC filter + (c) Copyright 2006 - 2007 Shay Green + + GTK+ GUI code + (c) Copyright 2004 - 2011 BearOso + + Win32 GUI code + (c) Copyright 2003 - 2006 blip, + funkyass, + Matthew Kendora, + Nach, + nitsuja + (c) Copyright 2009 - 2011 OV2 + + Mac OS GUI code + (c) Copyright 1998 - 2001 John Stiles + (c) Copyright 2001 - 2011 zones + + + Specific ports contains the works of other authors. See headers in + individual files. + + + Snes9x homepage: http://www.snes9x.com/ + + Permission to use, copy, modify and/or distribute Snes9x in both binary + and source form, for non-commercial purposes, is hereby granted without + fee, providing that this license information and copyright notice appear + with all copies and any derived work. + + This software is provided 'as-is', without any express or implied + warranty. In no event shall the authors be held liable for any damages + arising from the use of this software or it's derivatives. + + Snes9x is freeware for PERSONAL USE only. Commercial users should + seek permission of the copyright holders first. Commercial use includes, + but is not limited to, charging money for Snes9x or software derived from + Snes9x, including Snes9x or derivatives in commercial game bundles, and/or + using Snes9x as a promotion for your commercial product. + + The copyright holders request that bug fixes and improvements to the code + should be forwarded to them so everyone can benefit from the modifications + in future versions. + + Super NES and Super Nintendo Entertainment System are trademarks of + Nintendo Co., Limited and its subsidiary companies. + ***********************************************************************************/ + + + #include "COpenGL.h" #include "win32_display.h" #include "../snes9x.h" @@ -9,9 +188,6 @@ #include "../filter/hq2x.h" #include "../filter/2xsai.h" -#pragma comment( lib, "cg.lib" ) -#pragma comment( lib, "cggl.lib" ) - COpenGL::COpenGL(void) { @@ -33,6 +209,7 @@ COpenGL::COpenGL(void) fragmentShader = 0; cgContext = NULL; cgVertexProgram = cgFragmentProgram = NULL; + cgAvailable = false; } COpenGL::~COpenGL(void) @@ -104,7 +281,10 @@ bool COpenGL::Initialize(HWND hWnd) glVertexPointer(2, GL_FLOAT, 0, vertices); glTexCoordPointer(2, GL_FLOAT, 0, texcoords); - cgContext = cgCreateContext(); + cgAvailable = loadCgFunctions(); + if(cgAvailable) { + cgContext = cgCreateContext(); + } GetClientRect(hWnd,&windowRect); ChangeRenderSize(windowRect.right,windowRect.bottom); @@ -139,6 +319,9 @@ void COpenGL::DeInitialize() afterRenderHeight = 0; shaderFunctionsLoaded = false; shader_type = OGL_SHADER_NONE; + if(cgAvailable) + unloadCgLibrary(); + cgAvailable = false; } void COpenGL::CreateDrawSurface() @@ -284,10 +467,6 @@ void COpenGL::Render(SSurface Src) cgGLSetStateMatrixParameter(cgpModelViewProj, CG_GL_MODELVIEW_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY); - CGparameter cgpVideoSize = cgGetNamedParameter(cgFragmentProgram, "IN.video_size"); - CGparameter cgpTextureSize = cgGetNamedParameter(cgFragmentProgram, "IN.texture_size"); - CGparameter cgpOutputSize = cgGetNamedParameter(cgFragmentProgram, "IN.output_size"); - #define setProgram2fv(program,varname,floats)\ {\ CGparameter cgp = cgGetNamedParameter(program, varname);\ @@ -521,6 +700,7 @@ bool COpenGL::SetShadersCG(const TCHAR *file) { TCHAR errorMsg[MAX_PATH + 50]; HRESULT hr; + CGprofile vertexProfile, fragmentProfile; if(cgFragmentProgram) { cgDestroyProgram(cgFragmentProgram); @@ -531,15 +711,23 @@ bool COpenGL::SetShadersCG(const TCHAR *file) cgVertexProgram = NULL; } - CGprofile vertexProfile = cgGLGetLatestProfile(CG_GL_VERTEX); - CGprofile fragmentProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT); + if(cgAvailable) { + vertexProfile = cgGLGetLatestProfile(CG_GL_VERTEX); + fragmentProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT); - cgGLDisableProfile(vertexProfile); - cgGLDisableProfile(fragmentProfile); + cgGLDisableProfile(vertexProfile); + cgGLDisableProfile(fragmentProfile); + } if (file == NULL || *file==TEXT('\0')) return true; + if(!cgAvailable) { + MessageBox(NULL, TEXT("The CG runtime is unavailable, CG shaders will not run.\nConsult the snes9x readme for information on how to obtain the runtime."), TEXT("CG Error"), + MB_OK|MB_ICONEXCLAMATION); + return false; + } + cgGLSetOptimalOptions(vertexProfile); cgGLSetOptimalOptions(fragmentProfile); diff --git a/win32/COpenGL.h b/win32/COpenGL.h index 8adb1518..4837d9bf 100644 --- a/win32/COpenGL.h +++ b/win32/COpenGL.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -181,8 +182,7 @@ #include #include -#include -#include +#include "cgFunctions.h" #include "glext.h" #include "wglext.h" @@ -215,6 +215,7 @@ private: CGcontext cgContext; CGprogram cgVertexProgram, cgFragmentProgram; current_ogl_shader_type shader_type; + bool cgAvailable; GLuint shaderProgram; GLuint vertexShader; diff --git a/win32/CXAudio2.cpp b/win32/CXAudio2.cpp index c6f6f48f..ba4297be 100644 --- a/win32/CXAudio2.cpp +++ b/win32/CXAudio2.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/CXAudio2.h b/win32/CXAudio2.h index 9626e0cc..4e74983e 100644 --- a/win32/CXAudio2.h +++ b/win32/CXAudio2.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/IS9xDisplayOutput.h b/win32/IS9xDisplayOutput.h index 20cfec01..449cea01 100644 --- a/win32/IS9xDisplayOutput.h +++ b/win32/IS9xDisplayOutput.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/IS9xSoundOutput.h b/win32/IS9xSoundOutput.h index b4ad2b94..7ac7c1bd 100644 --- a/win32/IS9xSoundOutput.h +++ b/win32/IS9xSoundOutput.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/InputCustom.cpp b/win32/InputCustom.cpp index 031bbdce..d86813ad 100644 --- a/win32/InputCustom.cpp +++ b/win32/InputCustom.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/InputCustom.h b/win32/InputCustom.h index 3698f3eb..d3ef0cd0 100644 --- a/win32/InputCustom.h +++ b/win32/InputCustom.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/_tfwopen.cpp b/win32/_tfwopen.cpp index 15d848ef..6cb86a2b 100644 --- a/win32/_tfwopen.cpp +++ b/win32/_tfwopen.cpp @@ -1,3 +1,181 @@ +/*********************************************************************************** + Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. + + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), + Jerremy Koot (jkoot@snes9x.com) + + (c) Copyright 2002 - 2004 Matthew Kendora + + (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) + + (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) + + (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) + + (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), + Kris Bleakley (codeviolation@hotmail.com) + + (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), + Nach (n-a-c-h@users.sourceforge.net), + zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2006 - 2007 nitsuja + + (c) Copyright 2009 - 2010 BearOso, + OV2 + + + BS-X C emulator code + (c) Copyright 2005 - 2006 Dreamer Nom, + zones + + C4 x86 assembler and some C emulation code + (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), + Nach, + zsKnight (zsknight@zsnes.com) + + C4 C++ code + (c) Copyright 2003 - 2006 Brad Jorsch, + Nach + + DSP-1 emulator code + (c) Copyright 1998 - 2006 _Demo_, + Andreas Naive (andreasnaive@gmail.com), + Gary Henderson, + Ivar (ivar@snes9x.com), + John Weidman, + Kris Bleakley, + Matthew Kendora, + Nach, + neviksti (neviksti@hotmail.com) + + DSP-2 emulator code + (c) Copyright 2003 John Weidman, + Kris Bleakley, + Lord Nightmare (lord_nightmare@users.sourceforge.net), + Matthew Kendora, + neviksti + + DSP-3 emulator code + (c) Copyright 2003 - 2006 John Weidman, + Kris Bleakley, + Lancer, + z80 gaiden + + DSP-4 emulator code + (c) Copyright 2004 - 2006 Dreamer Nom, + John Weidman, + Kris Bleakley, + Nach, + z80 gaiden + + OBC1 emulator code + (c) Copyright 2001 - 2004 zsKnight, + pagefault (pagefault@zsnes.com), + Kris Bleakley + Ported from x86 assembler to C by sanmaiwashi + + SPC7110 and RTC C++ emulator code used in 1.39-1.51 + (c) Copyright 2002 Matthew Kendora with research by + zsKnight, + John Weidman, + Dark Force + + SPC7110 and RTC C++ emulator code used in 1.52+ + (c) Copyright 2009 byuu, + neviksti + + S-DD1 C emulator code + (c) Copyright 2003 Brad Jorsch with research by + Andreas Naive, + John Weidman + + S-RTC C emulator code + (c) Copyright 2001 - 2006 byuu, + John Weidman + + ST010 C++ emulator code + (c) Copyright 2003 Feather, + John Weidman, + Kris Bleakley, + Matthew Kendora + + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 _Demo_, + pagefault, + zsKnight + + Super FX C emulator code + (c) Copyright 1997 - 1999 Ivar, + Gary Henderson, + John Weidman + + Sound emulator code used in 1.5-1.51 + (c) Copyright 1998 - 2003 Brad Martin + (c) Copyright 1998 - 2006 Charles Bilyue' + + Sound emulator code used in 1.52+ + (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) + + SH assembler code partly based on x86 assembler code + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + + 2xSaI filter + (c) Copyright 1999 - 2001 Derek Liauw Kie Fa + + HQ2x, HQ3x, HQ4x filters + (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) + + NTSC filter + (c) Copyright 2006 - 2007 Shay Green + + GTK+ GUI code + (c) Copyright 2004 - 2010 BearOso + + Win32 GUI code + (c) Copyright 2003 - 2006 blip, + funkyass, + Matthew Kendora, + Nach, + nitsuja + (c) Copyright 2009 - 2010 OV2 + + Mac OS GUI code + (c) Copyright 1998 - 2001 John Stiles + (c) Copyright 2001 - 2010 zones + + + Specific ports contains the works of other authors. See headers in + individual files. + + + Snes9x homepage: http://www.snes9x.com/ + + Permission to use, copy, modify and/or distribute Snes9x in both binary + and source form, for non-commercial purposes, is hereby granted without + fee, providing that this license information and copyright notice appear + with all copies and any derived work. + + This software is provided 'as-is', without any express or implied + warranty. In no event shall the authors be held liable for any damages + arising from the use of this software or it's derivatives. + + Snes9x is freeware for PERSONAL USE only. Commercial users should + seek permission of the copyright holders first. Commercial use includes, + but is not limited to, charging money for Snes9x or software derived from + Snes9x, including Snes9x or derivatives in commercial game bundles, and/or + using Snes9x as a promotion for your commercial product. + + The copyright holders request that bug fixes and improvements to the code + should be forwarded to them so everyone can benefit from the modifications + in future versions. + + Super NES and Super Nintendo Entertainment System are trademarks of + Nintendo Co., Limited and its subsidiary companies. + ***********************************************************************************/ + + + #ifdef UNICODE #include #include "_tfwopen.h" @@ -25,4 +203,4 @@ extern "C" int _twremove(const char *filename ) { return _wremove(Utf8ToWide(filename)); } -#endif // UNICODE \ No newline at end of file +#endif // UNICODE diff --git a/win32/_tfwopen.h b/win32/_tfwopen.h index 0dd94e28..23dce67d 100644 --- a/win32/_tfwopen.h +++ b/win32/_tfwopen.h @@ -1,3 +1,181 @@ +/*********************************************************************************** + Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. + + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), + Jerremy Koot (jkoot@snes9x.com) + + (c) Copyright 2002 - 2004 Matthew Kendora + + (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) + + (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) + + (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) + + (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), + Kris Bleakley (codeviolation@hotmail.com) + + (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), + Nach (n-a-c-h@users.sourceforge.net), + zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2006 - 2007 nitsuja + + (c) Copyright 2009 - 2010 BearOso, + OV2 + + + BS-X C emulator code + (c) Copyright 2005 - 2006 Dreamer Nom, + zones + + C4 x86 assembler and some C emulation code + (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), + Nach, + zsKnight (zsknight@zsnes.com) + + C4 C++ code + (c) Copyright 2003 - 2006 Brad Jorsch, + Nach + + DSP-1 emulator code + (c) Copyright 1998 - 2006 _Demo_, + Andreas Naive (andreasnaive@gmail.com), + Gary Henderson, + Ivar (ivar@snes9x.com), + John Weidman, + Kris Bleakley, + Matthew Kendora, + Nach, + neviksti (neviksti@hotmail.com) + + DSP-2 emulator code + (c) Copyright 2003 John Weidman, + Kris Bleakley, + Lord Nightmare (lord_nightmare@users.sourceforge.net), + Matthew Kendora, + neviksti + + DSP-3 emulator code + (c) Copyright 2003 - 2006 John Weidman, + Kris Bleakley, + Lancer, + z80 gaiden + + DSP-4 emulator code + (c) Copyright 2004 - 2006 Dreamer Nom, + John Weidman, + Kris Bleakley, + Nach, + z80 gaiden + + OBC1 emulator code + (c) Copyright 2001 - 2004 zsKnight, + pagefault (pagefault@zsnes.com), + Kris Bleakley + Ported from x86 assembler to C by sanmaiwashi + + SPC7110 and RTC C++ emulator code used in 1.39-1.51 + (c) Copyright 2002 Matthew Kendora with research by + zsKnight, + John Weidman, + Dark Force + + SPC7110 and RTC C++ emulator code used in 1.52+ + (c) Copyright 2009 byuu, + neviksti + + S-DD1 C emulator code + (c) Copyright 2003 Brad Jorsch with research by + Andreas Naive, + John Weidman + + S-RTC C emulator code + (c) Copyright 2001 - 2006 byuu, + John Weidman + + ST010 C++ emulator code + (c) Copyright 2003 Feather, + John Weidman, + Kris Bleakley, + Matthew Kendora + + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 _Demo_, + pagefault, + zsKnight + + Super FX C emulator code + (c) Copyright 1997 - 1999 Ivar, + Gary Henderson, + John Weidman + + Sound emulator code used in 1.5-1.51 + (c) Copyright 1998 - 2003 Brad Martin + (c) Copyright 1998 - 2006 Charles Bilyue' + + Sound emulator code used in 1.52+ + (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) + + SH assembler code partly based on x86 assembler code + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + + 2xSaI filter + (c) Copyright 1999 - 2001 Derek Liauw Kie Fa + + HQ2x, HQ3x, HQ4x filters + (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) + + NTSC filter + (c) Copyright 2006 - 2007 Shay Green + + GTK+ GUI code + (c) Copyright 2004 - 2010 BearOso + + Win32 GUI code + (c) Copyright 2003 - 2006 blip, + funkyass, + Matthew Kendora, + Nach, + nitsuja + (c) Copyright 2009 - 2010 OV2 + + Mac OS GUI code + (c) Copyright 1998 - 2001 John Stiles + (c) Copyright 2001 - 2010 zones + + + Specific ports contains the works of other authors. See headers in + individual files. + + + Snes9x homepage: http://www.snes9x.com/ + + Permission to use, copy, modify and/or distribute Snes9x in both binary + and source form, for non-commercial purposes, is hereby granted without + fee, providing that this license information and copyright notice appear + with all copies and any derived work. + + This software is provided 'as-is', without any express or implied + warranty. In no event shall the authors be held liable for any damages + arising from the use of this software or it's derivatives. + + Snes9x is freeware for PERSONAL USE only. Commercial users should + seek permission of the copyright holders first. Commercial use includes, + but is not limited to, charging money for Snes9x or software derived from + Snes9x, including Snes9x or derivatives in commercial game bundles, and/or + using Snes9x as a promotion for your commercial product. + + The copyright holders request that bug fixes and improvements to the code + should be forwarded to them so everyone can benefit from the modifications + in future versions. + + Super NES and Super Nintendo Entertainment System are trademarks of + Nintendo Co., Limited and its subsidiary companies. + ***********************************************************************************/ + + + #ifdef UNICODE #ifndef _TFWOPEN_H #define _TFWOPEN_H diff --git a/win32/cgFunctions.cpp b/win32/cgFunctions.cpp new file mode 100644 index 00000000..2c88931d --- /dev/null +++ b/win32/cgFunctions.cpp @@ -0,0 +1,331 @@ +/*********************************************************************************** + Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. + + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), + Jerremy Koot (jkoot@snes9x.com) + + (c) Copyright 2002 - 2004 Matthew Kendora + + (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) + + (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) + + (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) + + (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), + Kris Bleakley (codeviolation@hotmail.com) + + (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), + Nach (n-a-c-h@users.sourceforge.net), + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2006 - 2007 nitsuja + + (c) Copyright 2009 - 2011 BearOso, + OV2 + + + BS-X C emulator code + (c) Copyright 2005 - 2006 Dreamer Nom, + zones + + C4 x86 assembler and some C emulation code + (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), + Nach, + zsKnight (zsknight@zsnes.com) + + C4 C++ code + (c) Copyright 2003 - 2006 Brad Jorsch, + Nach + + DSP-1 emulator code + (c) Copyright 1998 - 2006 _Demo_, + Andreas Naive (andreasnaive@gmail.com), + Gary Henderson, + Ivar (ivar@snes9x.com), + John Weidman, + Kris Bleakley, + Matthew Kendora, + Nach, + neviksti (neviksti@hotmail.com) + + DSP-2 emulator code + (c) Copyright 2003 John Weidman, + Kris Bleakley, + Lord Nightmare (lord_nightmare@users.sourceforge.net), + Matthew Kendora, + neviksti + + DSP-3 emulator code + (c) Copyright 2003 - 2006 John Weidman, + Kris Bleakley, + Lancer, + z80 gaiden + + DSP-4 emulator code + (c) Copyright 2004 - 2006 Dreamer Nom, + John Weidman, + Kris Bleakley, + Nach, + z80 gaiden + + OBC1 emulator code + (c) Copyright 2001 - 2004 zsKnight, + pagefault (pagefault@zsnes.com), + Kris Bleakley + Ported from x86 assembler to C by sanmaiwashi + + SPC7110 and RTC C++ emulator code used in 1.39-1.51 + (c) Copyright 2002 Matthew Kendora with research by + zsKnight, + John Weidman, + Dark Force + + SPC7110 and RTC C++ emulator code used in 1.52+ + (c) Copyright 2009 byuu, + neviksti + + S-DD1 C emulator code + (c) Copyright 2003 Brad Jorsch with research by + Andreas Naive, + John Weidman + + S-RTC C emulator code + (c) Copyright 2001 - 2006 byuu, + John Weidman + + ST010 C++ emulator code + (c) Copyright 2003 Feather, + John Weidman, + Kris Bleakley, + Matthew Kendora + + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 _Demo_, + pagefault, + zsKnight + + Super FX C emulator code + (c) Copyright 1997 - 1999 Ivar, + Gary Henderson, + John Weidman + + Sound emulator code used in 1.5-1.51 + (c) Copyright 1998 - 2003 Brad Martin + (c) Copyright 1998 - 2006 Charles Bilyue' + + Sound emulator code used in 1.52+ + (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) + + SH assembler code partly based on x86 assembler code + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + + 2xSaI filter + (c) Copyright 1999 - 2001 Derek Liauw Kie Fa + + HQ2x, HQ3x, HQ4x filters + (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) + + NTSC filter + (c) Copyright 2006 - 2007 Shay Green + + GTK+ GUI code + (c) Copyright 2004 - 2011 BearOso + + Win32 GUI code + (c) Copyright 2003 - 2006 blip, + funkyass, + Matthew Kendora, + Nach, + nitsuja + (c) Copyright 2009 - 2011 OV2 + + Mac OS GUI code + (c) Copyright 1998 - 2001 John Stiles + (c) Copyright 2001 - 2011 zones + + + Specific ports contains the works of other authors. See headers in + individual files. + + + Snes9x homepage: http://www.snes9x.com/ + + Permission to use, copy, modify and/or distribute Snes9x in both binary + and source form, for non-commercial purposes, is hereby granted without + fee, providing that this license information and copyright notice appear + with all copies and any derived work. + + This software is provided 'as-is', without any express or implied + warranty. In no event shall the authors be held liable for any damages + arising from the use of this software or it's derivatives. + + Snes9x is freeware for PERSONAL USE only. Commercial users should + seek permission of the copyright holders first. Commercial use includes, + but is not limited to, charging money for Snes9x or software derived from + Snes9x, including Snes9x or derivatives in commercial game bundles, and/or + using Snes9x as a promotion for your commercial product. + + The copyright holders request that bug fixes and improvements to the code + should be forwarded to them so everyone can benefit from the modifications + in future versions. + + Super NES and Super Nintendo Entertainment System are trademarks of + Nintendo Co., Limited and its subsidiary companies. + ***********************************************************************************/ + + + +#include "cgFunctions.h" + +HMODULE hCgDll = NULL; +HMODULE hCgD3D9Dll = NULL; +HMODULE hCgGLDll = NULL; + +//cg.dll +CGCC cgCreateContext = NULL; +CGDC cgDestroyContext = NULL; +CGGNP cgGetNamedParameter = NULL; +CGGE cgGetError = NULL; +CGGES cgGetErrorString = NULL; +CGGLL cgGetLastListing = NULL; +CGCP cgCreateProgram = NULL; +CGDP cgDestroyProgram = NULL; +//cgD3D9.dll +CGD3DSD cgD3D9SetDevice = NULL; +CGD3DBP cgD3D9BindProgram = NULL; +CGD3DGLVP cgD3D9GetLatestVertexProfile = NULL; +CGD3DGLPP cgD3D9GetLatestPixelProfile = NULL; +CGD3DGOO cgD3D9GetOptimalOptions = NULL; +CGD3DLP cgD3D9LoadProgram = NULL; +CGD3DSUM cgD3D9SetUniformMatrix = NULL; +CGD3DSU cgD3D9SetUniform = NULL; +//cggl.dll +CGGLSSMP cgGLSetStateMatrixParameter = NULL; +CGGLSP2FV cgGLSetParameter2fv = NULL; +CGGLGLP cgGLGetLatestProfile = NULL; +CGGLEP cgGLEnableProfile = NULL; +CGGLDP cgGLDisableProfile = NULL; +CGGLSOO cgGLSetOptimalOptions = NULL; +CGGLLP cgGLLoadProgram = NULL; +CGGLBP cgGLBindProgram = NULL; + +bool loadCgFunctions() +{ + if(hCgDll && hCgD3D9Dll && hCgGLDll) + return true; + + hCgDll = LoadLibrary(TEXT("cg.dll")); + if(hCgDll) { + hCgD3D9Dll = LoadLibrary(TEXT("cgD3D9.dll")); + hCgGLDll = LoadLibrary(TEXT("cgGL.dll")); + } + + if(!hCgDll || !hCgD3D9Dll || !hCgGLDll) { + unloadCgLibrary(); + return false; + } + + //cg.dll + cgCreateContext = (CGCC)GetProcAddress(hCgDll,"cgCreateContext"); + cgDestroyContext = (CGDC)GetProcAddress(hCgDll,"cgDestroyContext"); + cgGetNamedParameter = (CGGNP)GetProcAddress(hCgDll,"cgGetNamedParameter"); + cgGetError = (CGGE)GetProcAddress(hCgDll,"cgGetError"); + cgGetErrorString = (CGGES)GetProcAddress(hCgDll,"cgGetErrorString"); + cgGetLastListing = (CGGLL)GetProcAddress(hCgDll,"cgGetLastListing"); + cgCreateProgram = (CGCP)GetProcAddress(hCgDll,"cgCreateProgram"); + cgDestroyProgram = (CGDP)GetProcAddress(hCgDll,"cgDestroyProgram"); + //cgD3D9.dll + cgD3D9SetDevice = (CGD3DSD)GetProcAddress(hCgD3D9Dll,"cgD3D9SetDevice"); + cgD3D9BindProgram = (CGD3DBP)GetProcAddress(hCgD3D9Dll,"cgD3D9BindProgram"); + cgD3D9GetLatestVertexProfile = (CGD3DGLVP)GetProcAddress(hCgD3D9Dll,"cgD3D9GetLatestVertexProfile"); + cgD3D9GetLatestPixelProfile = (CGD3DGLPP)GetProcAddress(hCgD3D9Dll,"cgD3D9GetLatestPixelProfile"); + cgD3D9GetOptimalOptions = (CGD3DGOO)GetProcAddress(hCgD3D9Dll,"cgD3D9GetOptimalOptions"); + cgD3D9LoadProgram = (CGD3DLP)GetProcAddress(hCgD3D9Dll,"cgD3D9LoadProgram"); + cgD3D9SetUniformMatrix = (CGD3DSUM)GetProcAddress(hCgD3D9Dll,"cgD3D9SetUniformMatrix"); + cgD3D9SetUniform = (CGD3DSU)GetProcAddress(hCgD3D9Dll,"cgD3D9SetUniform"); + //cggl.dll + cgGLSetStateMatrixParameter = (CGGLSSMP)GetProcAddress(hCgGLDll,"cgGLSetStateMatrixParameter"); + cgGLSetParameter2fv = (CGGLSP2FV)GetProcAddress(hCgGLDll,"cgGLSetParameter2fv"); + cgGLGetLatestProfile = (CGGLGLP)GetProcAddress(hCgGLDll,"cgGLGetLatestProfile"); + cgGLEnableProfile = (CGGLEP)GetProcAddress(hCgGLDll,"cgGLEnableProfile"); + cgGLDisableProfile = (CGGLDP)GetProcAddress(hCgGLDll,"cgGLDisableProfile"); + cgGLSetOptimalOptions = (CGGLSOO)GetProcAddress(hCgGLDll,"cgGLSetOptimalOptions"); + cgGLLoadProgram = (CGGLLP)GetProcAddress(hCgGLDll,"cgGLLoadProgram"); + cgGLBindProgram = (CGGLBP)GetProcAddress(hCgGLDll,"cgGLBindProgram"); + + if( + //cg.dll + !cgCreateContext || + !cgDestroyContext || + !cgGetNamedParameter || + !cgGetError || + !cgGetErrorString || + !cgGetLastListing || + !cgCreateProgram || + !cgDestroyProgram || + //cgD3D9.dll + !cgD3D9SetDevice || + !cgD3D9BindProgram || + !cgD3D9GetLatestVertexProfile || + !cgD3D9GetLatestPixelProfile || + !cgD3D9GetOptimalOptions || + !cgD3D9LoadProgram || + !cgD3D9SetUniformMatrix || + !cgD3D9SetUniform || + //cggl.dll + !cgGLSetStateMatrixParameter || + !cgGLSetParameter2fv || + !cgGLGetLatestProfile || + !cgGLEnableProfile || + !cgGLDisableProfile || + !cgGLSetOptimalOptions || + !cgGLLoadProgram || + !cgGLBindProgram) { + unloadCgLibrary(); + return false; + } + + return true; +} + +void unloadCgLibrary() +{ + if(hCgDll) + FreeLibrary(hCgDll); + if(hCgD3D9Dll) + FreeLibrary(hCgD3D9Dll); + if(hCgGLDll) + FreeLibrary(hCgGLDll); + + hCgDll = hCgD3D9Dll = hCgGLDll = NULL; + + //cg.dll + cgCreateContext = NULL; + cgDestroyContext = NULL; + cgGetNamedParameter = NULL; + cgGetError = NULL; + cgGetErrorString = NULL; + cgGetLastListing = NULL; + cgCreateProgram = NULL; + cgDestroyProgram = NULL; + //cgD3D9.dll + cgD3D9SetDevice = NULL; + cgD3D9BindProgram = NULL; + cgD3D9GetLatestVertexProfile = NULL; + cgD3D9GetLatestPixelProfile = NULL; + cgD3D9GetOptimalOptions = NULL; + cgD3D9LoadProgram = NULL; + cgD3D9SetUniformMatrix = NULL; + cgD3D9SetUniform = NULL; + //cggl.dll + cgGLSetStateMatrixParameter = NULL; + cgGLSetParameter2fv = NULL; + cgGLGetLatestProfile = NULL; + cgGLEnableProfile = NULL; + cgGLDisableProfile = NULL; + cgGLSetOptimalOptions = NULL; + cgGLLoadProgram = NULL; + cgGLBindProgram = NULL; +} diff --git a/win32/cgFunctions.h b/win32/cgFunctions.h new file mode 100644 index 00000000..2d7ea3ac --- /dev/null +++ b/win32/cgFunctions.h @@ -0,0 +1,251 @@ +/*********************************************************************************** + Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. + + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), + Jerremy Koot (jkoot@snes9x.com) + + (c) Copyright 2002 - 2004 Matthew Kendora + + (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) + + (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) + + (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) + + (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), + Kris Bleakley (codeviolation@hotmail.com) + + (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), + Nach (n-a-c-h@users.sourceforge.net), + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2006 - 2007 nitsuja + + (c) Copyright 2009 - 2011 BearOso, + OV2 + + + BS-X C emulator code + (c) Copyright 2005 - 2006 Dreamer Nom, + zones + + C4 x86 assembler and some C emulation code + (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), + Nach, + zsKnight (zsknight@zsnes.com) + + C4 C++ code + (c) Copyright 2003 - 2006 Brad Jorsch, + Nach + + DSP-1 emulator code + (c) Copyright 1998 - 2006 _Demo_, + Andreas Naive (andreasnaive@gmail.com), + Gary Henderson, + Ivar (ivar@snes9x.com), + John Weidman, + Kris Bleakley, + Matthew Kendora, + Nach, + neviksti (neviksti@hotmail.com) + + DSP-2 emulator code + (c) Copyright 2003 John Weidman, + Kris Bleakley, + Lord Nightmare (lord_nightmare@users.sourceforge.net), + Matthew Kendora, + neviksti + + DSP-3 emulator code + (c) Copyright 2003 - 2006 John Weidman, + Kris Bleakley, + Lancer, + z80 gaiden + + DSP-4 emulator code + (c) Copyright 2004 - 2006 Dreamer Nom, + John Weidman, + Kris Bleakley, + Nach, + z80 gaiden + + OBC1 emulator code + (c) Copyright 2001 - 2004 zsKnight, + pagefault (pagefault@zsnes.com), + Kris Bleakley + Ported from x86 assembler to C by sanmaiwashi + + SPC7110 and RTC C++ emulator code used in 1.39-1.51 + (c) Copyright 2002 Matthew Kendora with research by + zsKnight, + John Weidman, + Dark Force + + SPC7110 and RTC C++ emulator code used in 1.52+ + (c) Copyright 2009 byuu, + neviksti + + S-DD1 C emulator code + (c) Copyright 2003 Brad Jorsch with research by + Andreas Naive, + John Weidman + + S-RTC C emulator code + (c) Copyright 2001 - 2006 byuu, + John Weidman + + ST010 C++ emulator code + (c) Copyright 2003 Feather, + John Weidman, + Kris Bleakley, + Matthew Kendora + + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 _Demo_, + pagefault, + zsKnight + + Super FX C emulator code + (c) Copyright 1997 - 1999 Ivar, + Gary Henderson, + John Weidman + + Sound emulator code used in 1.5-1.51 + (c) Copyright 1998 - 2003 Brad Martin + (c) Copyright 1998 - 2006 Charles Bilyue' + + Sound emulator code used in 1.52+ + (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) + + SH assembler code partly based on x86 assembler code + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + + 2xSaI filter + (c) Copyright 1999 - 2001 Derek Liauw Kie Fa + + HQ2x, HQ3x, HQ4x filters + (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) + + NTSC filter + (c) Copyright 2006 - 2007 Shay Green + + GTK+ GUI code + (c) Copyright 2004 - 2011 BearOso + + Win32 GUI code + (c) Copyright 2003 - 2006 blip, + funkyass, + Matthew Kendora, + Nach, + nitsuja + (c) Copyright 2009 - 2011 OV2 + + Mac OS GUI code + (c) Copyright 1998 - 2001 John Stiles + (c) Copyright 2001 - 2011 zones + + + Specific ports contains the works of other authors. See headers in + individual files. + + + Snes9x homepage: http://www.snes9x.com/ + + Permission to use, copy, modify and/or distribute Snes9x in both binary + and source form, for non-commercial purposes, is hereby granted without + fee, providing that this license information and copyright notice appear + with all copies and any derived work. + + This software is provided 'as-is', without any express or implied + warranty. In no event shall the authors be held liable for any damages + arising from the use of this software or it's derivatives. + + Snes9x is freeware for PERSONAL USE only. Commercial users should + seek permission of the copyright holders first. Commercial use includes, + but is not limited to, charging money for Snes9x or software derived from + Snes9x, including Snes9x or derivatives in commercial game bundles, and/or + using Snes9x as a promotion for your commercial product. + + The copyright holders request that bug fixes and improvements to the code + should be forwarded to them so everyone can benefit from the modifications + in future versions. + + Super NES and Super Nintendo Entertainment System are trademarks of + Nintendo Co., Limited and its subsidiary companies. + ***********************************************************************************/ + + + +#ifndef CGFUNCTIONS_H +#define CGFUNCTIONS_H + +#define CG_EXPLICIT +#define CGD3D9_EXPLICIT +#define CGGL_EXPLICIT + +#include +#include +#include + +//cg.dll +typedef CG_API CGcontext (CGENTRY *CGCC)(void); +extern CGCC cgCreateContext; +typedef CG_API void (CGENTRY *CGDC)(CGcontext context); +extern CGDC cgDestroyContext; +typedef CG_API CGparameter (CGENTRY *CGGNP)(CGprogram program, const char *name); +extern CGGNP cgGetNamedParameter; +typedef CG_API CGerror (CGENTRY *CGGE)(void); +extern CGGE cgGetError; +typedef CG_API const char * (CGENTRY *CGGES)(CGerror error); +extern CGGES cgGetErrorString; +typedef CG_API const char * (CGENTRY *CGGLL)(CGcontext context); +extern CGGLL cgGetLastListing; +typedef CG_API CGprogram (CGENTRY *CGCP)(CGcontext context, CGenum program_type, const char *program, CGprofile profile, const char *entry, const char **args); +extern CGCP cgCreateProgram; +typedef CG_API void (CGENTRY *CGDP)(CGprogram program); +extern CGDP cgDestroyProgram; + +//cgD3D9.dll +typedef CGD3D9DLL_API HRESULT (CGD3D9ENTRY *CGD3DSD)(IDirect3DDevice9 *pDevice); +extern CGD3DSD cgD3D9SetDevice; +typedef CGD3D9DLL_API HRESULT (CGD3D9ENTRY *CGD3DBP)(CGprogram prog); +extern CGD3DBP cgD3D9BindProgram; +typedef CGD3D9DLL_API CGprofile (CGD3D9ENTRY *CGD3DGLVP)(void); +extern CGD3DGLVP cgD3D9GetLatestVertexProfile; +typedef CGD3D9DLL_API CGprofile (CGD3D9ENTRY *CGD3DGLPP)(void); +extern CGD3DGLPP cgD3D9GetLatestPixelProfile; +typedef CGD3D9DLL_API const char ** (CGD3D9ENTRY *CGD3DGOO)(CGprofile profile); +extern CGD3DGOO cgD3D9GetOptimalOptions; +typedef CGD3D9DLL_API HRESULT (CGD3D9ENTRY *CGD3DLP)(CGprogram prog, CGbool paramShadowing, DWORD assemFlags); +extern CGD3DLP cgD3D9LoadProgram; +typedef CGD3D9DLL_API HRESULT (CGD3D9ENTRY *CGD3DSUM)(CGparameter param, const D3DMATRIX *matrix); +extern CGD3DSUM cgD3D9SetUniformMatrix; +typedef CGD3D9DLL_API HRESULT (CGD3D9ENTRY *CGD3DSU)(CGparameter param, const void *floats); +extern CGD3DSU cgD3D9SetUniform; + +//cggl.dll +typedef CGGL_API void (CGGLENTRY *CGGLSSMP)(CGparameter param, CGGLenum matrix, CGGLenum transform); +extern CGGLSSMP cgGLSetStateMatrixParameter; +typedef CGGL_API void (CGGLENTRY *CGGLSP2FV)(CGparameter param, const float *v); +extern CGGLSP2FV cgGLSetParameter2fv; +typedef CGGL_API CGprofile (CGGLENTRY *CGGLGLP)(CGGLenum profile_type); +extern CGGLGLP cgGLGetLatestProfile; +typedef CGGL_API void (CGGLENTRY *CGGLEP)(CGprofile profile); +extern CGGLEP cgGLEnableProfile; +typedef CGGL_API void (CGGLENTRY *CGGLDP)(CGprofile profile); +extern CGGLDP cgGLDisableProfile; +typedef CGGL_API void (CGGLENTRY *CGGLSOO)(CGprofile profile); +extern CGGLSOO cgGLSetOptimalOptions; +typedef CGGL_API void (CGGLENTRY *CGGLLP)(CGprogram program); +extern CGGLLP cgGLLoadProgram; +typedef CGGL_API void (CGGLENTRY *CGGLBP)(CGprogram program); +extern CGGLBP cgGLBindProgram; + + + +//cgfunctions.cpp +bool loadCgFunctions(); +void unloadCgLibrary(); + +#endif //CGFUNCTIONS_H diff --git a/win32/docs/how2compile.txt b/win32/docs/how2compile.txt index b6785026..0e50be36 100644 --- a/win32/docs/how2compile.txt +++ b/win32/docs/how2compile.txt @@ -37,6 +37,10 @@ NOTE: Unicode support requires a special zlib build - see the end of the zlib en normal FMOD support. Disable fmod support by removing the FMODEX_SUPPORT from the Preprocessor Definitions text box. +- CG Toolkit - Enables CG Shader support. This can be downloaded from nvidia's CG toolkit page: + http://developer.nvidia.com/object/cg_download.html + Only the header files are required to compile. + - To compile Snes9x: Start up Visual C++. Load the Snes9x project file. diff --git a/win32/docs/readme-windows.txt b/win32/docs/readme-windows.txt index 04133126..193e8faa 100644 --- a/win32/docs/readme-windows.txt +++ b/win32/docs/readme-windows.txt @@ -8,7 +8,7 @@ Files included in the Snes9x archive: changes.txt snes9x-license.txt -version 1.52 January, 2010 +version 1.53 April, 2011 Home page: http://www.snes9x.com/ @@ -91,8 +91,8 @@ allows you to browse your computer to locate the directory where you have stored your SNES games. Single-click and then press Load to load and start the game. SNES ROM images come in lots of different formats. Snes9x supports zipped ROMs -as long as there is only 1 per zip file. Also Snes9x can open gzip/jma -compressed file. +as long as there is only 1 per zip file. Also Snes9x can open gzip and jma +compressed files. Game Color System ----------------- @@ -155,14 +155,23 @@ experience. Software -------- -You will need access to SNES ROM images in .smc, .sfc, .fig, etc., format -otherwise you will have nothing to run! Some home-brewed ROM images can be -downloaded from http://www.zophar.com/. +You will need access to SNES ROM images otherwise you will have nothing to run! +Some home-brewed ROM images can be downloaded from http://www.zophar.com/. Please note, it is illegal in most countries to have commercial ROM images without also owning the actual SNES ROM cartridges, and even then you may be liable under various EULAs. +CG Shaders +-------- +If you want to use CG Shaders in Snex9x for windows you need to install the +CG Toolkit from nvidia's developer zone: +http://developer.nvidia.com/object/cg_download.html + +CG shaders work in both D3D and OpenGL. Various shaders can be found in +Themaister's Emulator Shader Pack: +https://github.com/Themaister/Emulator-Shader-Pack + Controllers Support =================== @@ -658,8 +667,7 @@ What's Emulated? envelope processing, echo, pitch modulation and digital FIR sound filter. - SRAM, a battery-backed RAM. - All background modes, 0 to 7. -- All screen resolutions, 256x224, 256x239, 512x224, 512x239, 512x448 and - 512x478. +- All screen resolutions including interlace mode. - Pseudo hi-res mode. - 8x8, 16x8 and 16x16 tile sizes, flipped in either direction. - 32x32, 32x64, 64x32 and 64x64 screen tile sizes. @@ -806,4 +814,4 @@ Capcom is a trademark of Capcom Co., Ltd. Gary Henderson Edited for Windows port by: zones (kasumitokoduck@yahoo.com) -Updated most recently by: 2010/01/01 zones +Updated most recently by: 2011/04/11 zones diff --git a/win32/render.cpp b/win32/render.cpp index 57ab5530..f565de08 100644 --- a/win32/render.cpp +++ b/win32/render.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/render.h b/win32/render.h index 292562ef..dcfb0845 100644 --- a/win32/render.h +++ b/win32/render.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/rsrc/resource.h b/win32/rsrc/resource.h index 6f62d8ec..ca767abd 100644 --- a/win32/rsrc/resource.h +++ b/win32/rsrc/resource.h @@ -484,13 +484,14 @@ #define ID_WINDOW_SIZE_2X 40170 #define ID_WINDOW_SIZE_3X 40171 #define ID_WINDOW_SIZE_4X 40172 +#define ID_DEBUG_APU_TRACE 40173 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 151 -#define _APS_NEXT_COMMAND_VALUE 40173 +#define _APS_NEXT_COMMAND_VALUE 40174 #define _APS_NEXT_CONTROL_VALUE 3018 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/win32/snes9xw.vcproj b/win32/snes9xw.vcproj index 0fd8c850..4b5bda35 100644 --- a/win32/snes9xw.vcproj +++ b/win32/snes9xw.vcproj @@ -256,7 +256,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO" + PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO" RuntimeLibrary="1" StructMemberAlignment="0" UsePrecompiledHeader="0" @@ -355,7 +355,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO" + PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO" RuntimeLibrary="1" StructMemberAlignment="0" UsePrecompiledHeader="0" @@ -454,7 +454,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\";"$(ProjectDir)..\..\";"$(ProjectDir)..\..\zLib";"$(ProjectDir)..\unzip";"$(ProjectDir)..\..\FMOD\api\inc";"$(ProjectDir)..\..\libPNG\src";"$(ProjectDir)..\snes9x"" - PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO" + PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO" RuntimeLibrary="1" StructMemberAlignment="0" UsePrecompiledHeader="0" @@ -554,7 +554,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\";"$(ProjectDir)..\..\";"$(ProjectDir)..\..\zLib";"$(ProjectDir)..\unzip";"$(ProjectDir)..\..\FMOD\api\inc";"$(ProjectDir)..\..\libPNG\src";"$(ProjectDir)..\snes9x"" - PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO;DEBUGGER" + PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO" RuntimeLibrary="1" StructMemberAlignment="0" UsePrecompiledHeader="0" @@ -766,7 +766,7 @@ OmitFramePointers="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT" + PreprocessorDefinitions="NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT" StringPooling="true" RuntimeLibrary="0" StructMemberAlignment="0" @@ -3201,6 +3201,14 @@ RelativePath=".\CDirectDraw.h" > + + + + diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp index a532e728..407e697f 100644 --- a/win32/wconfig.cpp +++ b/win32/wconfig.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/win32.cpp b/win32/win32.cpp index f444c56f..2db43056 100644 --- a/win32/win32.cpp +++ b/win32/win32.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/win32_display.cpp b/win32/win32_display.cpp index 8d166e90..5abecf61 100644 --- a/win32/win32_display.cpp +++ b/win32/win32_display.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/win32_display.h b/win32/win32_display.h index 1ee30fbb..639739b8 100644 --- a/win32/win32_display.h +++ b/win32/win32_display.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/win32_sound.cpp b/win32/win32_sound.cpp index 08e31ecb..7ef6acbc 100644 --- a/win32/win32_sound.cpp +++ b/win32/win32_sound.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/win32_sound.h b/win32/win32_sound.h index 0b991a84..7fe23d79 100644 --- a/win32/win32_sound.h +++ b/win32/win32_sound.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in diff --git a/win32/wlanguage.h b/win32/wlanguage.h index f4b9d6cb..b840e6fb 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -193,7 +194,7 @@ (c) Copyright 2001 - 2006 John Weidman\r\n\ (c) Copyright 2002 - 2010 Brad Jorsch, funkyass, Kris Bleakley, Nach, zones\r\n\ (c) Copyright 2006 - 2007 nitsuja\r\n\ - (c) Copyright 2009 - 2010 BearOso, OV2\r\n\r\n\ + (c) Copyright 2009 - 2011 BearOso, OV2\r\n\r\n\ Windows Port Authors: Matthew Kendora, funkyass, nitsuja, Nach, blip, OV2.\r\n\r\n\ Snes9X is a Super Nintendo Entertainment System\r\n\ emulator that allows you to play most games designed\r\n\ diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index 80a7003f..34463255 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in @@ -2231,6 +2232,9 @@ LRESULT CALLBACK WinProc( ICPU.FrameAdvanceCount = 1; Settings.Paused = FALSE; break; + case ID_DEBUG_APU_TRACE: + spc_core->debug_toggle_trace(); + break; #endif case IDM_ROM_INFO: RestoreGUIDisplay (); @@ -2578,6 +2582,7 @@ BOOL WinInit( HINSTANCE hInstance) if(GUI.hMenu) { InsertMenu(GUI.hMenu,ID_OPTIONS_SETTINGS,MF_BYCOMMAND | MF_STRING | MF_ENABLED,ID_DEBUG_FRAME_ADVANCE,TEXT("&Debug Frame Advance")); InsertMenu(GUI.hMenu,ID_OPTIONS_SETTINGS,MF_BYCOMMAND | MF_STRING | MF_ENABLED,ID_DEBUG_TRACE,TEXT("&Trace")); + InsertMenu(GUI.hMenu,ID_OPTIONS_SETTINGS,MF_BYCOMMAND | MF_STRING | MF_ENABLED,ID_DEBUG_APU_TRACE,TEXT("&APU Trace")); InsertMenu(GUI.hMenu,ID_OPTIONS_SETTINGS,MF_BYCOMMAND | MF_SEPARATOR | MF_ENABLED,NULL,NULL); } #endif @@ -3755,6 +3760,8 @@ static void CheckMenuStates () #ifdef DEBUGGER mii.fState = (CPU.Flags & TRACE_FLAG) ? MFS_CHECKED : MFS_UNCHECKED; SetMenuItemInfo (GUI.hMenu, ID_DEBUG_TRACE, FALSE, &mii); + mii.fState = (spc_core->debug_is_enabled()) ? MFS_CHECKED : MFS_UNCHECKED; + SetMenuItemInfo (GUI.hMenu, ID_DEBUG_APU_TRACE, FALSE, &mii); #endif mii.fState = (!Settings.StopEmulation) ? MFS_ENABLED : MFS_DISABLED; diff --git a/win32/wsnes9x.h b/win32/wsnes9x.h index 19213774..e99aacb3 100644 --- a/win32/wsnes9x.h +++ b/win32/wsnes9x.h @@ -17,11 +17,12 @@ (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net), - zones (kasumitokoduck@yahoo.com) + + (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2010 BearOso, + (c) Copyright 2009 - 2011 BearOso, OV2 @@ -130,7 +131,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2010 BearOso + (c) Copyright 2004 - 2011 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -138,11 +139,11 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2010 OV2 + (c) Copyright 2009 - 2011 OV2 Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles - (c) Copyright 2001 - 2010 zones + (c) Copyright 2001 - 2011 zones Specific ports contains the works of other authors. See headers in