diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 07:07:15 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 07:07:15 +0000 |
| commit | b797c32f080fbdb69f4c84ace14a496b34423551 (patch) | |
| tree | 4b54874a4959adf6f011874c181fe5173620ab63 /macosx/plugins/DFXVideo/macsrc | |
| parent | e653d69b63a0be853f544d7c533f01817b0be0f4 (diff) | |
| download | pcsxr-b797c32f080fbdb69f4c84ace14a496b34423551.tar.gz | |
Changing a lot of NSLogs to SysPrintf on OS X's PCSXR.
Enable the emulog on OS X debug, and have create and use a log in ~/Library/Logs/PCSXR.
Delete the hack that enabled PCSXR logs to go to the console in debug mode.
Use modern syntax to create static NSArrays (and retain them in non-ARC code).
Simplify the pauseSafeWithBlock to just create a new dispatch queue and run pauseSafe on the queue.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85931 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc')
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/PluginConfigController.m | 4 | ||||
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/PluginGLView.m | 2 | ||||
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/PluginWindowController.m | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index 75b2433f..deb52926 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -204,8 +204,8 @@ void ReadConfig(void) [writeDic setObject:[NSNumber numberWithBool:[vSync intValue]] forKey:@"VSync"]; [writeDic setObject:[NSNumber numberWithBool:[hackEnable intValue]] forKey:@"Enable Hacks"]; [writeDic setObject:[NSNumber numberWithBool:[shaders intValue]] forKey:@"UseShader"]; - [writeDic setObject:[NSNumber numberWithInt:[shaderQualitySelector indexOfSelectedItem] + 1] forKey:@"ShaderQuality"]; - [writeDic setObject:[NSNumber numberWithInt:[ditherMode indexOfSelectedItem]] forKey:@"Dither Mode"]; + [writeDic setObject:[NSNumber numberWithInteger:[shaderQualitySelector indexOfSelectedItem] + 1] forKey:@"ShaderQuality"]; + [writeDic setObject:[NSNumber numberWithInteger:[ditherMode indexOfSelectedItem]] forKey:@"Dither Mode"]; unsigned int hackValues = 0; NSArray *views = [hacksView subviews]; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index f17e1f5b..39cfb5ad 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -695,7 +695,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) } else { - int LineOffset,SurfOffset; + long LineOffset,SurfOffset; GLuint * SRCPtr = (GLuint *)(psxVuw + (y << 10) + x); GLuint * DSTPtr = ((GLuint *)surf) + (PreviousPSXDisplay.Range.x0 >> 1); diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m index 47d9a512..a45a00f3 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m @@ -118,8 +118,8 @@ NSRect windowFrame; //[window orderOut:self]; } - int width = CGDisplayPixelsWide(display); - int height = CGDisplayPixelsHigh(display); + size_t width = CGDisplayPixelsWide(display); + size_t height = CGDisplayPixelsHigh(display); // assume square pixel ratio on the monitor if ((width*3)/4 < height) { |