diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-10-10 00:04:58 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-10-10 00:04:58 +0000 |
| commit | 7a613cfccd715ef0b9daa7e49fee51349367b9c8 (patch) | |
| tree | 84fed251e91c6daf67727a0db5b8ff440b19b510 /macosx/plugins/DFXVideo | |
| parent | 15882a2822759bf1d3856beaa1c37346f371b68c (diff) | |
| download | pcsxr-7a613cfccd715ef0b9daa7e49fee51349367b9c8.tar.gz | |
Mainly spacing changes, and a few OCD things.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@80323 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFXVideo')
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/PluginConfigController.m | 23 | ||||
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/PluginGLView.m | 24 |
2 files changed, 22 insertions, 25 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index 29ea49e7..500f1c55 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -101,17 +101,14 @@ NSURL *PSXVertexShader() { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey]; - NSURL *returnURL = [NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"VertexShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil]; - return returnURL; + return [NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"VertexShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil]; } NSURL *PSXFragmentShader() { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey]; - NSURL *returnURL = [NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"FragmentShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil]; - return returnURL; - + return [NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"FragmentShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil]; } float PSXShaderQuality() @@ -121,7 +118,6 @@ float PSXShaderQuality() return (float)[[keyValues objectForKey:@"ShaderQuality"] intValue]; } - void ReadConfig(void) { NSDictionary *keyValues; @@ -164,23 +160,23 @@ void ReadConfig(void) iFrameLimit = 2; if (iShowFPS) - ulKeybits|=KEY_SHOWFPS; + ulKeybits |= KEY_SHOWFPS; else - ulKeybits&=~KEY_SHOWFPS; + ulKeybits &= ~KEY_SHOWFPS; // additional checks - if(!iColDepth) iColDepth=32; + if(!iColDepth) iColDepth = 32; if(iUseFixes) { - dwActFixes=dwCfgFixes; + dwActFixes = dwCfgFixes; } else { - dwActFixes=0; + dwActFixes = 0; } SetFixes(); - if(iFrameLimit==2) SetAutoFrameCap(); + if(iFrameLimit == 2) SetAutoFrameCap(); bSkipNextFrame = FALSE; - szDispBuf[0]=0; + szDispBuf[0] = 0; BuildDispMenu(0); } @@ -327,6 +323,7 @@ void ReadConfig(void) { [vertexPath release]; [fragmentPath release]; + [keyValues release]; [super dealloc]; } diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index 1836ebcd..662b8ebc 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -237,18 +237,18 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) { // Check if an update has occured to the buffer if ([self lockFocusIfCanDraw]) { - - // Make this context current - if (drawBG) { - [[NSColor blackColor] setFill]; - [NSBezierPath fillRect:[self visibleRect]]; - } - - //glFinish() ; - // Swap buffer to screen - //[[self openGLContext] flushBuffer]; - - [self unlockFocus]; + + // Make this context current + if (drawBG) { + [[NSColor blackColor] setFill]; + [NSBezierPath fillRect:[self visibleRect]]; + } + + //glFinish() ; + // Swap buffer to screen + //[[self openGLContext] flushBuffer]; + + [self unlockFocus]; } } |
