diff --git a/docs/changes.txt b/docs/changes.txt
index 3810e2b7..d42e680a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,3 +1,59 @@
+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 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)
+
Snes9x 1.52
- IMPORTANT NOTICE: The structure of savestates (also known
as snapshots / freeze files) is incompatible with older
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
<PrevTop 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 @@
-
-
diff --git a/macosx/English.lproj/Snes9x.xib b/macosx/English.lproj/Snes9x.xib
index 7e58c378..ddadc9d3 100644
--- a/macosx/English.lproj/Snes9x.xib
+++ b/macosx/English.lproj/Snes9x.xib
@@ -1,16 +1,33 @@
-
+
- 1060
- 10J567
+ 1040
+ 10J8698511038.35
- 462.00
-
-
-
-
-
+ 461.00
+
+
+
+
+
+
{723, 472}
@@ -7243,7 +7753,9 @@
-
+
-
+
{{40, 80}, {723, 472}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {986, 491}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {292, 132}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {276, 260}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {433, 55}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {512, 478}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {373, 81}}{{0, 0}, {1024, 768}}
-
+
_NSMainMenuS9xMenu
@@ -19036,7 +20200,8 @@
{362, 422}
@@ -20834,7 +22139,9 @@
-
+
-
+
{{40, 80}, {362, 422}}{{0, 0}, {1024, 768}}
-
+
{449, 441}
@@ -22329,7 +23730,9 @@
-
+
-
+
{{40, 80}, {449, 441}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {328, 168}}{{0, 0}, {1024, 768}}
-
+
{597, 150}
@@ -23786,7 +25303,9 @@
-
+
-
+
{{40, 80}, {597, 150}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {593, 251}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {327, 30}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {257, 216}}{{0, 0}, {1024, 768}}
-
-
-
-
+
-
+
{605, 371}
@@ -32131,7 +32377,9 @@
-
+
-
+
{{39, 80}, {605, 371}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {467, 99}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {555, 272}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {308, 242}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {433, 33}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {433, 54}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {437, 192}}{{0, 0}, {1024, 768}}
-
+
{{40, 80}, {198, 192}}{{0, 0}, {1024, 768}}
-
+
-
+
RecordSMVGameWindowCIFilterMenuBarRomInfoCheatFinderCFAddEntryMultiCartKeyboardPlaySMVExtraOptions
-
PreferencesSoundEffectCheatEntryAboutQTMovieOpenROMClientListPlayerList
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
- {555, 272}
-
-
-
+
2307
@@ -42104,10 +42666,14 @@ IGhlbHAgb24gU25lczl4LgpOaW50ZW5kbyBpcyBhIHRyYWRlIG1hcmsuA
IBCarbonFramework
+
YES
- ../snes9x.xcodeproj
+ ../cocoatest.xcodeproj3
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
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+
+
+ YES
+ ../cocoatest.xcodeproj
+ 3
+
+
+
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..c0fa21e5
--- a/macosx/mac-appleevent.cpp
+++ b/macosx/mac-appleevent.cpp
@@ -179,7 +179,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..2c0b9464
--- a/macosx/mac-appleevent.h
+++ b/macosx/mac-appleevent.h
@@ -179,7 +179,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..f1bbace2 100644
--- a/macosx/mac-audio.h
+++ b/macosx/mac-audio.h
@@ -179,7 +179,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..5db28d00 100644
--- a/macosx/mac-audio.cpp
+++ b/macosx/mac-audio.mm
@@ -179,7 +179,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 +191,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..fd53d5fe 100755
--- a/macosx/mac-cart.h
+++ b/macosx/mac-cart.h
@@ -179,7 +179,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..21597734 100755
--- a/macosx/mac-cart.mm
+++ b/macosx/mac-cart.mm
@@ -179,7 +179,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..2cba1955
--- a/macosx/mac-cheat.cpp
+++ b/macosx/mac-cheat.cpp
@@ -179,7 +179,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..a137b9cc
--- a/macosx/mac-cheat.h
+++ b/macosx/mac-cheat.h
@@ -179,7 +179,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..5ead9830 100755
--- a/macosx/mac-cheatfinder.cpp
+++ b/macosx/mac-cheatfinder.cpp
@@ -179,7 +179,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..6814bc9c
--- a/macosx/mac-cheatfinder.h
+++ b/macosx/mac-cheatfinder.h
@@ -179,7 +179,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..75ae9345 100644
--- a/macosx/mac-client.cpp
+++ b/macosx/mac-client.cpp
@@ -179,7 +179,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..38aff0a7 100644
--- a/macosx/mac-client.h
+++ b/macosx/mac-client.h
@@ -179,7 +179,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..ff34834b 100644
--- a/macosx/mac-cocoatools.h
+++ b/macosx/mac-cocoatools.h
@@ -179,7 +179,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..d2774cca 100644
--- a/macosx/mac-cocoatools.mm
+++ b/macosx/mac-cocoatools.mm
@@ -179,7 +179,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..a2291b78 100644
--- a/macosx/mac-controls.cpp
+++ b/macosx/mac-controls.cpp
@@ -179,7 +179,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..a849852e 100644
--- a/macosx/mac-controls.h
+++ b/macosx/mac-controls.h
@@ -179,7 +179,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..46588678 100644
--- a/macosx/mac-coreimage.h
+++ b/macosx/mac-coreimage.h
@@ -179,7 +179,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..06626ed4 100644
--- a/macosx/mac-coreimage.mm
+++ b/macosx/mac-coreimage.mm
@@ -179,7 +179,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..a1655af7
--- a/macosx/mac-dialog.cpp
+++ b/macosx/mac-dialog.cpp
@@ -179,7 +179,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..0dd9b407 100755
--- a/macosx/mac-dialog.h
+++ b/macosx/mac-dialog.h
@@ -179,7 +179,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..cbb4f7dd 100644
--- a/macosx/mac-file.cpp
+++ b/macosx/mac-file.cpp
@@ -179,7 +179,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..a6696ad8 100644
--- a/macosx/mac-file.h
+++ b/macosx/mac-file.h
@@ -179,7 +179,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..97cfa636 100644
--- a/macosx/mac-global_prefix.h
+++ b/macosx/mac-global_prefix.h
@@ -179,7 +179,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..6fe19423
--- a/macosx/mac-gworld.cpp
+++ b/macosx/mac-gworld.cpp
@@ -179,7 +179,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..026c60ce
--- a/macosx/mac-gworld.h
+++ b/macosx/mac-gworld.h
@@ -179,7 +179,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..4bd6acc1
--- a/macosx/mac-joypad.cpp
+++ b/macosx/mac-joypad.cpp
@@ -179,7 +179,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..71dfb499
--- a/macosx/mac-joypad.h
+++ b/macosx/mac-joypad.h
@@ -179,7 +179,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..d02e12db
--- a/macosx/mac-keyboard.cpp
+++ b/macosx/mac-keyboard.cpp
@@ -179,7 +179,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..57aa04f6
--- a/macosx/mac-keyboard.h
+++ b/macosx/mac-keyboard.h
@@ -179,7 +179,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..0441292b 100644
--- a/macosx/mac-multicart.cpp
+++ b/macosx/mac-multicart.cpp
@@ -179,7 +179,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..9e5500ce 100644
--- a/macosx/mac-multicart.h
+++ b/macosx/mac-multicart.h
@@ -179,7 +179,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..83886e90
--- a/macosx/mac-musicbox.h
+++ b/macosx/mac-musicbox.h
@@ -179,7 +179,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 +194,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..0d9157e5
--- /dev/null
+++ b/macosx/mac-musicbox.mm
@@ -0,0 +1,646 @@
+/***********************************************************************************
+ 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 - 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..ba18c1f7 100644
--- a/macosx/mac-netplay.cpp
+++ b/macosx/mac-netplay.cpp
@@ -179,7 +179,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..9be29000 100644
--- a/macosx/mac-netplay.h
+++ b/macosx/mac-netplay.h
@@ -179,7 +179,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..fb13cd49 100644
--- a/macosx/mac-os.h
+++ b/macosx/mac-os.h
@@ -179,7 +179,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 +204,6 @@ enum
kWindowPreferences,
kWindowAbout,
kWindowAutoFire,
- kWindowMusicBox,
kWindowRomInfo,
kWindowCheatFinder,
kWindowKeyConfig,
diff --git a/macosx/mac-os.mm b/macosx/mac-os.mm
index 809adcef..1b192da0 100644
--- a/macosx/mac-os.mm
+++ b/macosx/mac-os.mm
@@ -179,7 +179,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-prefix.h b/macosx/mac-prefix.h
index 448cd0c3..58c591e8 100755
--- a/macosx/mac-prefix.h
+++ b/macosx/mac-prefix.h
@@ -179,7 +179,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 +196,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..96317ddb 100755
--- a/macosx/mac-prefs.cpp
+++ b/macosx/mac-prefs.cpp
@@ -179,7 +179,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 +361,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..b2832c01
--- a/macosx/mac-prefs.h
+++ b/macosx/mac-prefs.h
@@ -179,7 +179,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..cdeef00a 100644
--- a/macosx/mac-quicktime.cpp
+++ b/macosx/mac-quicktime.cpp
@@ -179,7 +179,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..c28edf51 100644
--- a/macosx/mac-quicktime.h
+++ b/macosx/mac-quicktime.h
@@ -179,7 +179,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..fba4508d 100644
--- a/macosx/mac-render.cpp
+++ b/macosx/mac-render.cpp
@@ -179,7 +179,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..fc66f654 100644
--- a/macosx/mac-render.h
+++ b/macosx/mac-render.h
@@ -179,7 +179,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..991eec3b 100644
--- a/macosx/mac-screenshot.cpp
+++ b/macosx/mac-screenshot.cpp
@@ -179,7 +179,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..7a22ecc9 100644
--- a/macosx/mac-screenshot.h
+++ b/macosx/mac-screenshot.h
@@ -179,7 +179,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..a6eb0969 100644
--- a/macosx/mac-server.cpp
+++ b/macosx/mac-server.cpp
@@ -179,7 +179,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..ee251e66 100644
--- a/macosx/mac-server.h
+++ b/macosx/mac-server.h
@@ -179,7 +179,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..c3a6a145 100755
--- a/macosx/mac-snes9x.cpp
+++ b/macosx/mac-snes9x.cpp
@@ -179,7 +179,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..8347b00e 100755
--- a/macosx/mac-snes9x.h
+++ b/macosx/mac-snes9x.h
@@ -179,7 +179,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..1a1e4a0a
--- a/macosx/mac-stringtools.cpp
+++ b/macosx/mac-stringtools.cpp
@@ -179,7 +179,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..4d3d9a6d
--- a/macosx/mac-stringtools.h
+++ b/macosx/mac-stringtools.h
@@ -179,7 +179,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 d8588653..000d5ddd 100755
--- a/macosx/snes9x.xcodeproj/project.pbxproj
+++ b/macosx/snes9x.xcodeproj/project.pbxproj
@@ -174,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 */; };
@@ -188,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 */; };
@@ -357,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 */; };
@@ -371,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 */; };
@@ -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 */; };
@@ -723,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 = ""; };
@@ -746,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 = ""; };
@@ -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 */,
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;
};
@@ -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 */,
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 */,
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 */,
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 */,
@@ -2154,6 +2186,14 @@
name = Snes9x.xib;
sourceTree = "";
};
+ CF46BEA8133E2559005A17A5 /* musicbox.xib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ CF46BEA9133E2559005A17A5 /* English */,
+ );
+ name = musicbox.xib;
+ sourceTree = "";
+ };
EA3BEA980A28384E00A8FAE5 /* Localizable.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";
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