From 47d52dacd0e12e909bf91c9bd99478e6b90dbfec Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Tue, 16 Aug 2011 08:02:57 +0000 Subject: SPU crash fix, macos peopsxgl gte accuracy. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@69712 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- .../NetSfPeopsOpenGLConfig.nib/classes.nib | 3 +- .../NetSfPeopsOpenGLConfig.nib/designable.nib | 4237 ++++++++++++++++++++ .../NetSfPeopsOpenGLConfig.nib/keyedobjects.nib | Bin 34726 -> 44407 bytes .../NetSfPeopsOpenGLPluginConfigController.h | 4 +- .../NetSfPeopsOpenGLPluginConfigController.m | 2 +- plugins/dfsound/dsoundoss.h | 2 +- plugins/dfsound/externals.h | 2 +- plugins/dfsound/spu.c | 103 +- plugins/dfsound/spu.h | 2 +- 9 files changed, 4295 insertions(+), 60 deletions(-) create mode 100644 macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib index 6c70d5bf..b3dad11f 100644 --- a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib +++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib @@ -23,7 +23,8 @@ hackEnable = NSControl; hacksView = NSView; mjpegDecoder = NSControl; - mjpegDecoder15bit = NSControl; + mjpegDecoder15bit = NSControl; + gteAccuracy = NSControl; offscreenDrawing = NSPopUpButton; opaquePass = NSControl; proportionalResize = NSControl; diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib new file mode 100644 index 00000000..2f6aa4b6 --- /dev/null +++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib @@ -0,0 +1,4237 @@ + + + + 1060 + 10J567 + 823 + 1038.35 + 462.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 823 + + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + NetSfPeopsOpenGLPluginConfigController + + + FirstResponder + + + NSApplication + + + 1 + 2 + {{2, 373}, {781, 483}} + 1886912512 + GPU Configuration + NSWindow + + View + + {3.40282e+38, 3.40282e+38} + {283.341, 107} + + + 256 + + YES + + + 256 + {{523, 12}, {122, 32}} + + YES + + 67239424 + 134217728 + Cancel + + LucidaGrande + 13 + 1044 + + + -2038284033 + 1 + + + Gw + 200 + 25 + + + + + 256 + {{645, 12}, {122, 32}} + + YES + + 67239424 + 134217728 + OK + + + -2038284033 + 1 + + + DQ + 200 + 25 + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{13, 190}, {144, 18}} + + 6 + YES + + 67239424 + 131072 + Use PC FPS calculation + + LucidaGrande + 11 + 3100 + + + 6 + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 256 + {{13, 250}, {135, 18}} + + 2 + YES + + 67239424 + 131072 + Expand screen width + + + 2 + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{13, 150}, {159, 18}} + + 8 + YES + + 67239424 + 131072 + Use old frame skipping + + + 8 + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{13, 170}, {132, 18}} + + 7 + YES + + 67239424 + 131072 + Lazy screen updates + + + 7 + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{13, 210}, {135, 18}} + + 4 + YES + + 67239424 + 131072 + Disable coord check + + + 4 + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{13, 230}, {180, 18}} + + 3 + YES + + 67239424 + 131072 + Ignore black brightness color + + + 3 + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{13, 270}, {130, 18}} + + 1 + YES + + 67239424 + 131072 + Odd/even bit hack + + + 1 + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{13, 110}, {189, 18}} + + 10 + YES + + 67239424 + 131072 + Draw tex-quads as triangles + + + 10 + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{13, 130}, {195, 18}} + + 9 + YES + + 67239424 + 131072 + Repeated flat tex triangles + + + 9 + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{13, 90}, {189, 18}} + + 11 + YES + + 67239424 + 131072 + Fake 'gpu busy' states + + + 11 + 1211912703 + 2 + + + + 200 + 25 + + + + {{2, 2}, {222, 297}} + + + + {{538, 56}, {226, 301}} + + {0, 0} + + 67239424 + 0 + + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 3 + 0 + 0 + NO + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{307, 18}, {189, 18}} + + YES + + 67239424 + 0 + Sync to Monitor Refresh + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{307, 60}, {147, 18}} + + YES + + 67239424 + 0 + Use Frame Skipping + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{307, 80}, {148, 18}} + + YES + + 67239424 + 0 + Display FPS Counter + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{307, 40}, {125, 18}} + + YES + + 67239424 + 0 + Auto Full Screen + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{149, 92}, {135, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + LucidaGrande + 13 + 16 + + + + + + 400 + 75 + + + Current + + 1048576 + 2147483647 + 1 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + + 640 x 480 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 800 x 600 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 1024 x 768 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 1152 x 864 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 1280 x1024 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 1600 x 1200 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + + 256 + {{17, 97}, {136, 18}} + + YES + + 67239424 + 272629760 + Fullscreen size + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2ODY1AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 256 + {{307, 100}, {129, 18}} + + YES + + 67239424 + 0 + Limit Frame Rate + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{18, 38}, {148, 18}} + + YES + + 67239424 + 0 + Disable Screensaver + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{18, 60}, {155, 18}} + + YES + + 67239424 + 0 + Resize Proportionally + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {{2, 2}, {510, 127}} + + + + {{17, 333}, {514, 144}} + + {0, 0} + + 67239424 + 0 + Display Settings + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 3 + 0 + 2 + NO + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{15, 219}, {144, 17}} + + YES + + 67239424 + 4194304 + Dither Graphics: + + + + + + + + + 256 + {{139, 213}, {174, 26}} + + YES + + -2076049856 + 1024 + + + 109199615 + 1 + + + + + + + + 400 + 75 + + + When Hinted + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + Never + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + + Always + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 1 + 3 + YES + YES + 1 + + + + + 256 + {{349, 82}, {141, 18}} + + YES + + 67239424 + 131072 + Draw Wireframes Only + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 138}, {147, 18}} + + YES + + 67239424 + 131072 + Use Advanced Blending + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 119}, {147, 18}} + + YES + + 67239424 + 131072 + Perform Opaque Pass + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 100}, {167, 18}} + + YES + + 67239424 + 131072 + Use Clipping Z-Masks + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 43}, {147, 18}} + + YES + + 67239424 + 131072 + Motion JPEG decoder + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 24}, {147, 18}} + + YES + + 67239424 + 131072 + 15bit Motion JPEGs + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 155}, {110, 25}} + + YES + + 67239424 + 131072 + Draw scan lines + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{349, 62}, {147, 18}} + + YES + + 67239424 + 131072 + Add Blur + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{139, 187}, {174, 22}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + + + + 400 + 75 + + + Default + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + None + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Some + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + + More + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Aggressive + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 2 + 3 + YES + YES + 1 + + + + + 256 + {{15, 185}, {153, 21}} + + YES + + 67239424 + 272629760 + Offscreen Drawing + + + + + + + + + 256 + + YES + + + 256 + + YES + + + 256 + {{105, 91}, {191, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + + + + 400 + 75 + + + default + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + + RGBA 16 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + R5 G5 B5 A1 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + RGBA 32 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + BGRA 32 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + + 256 + {{13, 65}, {114, 17}} + + YES + + 67239424 + 272629760 + Enhancement + + + + + + + + + 256 + {{13, 27}, {114, 17}} + + YES + + 67239424 + 272629760 + Filtering + + + + + + + + + 256 + {{13, 97}, {114, 17}} + + YES + + 67239424 + 272629760 + Color Depth + + + + + + + + + 256 + {{106, 18}, {189, 26}} + + YES + + 67239424 + 0 + + + + + Helvetica + 12 + 16 + + + 6 + 0.0 + 0.0 + 0.0 + 7 + 1 + YES + NO + + + + + 256 + {{106, 61}, {189, 26}} + + YES + + 67239424 + 0 + + + + + + 2 + 0.0 + 0.0 + 0.0 + 3 + 1 + YES + NO + + + + {{2, 2}, {307, 139}} + + + + {{15, 13}, {311, 156}} + + {0, 0} + + 67239424 + 0 + Textures + + LucidaGrande + 11 + 16 + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 3 + 0 + 2 + NO + + + + 256 + {{345, 187}, {130, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + + + + 400 + 75 + + + Item1 + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + + Item2 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Item3 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + + 256 + {{339, 219}, {141, 17}} + + YES + + 67239424 + 272629760 + Frame Buffer Effects + + + + + + + + + 256 + + YES + + YES + + NSColor pasteboard type + + + + {{460, 156}, {23, 22}} + + YES + YES + + 1 + MCAwIDAgMC4yMzk5OTk5OTQ2AA + + + + + 256 + {{349, 5}, {147, 18}} + + YES + + 67239424 + 131072 + GTE Accuracy + + + 1211912703 + 2 + + + + 200 + 25 + + + + {{2, 2}, {511, 256}} + + + + {{17, 56}, {515, 273}} + + {0, 0} + + 67239424 + 0 + Rendering + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 3 + 0 + 2 + NO + + + + 256 + {{392, 12}, {122, 32}} + + YES + + 67239424 + 134217728 + Reset + + + -2038284033 + 1 + + + + 200 + 25 + + + + + 256 + {{538, 357}, {211, 68}} + + YES + + 67239424 + 138543104 + T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk +IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu +A + + + YES + + + + + + + 256 + {{594, 431}, {106, 18}} + + YES + + 67239424 + 134217728 + Enable Hacks + + + 1211912703 + 2 + + + + 200 + 25 + + + + {781, 483} + + + {{0, 0}, {1440, 878}} + {283.341, 129} + {3.40282e+38, 3.40282e+38} + + + + YES + Draw Scanlines + Suckass + Fast mjpeg decoder + FPS Counter + Auto Full Screen + VSync + Enable Hacks + Propodrtional Resize + Offscreen Drawing + Dither Mode + Frame Buffer Level + Color Depth Level + Texture Color Depth Level + Texture Filter Level + Advanced Blending + Scanline Color + Frame Limit + Frame Skipping + Proportional Resize + Offscreen Drawing Level + GteAccuracy + + YES + + + + YES + + + YES + + + + + YES + + + nextKeyView + + + + 9 + + + + ok: + + + + 133 + + + + cancel: + + + + 134 + + + + reset: + + + + 135 + + + + fpsCounter + + + + 136 + + + + autoFullScreen + + + + 137 + + + + frameSkipping + + + + 138 + + + + hacksView + + + + 139 + + + + vSync + + + + 140 + + + + window + + + + 141 + + + + delegate + + + + 142 + + + + ditherMode + + + + 143 + + + + initialFirstResponder + + + + 145 + + + + hackEnable + + + + 229 + + + + fullscreenSize + + + + 231 + + + + offscreenDrawing + + + + 232 + + + + frameBufferEffects + + + + 233 + + + + drawScanlines + + + + 234 + + + + advancedBlending + + + + 235 + + + + opaquePass + + + + 236 + + + + wireframeOnly + + + + 237 + + + + blurEffect + + + + 238 + + + + mjpegDecoder + + + + 239 + + + + mjpegDecoder15bit + + + + 240 + + + + proportionalResize + + + + 241 + + + + texColorDepth + + + + 242 + + + + zMaskClipping + + + + 245 + + + + texEnhancment + + + + 276 + + + + texFiltering + + + + 277 + + + + value: selection.Fast mjpeg decoder + + + + + + value: selection.Fast mjpeg decoder + value + selection.Fast mjpeg decoder + 2 + + + 319 + + + + value: selection.Draw Scanlines + + + + + + value: selection.Draw Scanlines + value + selection.Draw Scanlines + 2 + + + 322 + + + + value: selection.FPS Counter + + + + + + value: selection.FPS Counter + value + selection.FPS Counter + 2 + + + 323 + + + + value: selection.Auto Full Screen + + + + + + value: selection.Auto Full Screen + value + selection.Auto Full Screen + 2 + + + 324 + + + + value: selection.VSync + + + + + + value: selection.VSync + value + selection.VSync + 2 + + + 325 + + + + value: selection.Enable Hacks + + + + + + value: selection.Enable Hacks + value + selection.Enable Hacks + 2 + + + 326 + + + + selectedIndex: selection.Dither Mode + + + + + + selectedIndex: selection.Dither Mode + selectedIndex + selection.Dither Mode + 2 + + + 329 + + + + selectedIndex: selection.Frame Buffer Level + + + + + + selectedIndex: selection.Frame Buffer Level + selectedIndex + selection.Frame Buffer Level + 2 + + + 330 + + + + selectedIndex: selection.Texture Color Depth Level + + + + + + selectedIndex: selection.Texture Color Depth Level + selectedIndex + selection.Texture Color Depth Level + 2 + + + 332 + + + + value: selection.Texture Filter Level + + + + + + value: selection.Texture Filter Level + value + selection.Texture Filter Level + 2 + + + 333 + + + + value: selection.Advanced Blending + + + + + + value: selection.Advanced Blending + value + selection.Advanced Blending + 2 + + + 334 + + + + value: selection.Opaque Pass + + + + + + value: selection.Opaque Pass + value + selection.Opaque Pass + 2 + + + 336 + + + + value: selection.Z Mask Clipping + + + + + + value: selection.Z Mask Clipping + value + selection.Z Mask Clipping + 2 + + + 337 + + + + value: selection.Wireframe Mode + + + + + + value: selection.Wireframe Mode + value + selection.Wireframe Mode + 2 + + + 338 + + + + value: selection.Blur + + + + + + value: selection.Blur + value + selection.Blur + 2 + + + 339 + + + + value: selection.Emulate mjpeg decoder + + + + + + value: selection.Emulate mjpeg decoder + value + selection.Emulate mjpeg decoder + 2 + + + 340 + + + + enabled: selection.Draw Scanlines + + + + + + enabled: selection.Draw Scanlines + enabled + selection.Draw Scanlines + 2 + + + 348 + + + + value: selection.Texture Enhancement Level + + + + + + value: selection.Texture Enhancement Level + value + selection.Texture Enhancement Level + 2 + + + 349 + + + + contentObject: values.net.sf.peops.GpuOpenGLPlugin Settings + + + + + + contentObject: values.net.sf.peops.GpuOpenGLPlugin Settings + contentObject + values.net.sf.peops.GpuOpenGLPlugin Settings + + NSHandlesContentAsCompoundValue + + + 2 + + + 353 + + + + value: selection.Scanline Color + + + + + + value: selection.Scanline Color + value + selection.Scanline Color + + NSValueTransformerName + NSUnarchiveFromData + + 2 + + + 354 + + + + hackToggle: + + + + 355 + + + + value: selection.Frame Limit + + + + + + value: selection.Frame Limit + value + selection.Frame Limit + 2 + + + 356 + + + + value: selection.Frame Skipping + + + + + + value: selection.Frame Skipping + value + selection.Frame Skipping + 2 + + + 357 + + + + value: selection.Proportional Resize + + + + + + value: selection.Proportional Resize + value + selection.Proportional Resize + 2 + + + 358 + + + + selectedIndex: selection.Offscreen Drawing Level + + + + + + selectedIndex: selection.Offscreen Drawing Level + selectedIndex + selection.Offscreen Drawing Level + 2 + + + 359 + + + + value: selection.GteAccuracy + + + + + + value: selection.GteAccuracy + value + selection.GteAccuracy + 2 + + + 408 + + + + + YES + + 0 + + YES + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + 5 + + + YES + + + + Window + + + 6 + + + YES + + + + + + + + + + + + + 7 + + + YES + + + + + + 8 + + + YES + + + + + + 10 + + + YES + + + + + + 76 + + + YES + + + + + + + + + + + + + + + 89 + + + YES + + + + + + + + + + + + + + 107 + + + YES + + + + + + + + + + + + + + + + + + + + + + 222 + + + YES + + + + + + 223 + + + YES + + + + + + 306 + + + + + 320 + + + + + 350 + + + Shared Defaults + + + 361 + + + + + 362 + + + + + 363 + + + + + 403 + + + + + 404 + + + + + -3 + + + Application + + + 75 + + + YES + + + + + + 365 + + + + + 80 + + + YES + + + + + + 368 + + + + + 79 + + + YES + + + + + + 367 + + + + + 82 + + + YES + + + + + + 369 + + + + + 78 + + + YES + + + + + + 366 + + + + + 73 + + + YES + + + + + + 364 + + + + + 147 + + + YES + + + + + + 370 + + + + + 148 + + + YES + + + + + + 371 + + + + + 149 + + + YES + + + + + + 372 + + + + + 150 + + + YES + + + + + + 373 + + + + + 93 + + + YES + + + + + + 374 + + + + + 96 + + + YES + + + + + + 375 + + + + + 97 + + + YES + + + + + + 376 + + + + + 99 + + + YES + + + + + + 377 + + + + + 162 + + + YES + + + + + + 378 + + + YES + + + + + + 163 + + + YES + + + + + + + + + + + + 164 + + + + + 165 + + + + + 166 + + + + + 246 + + + + + 247 + + + + + 248 + + + + + 249 + + + + + 168 + + + YES + + + + + + 379 + + + + + 177 + + + YES + + + + + + 380 + + + + + 187 + + + YES + + + + + + 381 + + + + + 214 + + + YES + + + + + + 382 + + + + + 112 + + + YES + + + + + + 383 + + + + + 116 + + + YES + + + + + + 384 + + + YES + + + + + + 113 + + + YES + + + + + + + + 111 + + + + + 114 + + + + + 115 + + + + + 175 + + + YES + + + + + + 385 + + + + + 178 + + + YES + + + + + + 386 + + + + + 179 + + + YES + + + + + + 387 + + + + + 180 + + + YES + + + + + + 388 + + + + + 181 + + + YES + + + + + + 389 + + + + + 182 + + + YES + + + + + + 390 + + + + + 183 + + + YES + + + + + + 391 + + + + + 185 + + + YES + + + + + + 392 + + + + + 202 + + + YES + + + + + + 393 + + + YES + + + + + + 203 + + + YES + + + + + + + + + + 204 + + + + + 205 + + + + + 206 + + + + + 254 + + + + + 255 + + + + + 207 + + + YES + + + + + + 394 + + + + + 212 + + + YES + + + + + + + + + + + 215 + + + YES + + + + + + 401 + + + YES + + + + + + 216 + + + YES + + + + + + + + 217 + + + + + 218 + + + + + 219 + + + + + 220 + + + YES + + + + + + 402 + + + + + 341 + + + + + 169 + + + YES + + + + + + 395 + + + YES + + + + + + 170 + + + YES + + + + + + + + + + 251 + + + + + 250 + + + + + 173 + + + + + 172 + + + + + 171 + + + + + 201 + + + YES + + + + + + 398 + + + + + 193 + + + YES + + + + + + 397 + + + + + 174 + + + YES + + + + + + 396 + + + + + 252 + + + YES + + + + + + 399 + + + + + 253 + + + YES + + + + + + 400 + + + + + 405 + + + YES + + + + + + 406 + + + + + + + YES + + YES + 10.IBPluginDependency + 10.ImportedFromIB2 + 107.IBAttributePlaceholdersKey + 107.IBPluginDependency + 107.ImportedFromIB2 + 111.IBPluginDependency + 111.ImportedFromIB2 + 112.IBAttributePlaceholdersKey + 112.IBPluginDependency + 112.ImportedFromIB2 + 113.IBPluginDependency + 113.ImportedFromIB2 + 114.IBPluginDependency + 114.ImportedFromIB2 + 115.IBPluginDependency + 115.ImportedFromIB2 + 116.IBAttributePlaceholdersKey + 116.IBPluginDependency + 116.ImportedFromIB2 + 147.IBAttributePlaceholdersKey + 147.IBPluginDependency + 147.ImportedFromIB2 + 148.IBAttributePlaceholdersKey + 148.IBPluginDependency + 148.ImportedFromIB2 + 149.IBAttributePlaceholdersKey + 149.IBPluginDependency + 149.ImportedFromIB2 + 150.IBAttributePlaceholdersKey + 150.IBPluginDependency + 150.ImportedFromIB2 + 162.IBAttributePlaceholdersKey + 162.IBPluginDependency + 162.ImportedFromIB2 + 163.IBPluginDependency + 163.ImportedFromIB2 + 164.IBPluginDependency + 164.ImportedFromIB2 + 165.IBPluginDependency + 165.ImportedFromIB2 + 166.IBPluginDependency + 166.ImportedFromIB2 + 168.IBAttributePlaceholdersKey + 168.IBPluginDependency + 168.ImportedFromIB2 + 169.IBAttributePlaceholdersKey + 169.IBPluginDependency + 169.ImportedFromIB2 + 170.IBPluginDependency + 170.ImportedFromIB2 + 171.IBPluginDependency + 171.ImportedFromIB2 + 172.IBPluginDependency + 172.ImportedFromIB2 + 173.IBPluginDependency + 173.ImportedFromIB2 + 174.IBAttributePlaceholdersKey + 174.IBPluginDependency + 174.ImportedFromIB2 + 175.IBAttributePlaceholdersKey + 175.IBPluginDependency + 175.ImportedFromIB2 + 177.IBAttributePlaceholdersKey + 177.IBPluginDependency + 177.ImportedFromIB2 + 178.IBPluginDependency + 178.ImportedFromIB2 + 179.IBPluginDependency + 179.ImportedFromIB2 + 180.IBAttributePlaceholdersKey + 180.IBPluginDependency + 180.ImportedFromIB2 + 181.IBAttributePlaceholdersKey + 181.IBPluginDependency + 181.ImportedFromIB2 + 182.IBAttributePlaceholdersKey + 182.IBPluginDependency + 182.IBViewBoundsToFrameTransform + 182.ImportedFromIB2 + 183.IBAttributePlaceholdersKey + 183.IBPluginDependency + 183.ImportedFromIB2 + 185.IBAttributePlaceholdersKey + 185.IBPluginDependency + 185.ImportedFromIB2 + 187.IBPluginDependency + 187.ImportedFromIB2 + 193.IBAttributePlaceholdersKey + 193.IBPluginDependency + 193.ImportedFromIB2 + 201.IBAttributePlaceholdersKey + 201.IBPluginDependency + 201.ImportedFromIB2 + 202.IBAttributePlaceholdersKey + 202.IBPluginDependency + 202.ImportedFromIB2 + 203.IBPluginDependency + 203.ImportedFromIB2 + 204.IBPluginDependency + 204.ImportedFromIB2 + 205.IBPluginDependency + 205.ImportedFromIB2 + 206.IBPluginDependency + 206.ImportedFromIB2 + 207.IBAttributePlaceholdersKey + 207.IBPluginDependency + 207.ImportedFromIB2 + 212.IBPluginDependency + 212.ImportedFromIB2 + 214.IBAttributePlaceholdersKey + 214.IBPluginDependency + 214.ImportedFromIB2 + 215.IBPluginDependency + 215.ImportedFromIB2 + 216.IBPluginDependency + 216.ImportedFromIB2 + 217.IBPluginDependency + 217.ImportedFromIB2 + 218.IBPluginDependency + 218.ImportedFromIB2 + 219.IBPluginDependency + 219.ImportedFromIB2 + 220.IBAttributePlaceholdersKey + 220.IBPluginDependency + 220.ImportedFromIB2 + 222.IBPluginDependency + 222.ImportedFromIB2 + 223.IBPluginDependency + 223.ImportedFromIB2 + 246.IBPluginDependency + 246.ImportedFromIB2 + 247.IBPluginDependency + 247.ImportedFromIB2 + 248.IBPluginDependency + 248.ImportedFromIB2 + 249.IBPluginDependency + 249.ImportedFromIB2 + 250.IBPluginDependency + 250.ImportedFromIB2 + 251.IBPluginDependency + 251.ImportedFromIB2 + 252.IBAttributePlaceholdersKey + 252.IBPluginDependency + 252.ImportedFromIB2 + 253.IBAttributePlaceholdersKey + 253.IBPluginDependency + 253.ImportedFromIB2 + 254.IBPluginDependency + 254.ImportedFromIB2 + 255.IBPluginDependency + 255.ImportedFromIB2 + 306.IBPluginDependency + 306.ImportedFromIB2 + 320.IBPluginDependency + 320.ImportedFromIB2 + 341.IBAttributePlaceholdersKey + 341.IBPluginDependency + 341.ImportedFromIB2 + 350.IBPluginDependency + 350.ImportedFromIB2 + 405.IBAttributePlaceholdersKey + 405.IBPluginDependency + 405.ImportedFromIB2 + 5.IBEditorWindowLastContentRect + 5.IBPluginDependency + 5.IBWindowTemplateEditedContentRect + 5.ImportedFromIB2 + 5.windowTemplate.hasMinSize + 5.windowTemplate.minSize + 6.IBPluginDependency + 6.ImportedFromIB2 + 7.IBPluginDependency + 7.ImportedFromIB2 + 73.IBAttributePlaceholdersKey + 73.IBPluginDependency + 73.ImportedFromIB2 + 75.IBAttributePlaceholdersKey + 75.IBPluginDependency + 75.ImportedFromIB2 + 76.IBPluginDependency + 76.ImportedFromIB2 + 78.IBAttributePlaceholdersKey + 78.IBPluginDependency + 78.ImportedFromIB2 + 79.IBAttributePlaceholdersKey + 79.IBPluginDependency + 79.ImportedFromIB2 + 8.IBPluginDependency + 8.ImportedFromIB2 + 80.IBAttributePlaceholdersKey + 80.IBPluginDependency + 80.ImportedFromIB2 + 82.IBAttributePlaceholdersKey + 82.IBPluginDependency + 82.ImportedFromIB2 + 89.IBPluginDependency + 89.ImportedFromIB2 + 93.IBAttributePlaceholdersKey + 93.IBPluginDependency + 93.ImportedFromIB2 + 96.IBAttributePlaceholdersKey + 96.IBPluginDependency + 96.ImportedFromIB2 + 97.IBAttributePlaceholdersKey + 97.IBPluginDependency + 97.ImportedFromIB2 + 99.IBAttributePlaceholdersKey + 99.IBPluginDependency + 99.ImportedFromIB2 + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + If your card supports it, will mix textures more accurately + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Specify when to use dithering to render colors + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Specify when to use dithering to render colors + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Chrono Cross + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Slightly distorted textures can happen + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Needed by Dark Forces + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Toggles busy flags after drawing + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Change resolution to this when going full screen + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Change resolution to this when going full screen + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + The color depth of stored textures. + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + The color depth of stored textures. + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Transforms your playstation into a wireframe game + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Cap the frames per second so emulation doesn't get outta hand + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Enables the primitive z-buffer which masks polygons from bleeding + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Check this to emulate the special movie decoder + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Enabling this will use a faster motion jpeg codec with some quality loss + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDrwAAwfgAAA + + + + ToolTip + + ToolTip + + Draws TV-like scan lines over the display + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + When enabled, renders an almost unnoticeable "motion blur" + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Select a quality level of texture scaling + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Use offscreen drawing to remove some graphics glitches + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Use offscreen drawing to remove some graphics glitches + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + When checked, will keep the PSX display at natural aspect ratio + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Select the method the PSX uses to read the contents of the screen + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Select a quality level of texture scaling + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Select a color and transparency for the scanlines + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Enabling this will use a faster motion jpeg codec with some quality loss + + + com.apple.InterfaceBuilder.CocoaPlugin + + {{329, 362}, {781, 483}} + com.apple.InterfaceBuilder.CocoaPlugin + {{329, 362}, {781, 483}} + + + {283.341, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Fixes black screens in Lunar + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Better fps limitation with some games + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Old compatibility mode + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Better fps limitation with some games + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Shows the full area in Capcom 2D fighters + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Maybe faster, needed for Pandemonium 2 + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Removes tearing artifacts by waiting for the monitor to sync. Will cause a slight performance loss. This setting has no effect on LCD monitors. + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS) + + + com.apple.InterfaceBuilder.CocoaPlugin + + + ToolTip + + ToolTip + + Automatically enter full screen mode + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + YES + + + YES + + + + + YES + + + YES + + + + 408 + + + + YES + + FirstResponder + NSObject + + : + id + + + : + + : + id + + + + IBUserSource + + + + + NetSfPeopsOpenGLPluginConfigController + NSWindowController + + YES + + YES + cancel: + hackToggle: + ok: + reset: + + + YES + id + id + id + id + + + + YES + + YES + cancel: + hackToggle: + ok: + reset: + + + YES + + cancel: + id + + + hackToggle: + id + + + ok: + id + + + reset: + id + + + + + YES + + YES + advancedBlending + autoFullScreen + blurEffect + ditherMode + drawScanlines + fpsCounter + frameBufferEffects + frameSkipping + fullscreenSize + gteAccuracy + hackEnable + hacksView + mjpegDecoder + mjpegDecoder15bit + offscreenDrawing + opaquePass + proportionalResize + texColorDepth + texEnhancment + texFiltering + vSync + windowSize + wireframeOnly + zMaskClipping + + + YES + NSControl + NSControl + NSControl + NSPopUpButton + NSControl + NSControl + NSPopUpButton + NSControl + NSPopUpButton + NSControl + NSControl + NSView + NSControl + NSControl + NSPopUpButton + NSControl + NSControl + NSPopUpButton + NSSlider + NSSlider + NSControl + NSPopUpButton + NSControl + NSControl + + + + YES + + YES + advancedBlending + autoFullScreen + blurEffect + ditherMode + drawScanlines + fpsCounter + frameBufferEffects + frameSkipping + fullscreenSize + gteAccuracy + hackEnable + hacksView + mjpegDecoder + mjpegDecoder15bit + offscreenDrawing + opaquePass + proportionalResize + texColorDepth + texEnhancment + texFiltering + vSync + windowSize + wireframeOnly + zMaskClipping + + + YES + + advancedBlending + NSControl + + + autoFullScreen + NSControl + + + blurEffect + NSControl + + + ditherMode + NSPopUpButton + + + drawScanlines + NSControl + + + fpsCounter + NSControl + + + frameBufferEffects + NSPopUpButton + + + frameSkipping + NSControl + + + fullscreenSize + NSPopUpButton + + + gteAccuracy + NSControl + + + hackEnable + NSControl + + + hacksView + NSView + + + mjpegDecoder + NSControl + + + mjpegDecoder15bit + NSControl + + + offscreenDrawing + NSPopUpButton + + + opaquePass + NSControl + + + proportionalResize + NSControl + + + texColorDepth + NSPopUpButton + + + texEnhancment + NSSlider + + + texFiltering + NSSlider + + + vSync + NSControl + + + windowSize + NSPopUpButton + + + wireframeOnly + NSControl + + + zMaskClipping + NSControl + + + + + IBProjectSource + macsrc/NetSfPeopsOpenGLPluginConfigController.h + + + + NetSfPeopsOpenGLPluginConfigController + NSWindowController + + IBUserSource + + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + + 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + NSSwitch + + + YES + {9, 8} + {7, 2} + {15, 15} + + + + diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib index 6112f7ab..ecb58655 100644 Binary files a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib and b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib differ diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h index 7d3bea7c..a38ea138 100644 --- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h +++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h @@ -42,8 +42,8 @@ IBOutlet NSControl *blurEffect; IBOutlet NSControl *mjpegDecoder; IBOutlet NSControl *mjpegDecoder15bit; - - + IBOutlet NSControl *gteAccuracy; + NSMutableDictionary *keyValues; } diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m index 73c85711..634362a4 100644 --- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m +++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m @@ -207,7 +207,7 @@ void ReadConfig(void) bUseFastMdec = [[keyValues objectForKey:@"Emulate mjpeg decoder"] boolValue]; bUse15bitMdec = [[keyValues objectForKey:@"Fast mjpeg decoder"] boolValue]; - + bGteAccuracy = [[keyValues objectForKey:@"GteAccuracy"] boolValue]; if (iShowFPS) ulKeybits|=KEY_SHOWFPS; diff --git a/plugins/dfsound/dsoundoss.h b/plugins/dfsound/dsoundoss.h index f64f645b..7196e092 100644 --- a/plugins/dfsound/dsoundoss.h +++ b/plugins/dfsound/dsoundoss.h @@ -24,4 +24,4 @@ void SoundFeedStreamData(unsigned char* pSound,long lBytes); #define timeGetTime_spu timeGetTime #else unsigned long timeGetTime_spu(); -#endif \ No newline at end of file +#endif diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index da3d9f65..12fd1ead 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -283,7 +283,7 @@ extern int bEndThread; extern int bThreadEnded; extern int bSpuInit; extern uint32_t dwNewChannel; -extern int bIrqHit; +extern unsigned int bIrqHit; extern int SSumR[]; extern int SSumL[]; diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 8d9b0ea3..e646e226 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -93,8 +93,8 @@ unsigned long dwNoiseCount; // global noise generator unsigned long dwNoiseClock; // global noise generator int iSpuAsyncWait=0; -int decoded_ptr = 0; -int bIrqHit = 0; +unsigned int decoded_ptr = 0; +unsigned int bIrqHit = 0; unsigned short spuCtrl=0; // some vars to store psx reg infos unsigned short spuStat=0; @@ -109,7 +109,7 @@ int bSPUIsOpen=0; HWND hWMain=0; // window handle HWND hWDebug=0; HWND hWRecord=0; -static HANDLE hMainThread; +static HANDLE hMainThread; #else static pthread_t thread = (pthread_t)-1; // thread id (linux) #endif @@ -180,7 +180,7 @@ static int iSecureStart=0; // secure start counter // // - and next delta significant (at least twice) bigger: // / -// __- +// __- // // - and next delta is nearly same: // / @@ -205,7 +205,7 @@ INLINE void InterpolateUp(int ch) if(id2<(id1<<1)) s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L; else - s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; + s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; } else // curr delta negative { @@ -215,7 +215,7 @@ INLINE void InterpolateUp(int ch) if(id2>(id1<<1)) s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L; else - s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; + s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; } } else @@ -320,7 +320,7 @@ INLINE void FModChangeFrequency(int ch,int ns) if(iUseInterpolation==1) // freq change in simple interpolation mode s_chan[ch].SB[32]=1; iFMod[ns]=0; -} +} //////////////////////////////////////////////////////////////////////// @@ -400,7 +400,7 @@ INLINE int iGetNoiseVal(int ch) // no clip need //if(fa>32767L) fa=32767L; - //if(fa<-32767L) fa=-32767L; + //if(fa<-32767L) fa=-32767L; // don't upset VAG decoder //if(iUseInterpolation<2) // no gauss/cubic interpolation? @@ -409,7 +409,7 @@ INLINE int iGetNoiseVal(int ch) // boost volume - no more! //return fa * 3 / 2; return fa; -} +} //////////////////////////////////////////////////////////////////////// @@ -426,20 +426,20 @@ INLINE void StoreInterpolationVal(int ch,int fa) else // else adjust { if(fa>32767L) fa=32767L; - if(fa<-32767L) fa=-32767L; + if(fa<-32767L) fa=-32767L; } if(iUseInterpolation>=2) // gauss/cubic interpolation - { + { int gpos = s_chan[ch].SB[28]; - gval0 = fa; + gval0 = fa; gpos = (gpos+1) & 3; s_chan[ch].SB[28] = gpos; } else if(iUseInterpolation==1) // simple interpolation { - s_chan[ch].SB[28] = 0; + s_chan[ch].SB[28] = 0; s_chan[ch].SB[29] = s_chan[ch].SB[30]; // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour' s_chan[ch].SB[30] = s_chan[ch].SB[31]; s_chan[ch].SB[31] = fa; @@ -459,7 +459,7 @@ INLINE int iGetInterpolationVal(int ch) //if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29]; switch(iUseInterpolation) - { + { //--------------------------------------------------// case 3: // cubic interpolation { @@ -502,7 +502,7 @@ INLINE int iGetInterpolationVal(int ch) //--------------------------------------------------// default: // no interpolation { - fa=s_chan[ch].SB[29]; + fa=s_chan[ch].SB[29]; } break; //--------------------------------------------------// } @@ -537,11 +537,11 @@ static void *MAINThread(void *arg) unsigned char * start;unsigned int nSample; int ch,predict_nr,shift_factor,flags,d,s; int bIRQReturn=0; - int decoded_voice; + unsigned int decoded_voice=0; // mute output if( voldiv == 5 ) voldiv = 0x7fffffff; - + while(!bEndThread) // until we are shutting down { // ok, at the beginning we are looking if there is @@ -580,7 +580,7 @@ static void *MAINThread(void *arg) if(dwNewChannel) iSecureStart=1; // if a new channel kicks in (or, of course, sound buffer runs low), we will leave the loop } - //--------------------------------------------------// continue from irq handling in timer mode? + //--------------------------------------------------// continue from irq handling in timer mode? if(lastch>=0) // will be -1 if no continue is pending { @@ -589,7 +589,7 @@ static void *MAINThread(void *arg) } //--------------------------------------------------// - //- main channel loop -// + //- main channel loop -// //--------------------------------------------------// { ns=0; @@ -607,7 +607,7 @@ static void *MAINThread(void *arg) spuMem[ (0x800 + decoded_voice) / 2 ] = (short) 0; spuMem[ (0xc00 + decoded_voice) / 2 ] = (short) 0; - + NoiseClock(); for(ch=0;ch 4 ) predict_nr = 0; - // -------------------------------------- // + // -------------------------------------- // - for (nSample=0;nSample<28;start++) + for (nSample=0;nSample<28;start++) { d=(int)*start; s=((d&0xf)<<12); @@ -715,7 +715,7 @@ static void *MAINThread(void *arg) { if((pSpuIrq > start-16 && // irq address reached? pSpuIrq <= start) || - ((flags&1) && // special: irq on looping addr, when stop/loop flag is set + ((flags&1) && // special: irq on looping addr, when stop/loop flag is set (pSpuIrq > s_chan[ch].pLoop-16 && pSpuIrq <= s_chan[ch].pLoop))) #endif @@ -764,7 +764,7 @@ static void *MAINThread(void *arg) // silence = keep playing..? if( (flags&2) == 0 ) { s_chan[ch].iSilent = 1; - + // silence = don't start release phase //s_chan[ch].bStop = 1; @@ -800,10 +800,10 @@ static void *MAINThread(void *arg) { bIRQReturn=0; if(iUseTimer!=2) - { + { DWORD dwWatchTime=timeGetTime_spu()+2500; - while(iSpuAsyncWait && !bEndThread && + while(iSpuAsyncWait && !bEndThread && timeGetTime_spu()= 0x400 ) { - decoded_voice = 0; - } + decoded_voice &= 0x400; // status flag @@ -896,18 +894,17 @@ GOON: ; // IRQ work { unsigned char *old_irq; - int old_ptr; + unsigned int old_ptr; old_irq = pSpuIrq; old_ptr = decoded_voice; - #if 0 // align to boundaries ($0, $200, $400, $600) pSpuIrq = ((pSpuIrq - spuMemC) & (~0x1ff)) + spuMemC; decoded_voice = decoded_voice & (~0x1ff); #endif - + // check all decoded buffer IRQs - timing issue Check_IRQ( decoded_voice + 0x000, 0 ); Check_IRQ( decoded_voice + 0x400, 0 ); @@ -930,11 +927,11 @@ GOON: ; // mix XA infos (if any) MixXA(); - + // now safe to update deocded buffer ptr decoded_ptr += ns * 2; - if( decoded_ptr >= 0x400 ) decoded_ptr -= 0x400; + decoded_ptr &= 0x400; /////////////////////////////////////////////////////// @@ -1003,11 +1000,11 @@ GOON: ; *pS++=sr/voldiv; } else { SSumL[ns]+=MixREVERBLeft(ns); - + d=SSumL[ns]/voldiv;SSumL[ns]=0; if(d<-32767) d=-32767;if(d>32767) d=32767; *pS++=d; - + SSumR[ns]+=MixREVERBRight(); d=SSumR[ns]/voldiv;SSumR[ns]=0; @@ -1016,19 +1013,19 @@ GOON: ; } } - ////////////////////////////////////////////////////// + ////////////////////////////////////////////////////// // special irq handling in the decode buffers (0x0000-0x1000) - // we know: + // we know: // the decode buffers are located in spu memory in the following way: // 0x0000-0x03ff CD audio left // 0x0400-0x07ff CD audio right // 0x0800-0x0bff Voice 1 // 0x0c00-0x0fff Voice 3 // and decoded data is 16 bit for one sample - // we assume: + // we assume: // even if voices 1/3 are off or no cd audio is playing, the internal // play positions will move on and wrap after 0x400 bytes. - // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and + // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and // increase this pointer on each sample by 2 bytes. If this pointer // (or 0x400 offsets of this pointer) hits the spuirq address, we generate // an IRQ. Only problem: the "wait for cpu" option is kinda hard to do here @@ -1039,7 +1036,7 @@ GOON: ; { for(ns=0;ns init sustain @@ -1290,7 +1287,7 @@ void SetupStreams(void) // REMOVESTREAMS: free most buffer void RemoveStreams(void) -{ +{ free(pSpuBuffer); // free mixing buffer pSpuBuffer = NULL; free(sRVBStart); // free reverb buffer @@ -1331,7 +1328,7 @@ long CALLBACK SPUinit(void) // SPUOPEN: called by main emu after init #ifdef _WINDOWS -long CALLBACK SPUopen(HWND hW) +long CALLBACK SPUopen(HWND hW) #else long SPUopen(void) #endif @@ -1436,7 +1433,7 @@ void CALLBACK SPUabout(void) } // SETUP CALLBACKS -// this functions will be called once, +// this functions will be called once, // passes a callback that should be called on SPU-IRQ/cdda volume change void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void)) { diff --git a/plugins/dfsound/spu.h b/plugins/dfsound/spu.h index 8912684b..6e262966 100644 --- a/plugins/dfsound/spu.h +++ b/plugins/dfsound/spu.h @@ -18,4 +18,4 @@ void SetupTimer(void); void RemoveTimer(void); void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap); -void CALLBACK SPUplayCDDAchannel(short *pcm, int bytes); \ No newline at end of file +void CALLBACK SPUplayCDDAchannel(short *pcm, int bytes); -- cgit v1.2.3