020ff8c62b
forgot to remove the check that would detect proper DSCR setting during DMA as an error
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5218 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-20 21:18:41 +00:00
e94229cba0
small cleanup in dsp lle
...
I wonder if we should bother making DMAs take time?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5217 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-20 20:56:33 +00:00
503bf545a3
DSPLLE - 0xa100 figured out = abs(), small mul fix, cleaning, some extra comments
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5216 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-19 21:53:41 +00:00
4f56d8144b
same commit as r5169, but this time to trunk instead of stable
...
(should fix wii homebrew (loading) on osx.)
and minor changes to the wrtc test
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5215 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-18 23:01:04 +00:00
f885eb2de0
Did some clean up of the GUI main. Also, parse command line options first, then set up directories (linux and apple), then load the log manager, sconfig, etc. Removes the need for my silly log manager and sysconf reload.
...
Changed the default font for the log window to the local font (why was a Japanese font the default?). Also fixed an issue that prevented the log windows settings from being saved properly. Lots more needs to be done with the AUI manager. That stuff doesn't work.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5213 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-18 14:34:37 +00:00
14bb53dcc6
DSPLLE: Run the threaded mode a bit differently and with respect to idle loops.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5212 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-18 06:20:52 +00:00
d9714c3c9d
DSPLLE - tons of bugs fixed... try Zelda ucode games under LLE now (like Luigi Mansion :)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5211 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-18 00:18:36 +00:00
02edaf3db8
Added several XKeyToString translations.
...
Fixed minor font issue with wiimote pad button dialog.
Removed unnecessary OpenGL_MakeCurrent call from DoState.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5209 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-17 18:58:19 +00:00
3eebd28a6b
Renable Load Store in JIT since I found the problem. Haven't fixed it since I'm not 100% sure why it fails, but that code is disabled in x64 OSX. Still is faster than disabling the entire thing. Only core part left is Load Store Paired
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5207 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-17 11:23:24 +00:00
fa9ae47d02
Woops
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5206 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-17 10:13:58 +00:00
4e9be9aa59
This fixes JIT Loading Store Floating in 64bit OSX
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5205 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-17 09:38:13 +00:00
721935c6ff
Several little fixes.
...
Fixed a segfault in linux when a cd/dvd drive is empty or invalid and "Boot from DVD" or "Show Drives" are selected.
On all platforms if a game fails to load show the game list again.
The other things here are essentially code cleanup and won't be noticeable by most users.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5204 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-17 01:54:40 +00:00
a7b03fd2cd
Implement pausing (with the Escape key) for the NoGUI build in linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5203 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-16 13:30:52 +00:00
d6b9a2ec81
Shutdown NoGUI build properly in linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5202 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-16 13:18:52 +00:00
6723a91664
No gui fix in linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5201 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-16 03:34:27 +00:00
172cc24f32
nowx build fix, and fix a bug when render to main is changed from the gfx config dialog while the emulator is running.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5200 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-16 01:16:55 +00:00
2015d252f0
Rewrite of fullscreen toggling in linux. This goes back to using the EWMH specifications. I wasn't using it right before, but now it should work on all EWMH compliant window managers (like KDE, Metacity, Compiz, etc). Since this doesn't need an override redirect Alt-Tab works even in fullscreen mode. This also allows for some other nice things to be done.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5199 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-15 23:25:11 +00:00
3bdf7d3711
this is a ugly unstable commit but i'm going to be out for work some days so ...
...
implemented donko's xfb in D3D:
the bad things:
*is solower in some cases, slower as opengl
*it do not work in dual core mode, it seems direct3d has serious synchronization problems, to the other devs please if you can take a look and help me :)
*real xfb still not working i have to give it more time to make it work.
the good:
*games that uses multiples xfbs will work now using the virtual XFB.
*implemented a more hardware like approach to scaling, now to calculate the pixel scaling i use the xfb size not the efb so the screen pixels relation is more correct now.
*simplified a little donko's virtual xfb to make it less memory consuming as xfb textures are the exact size of the scaled xfb and not full target width.
* when it works even real xfb will let us use super sampling.
I repeat this commit is totally unstable and in dual core mode it will for sure hang the emulator or at best give totally incorrect results.
Other devs please help as thread sync is not one of my strong points :)
i'll keep waiting for the comments an the -1 :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5195 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-14 18:57:50 +00:00
ed0740b512
Still didn't have the render to main resize thing. Need to move the window if the panel is to the left.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5194 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-13 20:39:33 +00:00
2bbef42c37
Fix an issue in linux where if both render to main and fullscreen are checked the emulator started in fullscreen with the wrong window size.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5193 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-13 15:49:40 +00:00
c5a0e86123
DSPLLE - u16 aram reads (zelda type) fixed
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5192 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-13 10:29:32 +00:00
34d1d7a41e
DSPLLE - AX PCM16 fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5191 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-13 02:28:21 +00:00
3ccbd152fd
In linux with render to main, make sure the emulator window is resized if the log window is opened or resized. Also fix a memory leak, and a little code clean up.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5190 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-12 04:10:48 +00:00
b2ab31681a
rewrite (lowish level) wii ipc to be more like wiibrew ( http://wiibrew.org/wiki/Hardware/IPC )
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5189 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-11 17:22:13 +00:00
5bf33f778f
re-add the HidOutputReport() in wiimote plugin's ControlChannel, homebrew needs this (wiimote in homebrew still broken atm...)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5188 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-11 17:21:25 +00:00
e6efc4a611
remove wiimote led/speaker status from statusbar
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5187 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-11 17:20:32 +00:00
5fa18ae114
Fixed an issue that caused the render to main window to lose focus if the gfx config dialog is opened while the emulator is running. Only affects linux. Also fixed a few preprocessor conditionals.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5186 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-10 17:29:19 +00:00
70627c5652
Extend the OGL virtual XFB to handle games that use multiple XFBs to make a frame. This should allow games that require the XFB to work without using a real XFB in RAM which is slow and limited to the original resolution. To use this enhancement you must check Use XFB in the options. The previous option was renamed Use Real XFB. I don't think this works with the aspect settings yet.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5185 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-10 06:45:13 +00:00
c455673f87
Added scons options "shared_libname=true" to link agains the system shared libraries for lzo, sfml, and soil. For example add the scons option "shared_lzo=true" for lzo. This will check for the system libraries and then fall back to building and linking statically against the Externals if not found. You must have liblzo2-dev, libsoil-dev, and libsfml-dev installed. Note that you need version 1.5 or later for sfml. Currently scons doesn't check the version for you.
...
If you are having trouble with segmentation faults in linux try "shared_soil=true". That seems to fix the problem. How do we fix this for the static build?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5182 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-09 22:17:33 +00:00
914cb632fb
Woops! I put subfcx in to subfex on accident, silly me
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5181 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-09 21:32:50 +00:00
3754bf5d06
Add JITTed version of subfex, disabled for now since it requires us to set the CR0 flag correctly, which I currently don't have working with 64bit build. It will improve performance in RE0 which will be nice. Can probably be done more efficiently as well
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5180 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-09 21:22:09 +00:00
2049caa9fc
Fix NoWX build, use a different define in CoreParameter, the one we all know and love, and add a Function call to VertexManager which can boost performance, tells the drivers that we don't care about the current data, because we are putting new data in it anyway. This gives quite a performance boost on OSX since it bypasses a call in the drivers that takes around 24% CPU time
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5179 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-09 21:15:28 +00:00
cc7c6cd35f
Texture coordinates are stored in fixed point format in TEV which allows overflows to be emulated correctly. Added logic to calculated texture LOD and use the correct mip. Dumping textures will now dump all mip levels. Added line rendering. Changed data stored in vertex from float arrays to vectors for cleaner math.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5178 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-09 04:38:07 +00:00
5beb6dfd47
Implement render to main in linux. In order to compile this in you will have to have libgtk2.0-dev (or your distributions equivalent) installed. If not dolphin-emu will still build, but without render to main operational.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5176 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-08 23:29:16 +00:00
a0952684b0
DSPLLE - removed some ifdefs
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5175 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-08 23:18:19 +00:00
70a712c065
DSPLLE - flags&stuff,xar->subarn,0x80 kinda figured out,... (experimental)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5174 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-08 21:25:35 +00:00
76ad8db445
Added a null check when stopping the DSPHLE plugin with the DSound back-end. Fixes the DSPHLE crash on stop.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5172 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-08 08:03:42 +00:00
beba3b7f5b
Removed more compiler warnings in linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5170 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-07 22:48:37 +00:00
ff7da32c6b
just a little clarification around sram stuff, and silence some compile warnings.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5166 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-07 17:08:42 +00:00
470db5965e
Minor optimization that's been sitting on my harddrive for a while.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5165 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-07 16:37:35 +00:00
2dabcb881c
Fixed the crazy code in r5161.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5163 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-06 10:07:37 +00:00
6376645b69
Shut down the video software plugin without closing dolphin in Windows. Fixed a memory leak.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5162 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-06 03:25:06 +00:00
d69478e539
Reverted the comparison function to r5159 and rewrote map to hash_map. I confirmed that the code can be compiled and run under Visual Studio 2008. And I confirmed the code can be compiled under gcc 4.4.0 (mingw). I could not confirm that the code run under linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5161 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-06 02:07:48 +00:00
1b61742b53
Rewrote a object-comparison code using a standard function. It's a tiny refactoring.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5160 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 12:04:09 +00:00
7cf32053fe
Gah, screw it
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5159 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 10:07:49 +00:00
56a1e15f41
Forgot to check the low argument
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5158 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 10:01:26 +00:00
35bb2e70da
reenable load store on linux (seems to work for most people).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5157 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 09:53:31 +00:00
529642de99
Woops
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5156 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 09:26:10 +00:00
d18ab50520
Add a universal option to the osx flag, does not work yet since scons strips out the -arch flag that it thinks is a duplicate, add to linker flags since cross compiling on OSX was failing since it was trying to link everything as the wrong arch. Re-Enable the loadstores in 32bit Dolphin in OSX, due to the reason described in the comments (Fast 32bit OSX!). Add an alert if the memory space ends up above 32bit in *nix sides, since it will ALWAYS be above in 64bit OSX, Will try to fix.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5155 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 09:23:28 +00:00
e79dc93a5c
Fix noWX compiling, Fix OSX crashing when opening options because of dumb code. Fix OSX Wiimote, will fix multi-wiimote in OSX later.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5154 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 07:03:44 +00:00
e2316087f7
accidently broke free look with mouse input, fixed (fixes issue 2377)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5153 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-03 19:21:24 +00:00
d3923bfc26
~1KB mem leak fix in NANDContentLoader.cpp
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5152 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-03 06:59:37 +00:00
f4b5cc5a8b
Check texture attribute loader before adding it to vertex loader.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5150 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-02 04:58:55 +00:00
335303803b
DSPLLE - lsr16 fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5148 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 23:31:43 +00:00
8035ccaef4
Enable the OSD hotkeys in linux
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5147 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 21:56:17 +00:00
3116a7ea1b
should fix cases where the gamelist would stay active under the render window
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5146 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 19:28:21 +00:00
c5ecd627ce
remove Globals.cpp (had been removed from projects but forgot to svn delete it)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5145 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 18:48:33 +00:00
e716f7be8c
Whoops.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5144 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 18:39:33 +00:00
80d303222b
code cleanup, focusing on dsp hle
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5143 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 18:21:22 +00:00
cff39f5382
Omitted extra lower_bound() calls to reduce the computational time. The old routine consumed more than 4% of computational time of a thread. It is a trivial modification.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5142 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 14:48:07 +00:00
2941bef44b
Fixed a wrong type in r5140.
...
Commited code that I forgot to commit in r5140.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5141 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 12:14:40 +00:00
1c34052266
Refactored VertexLoader::CompileVertexTranslator(). Now texture coordinates loaders are also selected from a function table. I will add a hack to increase the speed in the next commit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5140 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 11:36:00 +00:00
d348c33bf2
Refactored VertexLoader::CompileVertexTranslator(). Now the vertex position loader is selected from a function table. I will apply the same kind of refactoring to texture coordinates loader. This is a pre-preparation to optimize texture coordinates loaders.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5139 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-28 08:41:02 +00:00
ff8ce634e3
DSPLLE - addaxl,mulc,'ln fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5138 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-27 21:24:25 +00:00
0425ff2f06
Add rodolfo's safe texture cache options to the OGL plugin dialog
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5137 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-27 16:07:29 +00:00
6b1ca64428
experimental commit: simplify even more the params. please test and if theres something wrong will revert asap
...
thanks for the comments in the prev commit they make my re think the approach.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5136 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-26 22:14:29 +00:00
02189ec5e0
Simplify the params for the safe texture cache
...
after some test the more relevant parameters were the color samples and the tlut max size.
so delete the rest of the parameters and define 3 modes:
Safe : the two values are set to 0 meaning all the texture data and all the tlut data are hashed this is the most correct and slowwwwwwwwwww way
Normal: 37 samples are taken from the color textures an the firs 4096 bytes of the tlut are hashed, is a lot faster than safe mode but in some games i observe small glitches.
Fast: 8 samples are taken from the color textures an the first 1024 bytes are hashed from the tlut, is a little slower than the unsafe cache but at least all the games i tested have correct text output and fast frame rate. the glitches in dinamyc color textures are more noticeable in this mode
this values could be improved, if you find a better combination please post it and the game it fixes and i will update the source.
for the moment, as my time is limited by a lot of work, only implemented the d3d gui, if someone can implement the opengl gui will be a lot of help for me.
please test a lot and let me know the results.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5135 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-26 12:54:08 +00:00
0718385f27
fix modal state for pad plugin configs
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5134 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 22:47:40 +00:00
6da7695843
Fix issue 2364 + another issue introduced in r5129 causing the main window to lose the focus on windows
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5133 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 17:50:08 +00:00
f1ed7e5656
Build fix for linux. sprintf_s does not exist in linux. Does it in windows?
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5132 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 12:35:31 +00:00
7f5a10222e
heh, builds fix, sorry :p
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5131 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 07:31:03 +00:00
5d81b93189
woops missed a file :)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5130 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 06:38:09 +00:00
816febd3b0
finish proper window handling, fix the modal state of the config dialogs, plus some minor cleanup/changes :p
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5129 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 06:12:35 +00:00
4915097d93
fix some D3D memory leaks
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5127 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 03:14:40 +00:00
aa1081348d
Oops, should have tested my copy and paste from wiimote to gcpad
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5126 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 03:08:50 +00:00
a048ad52b4
Fix input focus in fullscreen on linux
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5125 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 03:05:53 +00:00
609151c6e8
Reverted because of some processor and performance issue. I will develop in a branch about SSSE3/SSE4.1.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5123 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 23:58:48 +00:00
1b43900f30
Applied the fix from r5118 to the JIT IL recompiler.
...
Enabled the fix on Linux x64.
Aligned the stack before calling the LoadStorePaired asm functions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5122 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 20:06:13 +00:00
d90d9976e8
apply the changes from r5109 to the DX9 plugin aswell. the config dialog does not use wx yet, but the debugger does. Plus cleanup.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5121 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 19:32:32 +00:00
b7e73102ca
Fixed the issue that cpu_info is not initialized in plugin. This commit enables SSSE3/SSE4.1 codes in rev5119.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5120 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 10:10:48 +00:00
47fb73b71a
Added SSSE3/SSE4.1 code for speed up. The code does not work in this revision because cpu_info is not initialized properly. I will fix the issue in another commit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5119 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 09:56:41 +00:00
dc9d533d4f
Aligned the stack before calling the LoadStorePaired asm functions. Fixes issue 2053.
...
The Linux x64 change is untested and has been commented out.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5118 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 08:30:50 +00:00
1d40b8a5ae
Systematically eliminating compiler warnings.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5117 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-24 03:38:36 +00:00
3cc5d8ce6f
First a bugfix:
...
fixed a misbehavior in the clear code that causes depth clear problems in reference hardware (Intel as example).
add 6 parameters to optimize Safe Texture Cache:
SafeTextureCacheColorSamples, SafeTextureCacheIndexedSamples, SafeTextureCacheTlutSamples:
this 3 parameters gives the number of samples taken to calculate the final hash value, less samples = more speed, more samples = more accuracy
if 0 is specified the hash is calculated using all the data in the texture.
SafeTextureCacheColorMaxSize, SafeTextureCacheIndexedMaxSize, SafeTextureCacheTlutMaxSize:
this parameters limits the amount of data used for the hash calculation, it could appear as redundant but in some games is better to make a full hash of the first bytes instead of some samples of all the texture.
color, indexed, tlut : define the texture type, full color data, indexed, and the tlut memory.
the parameters are available in the config , no GUI at this time, if the test are OK will add it to the GUI.
if someone needs it will give more examples on how to configure the values for specific games.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5116 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-23 21:52:12 +00:00
ba25f08d62
Convert a few other EVT_COMBOBOX's to EVT_CHOICE's that I missed
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5115 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-23 02:20:35 +00:00
74883a1735
Fix some wxChoice events that were still wxComboBox events.
...
Fixes issue 2334
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5114 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-23 01:59:59 +00:00
ae58a743cb
Some tiny fix, fixed a crash when activating "overlay some statistics" on OGL plugin (which actually overlays a whole book + 400 chapters of statistics and, indeed, overflows and crash) + memleak fix on LLE plugin and little fix on GBAlink shutdown code.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5113 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-23 01:57:26 +00:00
141ee0e485
should fix any concerns brought by the last commit:
...
GBAConnectionWaiter should take less cpu time, be threadsafe, and exit properly.
thanks to sl1nk3 and skidau
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5112 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-23 01:18:57 +00:00
a4e9bf3fd2
first implementation of support for multi GBAs. Probably something wrong with thread safety or something - but hey, it works...and I would need help to make it threadsafe *hint* :)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5111 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 21:57:05 +00:00
303769d31c
Revert commit 5105 until we sort out how we want this to work in linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5110 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 16:10:08 +00:00
ffdf087aad
Fixes issue 2331, plugins won't cause a crash/hang on stop anymore if their config dialog was opened, note that stopping a game while a config dialog is open still causes a crash (that should not be possible in the first place since the dialogs are modals, but heh...).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5109 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 04:59:57 +00:00
ae945ec90e
More conversions to wxChoice, weee
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5108 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 01:08:42 +00:00
11eb1bba9b
add example of how you can use dspspy to dump results from an entire ucode (commented out)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5107 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 01:06:11 +00:00
73d575c5c2
On linux don't compile and link against lzo, soil, and sfml "Externals."
...
Instead use system libraries liblzo2-dev, libsoil-dev, and libsfml-dev
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5105 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 00:39:38 +00:00
74a6b5638f
DSPLLE - 2 new opcodes (TSTPROD,MULAXH)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5104 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 00:22:04 +00:00
1824b5b25a
Remove the AO dependency for DSP LLE, which is silly
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5103 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 00:19:27 +00:00
a3f7e4fc73
compile fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5102 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 20:28:33 +00:00
7de17cb9c2
SFML on linux/osx now compiles from external (static)
...
removed HAVE_SFML ifdefs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5101 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 20:09:49 +00:00
3dc3c1c3b3
Fix issue 2019, fix hiding or showing games with country == Italy, France, Taiwan or Korea from the gamelist, add missing Korea flag to the gamelist and disable netplay from the menu until it can be made more usable.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5100 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 19:19:16 +00:00
d2a3dd435a
remove gbapipe from the SConscript
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5099 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:57:56 +00:00
fdd635d273
Warning cleanup, mainly shadowed variables, const/non-const and ctor initialization order
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5098 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:55:00 +00:00
f7f11211a1
Some Wiimote Cleanup, re/moved some globals to where they belong.
...
A few things could be solved differently/in a better way, but that would involve some classes and stuff (plus work)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5097 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:53:11 +00:00
b6a3df2fcf
commit current GBA link cable work. no touching (unless you're skid_au or ask first) :P
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5096 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:50:44 +00:00
f7bf29a528
DSPLLE - 'L ext opcode fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5095 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 13:23:29 +00:00
3bb9ab68ae
Added proper initialization to CoreParameter. This caused some odd behavior after fixing some of our broken singletons in r5085 as some of the bools were true by default.
...
Works-for-me(TM), please test if I missed anything. All values should be initialized with the default values from either configuration or datatype.
Fixes Issue 2334
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5094 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 12:56:18 +00:00
885299d985
DSPLLE - flags&stuff (more later)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5093 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 10:35:28 +00:00
2aa03f5b3b
Some really (REALLY) old changes that were hanging on my computer for a while
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5091 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-20 09:36:22 +00:00
154bc956ad
Some code clean up, and take care of some compiler warnings.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5090 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-20 04:18:19 +00:00
f74b5463d5
Add a SetSelectin I forgot.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5089 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 23:24:33 +00:00
f0716a30b7
Fix some Set/GetValue's Sonic forgot.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5088 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 23:20:13 +00:00
f833cc7601
Convert a few Comboboxes over to choiceboxes. WX OSX doesn't support Comboboxes with Readonly
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5087 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 22:56:37 +00:00
227be30f98
Woops
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5086 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 20:41:40 +00:00
368cce2ec2
Revert the SysConf change, since it was intended by shuffle.
...
Attempt to fix some of our singleton failures.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5085 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 18:50:01 +00:00
f41686e926
apply baby.lueshi's patch from issue 2245 to fix lua's handling of large integers. fixes issue 2245
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5084 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 18:40:38 +00:00
f9f9b1bc14
No message
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5083 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 18:32:40 +00:00
3a5a7de906
NoGUI: general cleanup, add initialization stuff added in r5064, fixed the cocoa event loop not shutting down when not booting a game on OSX.
...
SysConf: removed the Save call in the dtor, this crashes on linux trying to read m_Filename (which might be already freed).
Common: set eol-style native, again.
Fixes Issue 2332
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5082 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 17:05:26 +00:00
0819740b6a
DSPHLE - GC intro audio (IPL) now working - only for pal games atm
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5081 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-18 20:07:20 +00:00
63827c71c6
Move MemCheck functionality into the virtual DebugInterface class from the more general MemView class.
...
Give DSP LLE Debugger a wxAUI facelift and add memory view to dsp debugger.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5080 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-18 12:06:13 +00:00
d5c094df75
In linux when in fullscreen, make escape leave fullscreen then pause.
...
More like on windows?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5079 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-18 00:50:08 +00:00
967c5891e9
Make the Escape key pause the emulator in linux when not in fullscreen.
...
I believe this is the same as in windows?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5078 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 23:44:07 +00:00
2c7b484869
Fix software plugin in linux. I broke it in revision 5048.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5077 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 23:15:58 +00:00
5e5e03daeb
Update Video software plugin with latest cocoaGL.m file
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5076 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 21:04:26 +00:00
377ece3294
DSPLLE - SR_10 flag implemented (no idea what name should it have or how/when this is supposed to be used)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5075 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 19:10:31 +00:00
634f6e512e
Minor tweaks to fullscreen in linux, and make FullScr button in GUI work.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5074 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 17:53:08 +00:00
bd1b12e357
DSPLLE - SR_TOP2BITS 16bit fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5073 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 10:21:25 +00:00
c3697df665
More memory leak fixing.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5072 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 07:15:39 +00:00
b88f510984
dsp: lrs is also sign extended in "40bit" mode. tested (correctly, this time :D )
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5071 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 05:50:22 +00:00
16b21f3790
oops, dsp assembler can't handle labels with whitespace before them :)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5070 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 02:37:58 +00:00
e0e5a25bcd
Update_SR_Register64 sets SR_TOP2BITS based on m, not h (does someone have tests saying otherwise?)
...
clean up dsp_base.inc a little, use some irom funcs where possible
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5069 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 02:33:21 +00:00
dc76856736
dspspy - small fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5068 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-16 21:12:50 +00:00
215f1f74be
Switches to GCC's internal swaps for swap32 and swap64 in OSX. Changes CDIO from using char*** to std::vector<std::string>, which fixes a memory leak I was noticing and also makes it look cleaner. This is not tested much in Windows/Linux, please see if it compiles and doesn't fail out in some mysterious way
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5067 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-16 08:46:21 +00:00
7c76d51c67
Enable fullscreen switching with resolution mode changing using Xrandr in linux.
...
This changes the dependency in linux from libxxf86vm-dev to libxrandr-dev.
Use Alt-Return to toggle fullscreen mode (as in windows).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5065 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-16 04:59:45 +00:00
9254a2ddb5
Fixed a few memory leaks. Made Init and Shutdown functions for some core systems.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5064 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-16 04:34:41 +00:00
666a33eeed
Fix mouse emulation in fullscreen mode in linux. The window doesn't have focus then.
...
Also minor tweak to mouse hiding.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5063 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-15 01:09:34 +00:00
b245c398a3
keep a few separate thunkmanagers so they don't all share the same register backup area. seems to fix the single-core-paired-single-x64 issue in mario kart wii, please test the other games that were problematic.
...
this is probably not the best way to fix it but it'll do for now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5062 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 22:37:46 +00:00
14bb1b5f01
...and a buildfix for non-win32
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5060 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 16:44:16 +00:00
cd321feb83
attempt to fix the main window closing from r5056. i'm not sure how this affects window deletion tho.
...
apply eol-style native to GCPad, pretty annoying to break patches and stuff
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5059 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 16:33:53 +00:00
dc7029e7f4
Remove HaveFocus, and put that code into IsFocus. Thanks ayuanx.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5058 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 14:48:19 +00:00
a8793cbe52
うそ！
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5057 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 14:33:04 +00:00
5b1d21d1a1
Bunch of tiny memory leaks fixed and cleanup, フウ〜！
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5056 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 14:06:33 +00:00
98c7993a8a
re-add alignment for dspbuffer in DSPSpy...turns out it's needed :)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5054 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 02:31:42 +00:00
e5afde67ce
In linux only read keyboard and mouse input when the emulator window has focus.
...
Also other code clean up.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5053 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 23:56:24 +00:00
5e6eecf0af
Ok, this really does it.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5052 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 21:19:41 +00:00
24a4d1a1e0
Ok, now the mac build should be fixed
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5051 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 21:12:16 +00:00
47609c4524
Mac build fix to the issue caused by my last commit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5050 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 21:06:19 +00:00
c2e0c75c93
EXPERIMENTAL
...
Removed X event loops from GCPad and Wiimote plugins, and implemented an asynchronous check for keyboard and mouse buttons.
Also added an X event loop in core that handles events while the emulator is paused. Prevents unexpected behavior from events that occur while the emulator is paused.
Now there is only one event loop running at a time (besides those hidden in SDL).
I will revert this commit if other devs are unhappy with it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5048 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 20:47:23 +00:00
c63446827f
Fix crash when stopping and starting a game with OpenCL enabled
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5047 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 10:09:54 +00:00
df1be33ba9
Some more leak hunting/housekeeping, probably wont affect Issue 2184 in a noticeable way tho.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5046 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-12 19:28:51 +00:00
99ea22bbf3
Fix a ~8MB mem leak with AXWii Games
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5045 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-12 18:01:36 +00:00
0ab6c117c1
Fix a memory leak in OpenCL
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5044 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-12 17:20:01 +00:00
Shawn Hoffman