From 96a007f1ef6618f4a1a68d33fdd1a8abc886a397 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sat, 19 Feb 2011 02:30:06 +0000 Subject: -Removed obsoleted files. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@63550 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFSound/Info copy.plist | 88 --- .../Null Resources/English.lproj/Credits.rtf | 18 - .../Null Resources/English.lproj/InfoPlist.strings | 7 - .../English.lproj/NullSpuPluginMain.xib | 632 --------------------- .../plugins/DFSound/macsrc/PluginController-Null.h | 16 - .../plugins/DFSound/macsrc/PluginController-Null.m | 79 --- macosx/plugins/DFSound/src/macosx.c | 206 ------- 7 files changed, 1046 deletions(-) delete mode 100644 macosx/plugins/DFSound/Info copy.plist delete mode 100644 macosx/plugins/DFSound/Null Resources/English.lproj/Credits.rtf delete mode 100644 macosx/plugins/DFSound/Null Resources/English.lproj/InfoPlist.strings delete mode 100644 macosx/plugins/DFSound/Null Resources/English.lproj/NullSpuPluginMain.xib delete mode 100644 macosx/plugins/DFSound/macsrc/PluginController-Null.h delete mode 100644 macosx/plugins/DFSound/macsrc/PluginController-Null.m delete mode 100755 macosx/plugins/DFSound/src/macosx.c (limited to 'macosx/plugins/DFSound') diff --git a/macosx/plugins/DFSound/Info copy.plist b/macosx/plugins/DFSound/Info copy.plist deleted file mode 100644 index eb139257..00000000 --- a/macosx/plugins/DFSound/Info copy.plist +++ /dev/null @@ -1,88 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.codeplex.pcsxr.null.SPUPlugin - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - PsxP - CFBundleSignature - PSPU - CFBundleVersion - 0.1 - - - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.codeplex.pcsxr.null.SPUPlugin - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - PsxP - CFBundleSignature - PSPU - CFBundleVersion - 0.1 - - - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.codeplex.pcsxr.null.SPUPlugin - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - PsxP - CFBundleSignature - PSPU - CFBundleVersion - 0.1 - - - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.codeplex.pcsxr.null.SPUPlugin - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - PsxP - CFBundleSignature - PSPU - CFBundleVersion - 0.1 - - diff --git a/macosx/plugins/DFSound/Null Resources/English.lproj/Credits.rtf b/macosx/plugins/DFSound/Null Resources/English.lproj/Credits.rtf deleted file mode 100644 index 25be0792..00000000 --- a/macosx/plugins/DFSound/Null Resources/English.lproj/Credits.rtf +++ /dev/null @@ -1,18 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 Null Port: -\b0 \ - C.W. "Madd the Sane" Betts\ - -\b \ -Macintosh Port: -\b0 \ - Gil Pedersen\ -\ - -\b Original coders: -\b0 \ - Pete Bernert and the P.E.Op.S. team} \ No newline at end of file diff --git a/macosx/plugins/DFSound/Null Resources/English.lproj/InfoPlist.strings b/macosx/plugins/DFSound/Null Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index 71bfd66c..00000000 --- a/macosx/plugins/DFSound/Null Resources/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,7 +0,0 @@ -ÿþ/ - - - - - - \ No newline at end of file diff --git a/macosx/plugins/DFSound/Null Resources/English.lproj/NullSpuPluginMain.xib b/macosx/plugins/DFSound/Null Resources/English.lproj/NullSpuPluginMain.xib deleted file mode 100644 index b5fb393a..00000000 --- a/macosx/plugins/DFSound/Null Resources/English.lproj/NullSpuPluginMain.xib +++ /dev/null @@ -1,632 +0,0 @@ - - - - 1050 - 10H574 - 804 - 1038.35 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 804 - - - YES - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NullSPUPluginController - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{258, 518}, {466, 107}} - 1886912512 - SPU Configuration - NSWindow - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 268 - {{17, 68}, {432, 19}} - - YES - - 68288064 - 1212154880 - Nothing to configure! - - LucidaGrande - 16 - 16 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 268 - {{185, 12}, {96, 32}} - - YES - - 67239424 - 134217728 - Okay - - LucidaGrande - 13 - 1044 - - - -2038284033 - 129 - - - 200 - 25 - - - - {466, 107} - - - {{0, 0}, {1024, 746}} - {213, 129} - {3.40282e+38, 3.40282e+38} - - - - - YES - - - window - - - - 39 - - - - delegate - - - - 43 - - - - ok: - - - - 87 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 6 - - - YES - - - - Configuration - - - 5 - - - YES - - - - - - - -3 - - - Application - - - 83 - - - YES - - - - - - 84 - - - - - 85 - - - YES - - - - - - 86 - - - - - - - YES - - YES - 5.IBPluginDependency - 5.ImportedFromIB2 - 6.IBEditorWindowLastContentRect - 6.IBPluginDependency - 6.IBWindowTemplateEditedContentRect - 6.ImportedFromIB2 - 6.windowTemplate.hasMinSize - 6.windowTemplate.minSize - 83.IBPluginDependency - 84.IBPluginDependency - 85.IBPluginDependency - 86.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - {{42, 842}, {466, 107}} - com.apple.InterfaceBuilder.CocoaPlugin - {{42, 842}, {466, 107}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 87 - - - - YES - - FirstResponder - - IBUserSource - - - - - NullSPUPluginController - NSWindowController - - ok: - id - - - ok: - - ok: - id - - - - IBUserSource - - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindowController - NSResponder - - showWindow: - id - - - showWindow: - - showWindow: - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSWindowController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - ../../PeopsSPU.xcodeproj - 3 - - diff --git a/macosx/plugins/DFSound/macsrc/PluginController-Null.h b/macosx/plugins/DFSound/macsrc/PluginController-Null.h deleted file mode 100644 index c9635e39..00000000 --- a/macosx/plugins/DFSound/macsrc/PluginController-Null.h +++ /dev/null @@ -1,16 +0,0 @@ -/* NetSfPeopsSPUPluginController */ - -#import -#import "NamedSlider.h" - -void DoAbout(); -long DoConfiguration(); -void LoadConfiguration(); - -#define PluginController NullSPUPluginController - -@interface PluginController : NSWindowController -{ -} -- (IBAction)ok:(id)sender; -@end diff --git a/macosx/plugins/DFSound/macsrc/PluginController-Null.m b/macosx/plugins/DFSound/macsrc/PluginController-Null.m deleted file mode 100644 index b4fc694d..00000000 --- a/macosx/plugins/DFSound/macsrc/PluginController-Null.m +++ /dev/null @@ -1,79 +0,0 @@ -#import "PluginController-Null.h" -#include "stdafx.h" -#include "externals.h" - -#define APP_ID @"com.codeplex.pcsxr.null.SPUPlugin" -#define PrefsKey APP_ID @" Settings" - -static PluginController *pluginController; -char * pConfigFile=NULL; - -void DoAbout() -{ - // Get parent application instance - NSApplication *app = [NSApplication sharedApplication]; - NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID]; - - // Get Credits.rtf - NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"]; - NSAttributedString *credits; - if (path) { - credits = [[[NSAttributedString alloc] initWithPath: path - documentAttributes:NULL] autorelease]; - } else { - credits = [[[NSAttributedString alloc] initWithString:@""] autorelease]; - } - - // Get Application Icon - NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]]; - NSSize size = NSMakeSize(64, 64); - [icon setSize:size]; - - [app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys: - [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName", - icon, @"ApplicationIcon", - [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion", - [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version", - [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright", - credits, @"Credits", - nil]]; -} - - -long DoConfiguration() -{ - NSWindow *window; - - if (pluginController == nil) { - pluginController = [[PluginController alloc] initWithWindowNibName:@"NullSpuPluginMain"]; - } - window = [pluginController window]; - - /* load values */ - //[pluginController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; - - return 0; -} - -void ReadConfig(void) -{ - iVolume = 1; - iUseTimer = 2; - iSPUIRQWait = 1; - iXAPitch = 0; - iUseReverb = 1; - iUseInterpolation = 0; - -} - -@implementation PluginController - -- (IBAction)ok:(id)sender -{ - [self close]; -} - -@end diff --git a/macosx/plugins/DFSound/src/macosx.c b/macosx/plugins/DFSound/src/macosx.c deleted file mode 100755 index 841627a3..00000000 --- a/macosx/plugins/DFSound/src/macosx.c +++ /dev/null @@ -1,206 +0,0 @@ -/*************************************************************************** - macosx.c - description - ------------------- - begin : Wed May 15 2002 - copyright : (C) 2002 by Pete Bernert - email : BlackDove@addcom.de - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. See also the license.txt file for * - * additional informations. * - * * - ***************************************************************************/ - -#include "stdafx.h" - -#define _IN_MACOSX - -#ifdef _MACOSX -//TODO: Move to CoreAudio; the Carbon Sound Manager isn't availabne -//TODO: in 64-bit code - -#include -#include "externals.h" - -#define kMaxSoundBuffers 20 - -//static int macBufferSize = 2, macBufferCount = 36; -//static float macSoundPitch = 1.0; -static long macSoundVolume = 100; -volatile int soundBufferAt = -1, soundPlayAt = -1, soundQueued = 0; -char *soundBuffer[kMaxSoundBuffers+1], *emptyBuffer; -SndChannelPtr sndChannel; -//ExtSoundHeader sndHeader; -CmpSoundHeader sndHeader; -SndCallBackUPP callBackUPP; -static int bufferIndex; - -//////////////////////////////////////////////////////////////////////// -// small linux time helper... only used for watchdog -//////////////////////////////////////////////////////////////////////// - -unsigned long timeGetTime() -{ - struct timeval tv; - gettimeofday(&tv, 0); // well, maybe there are better ways - return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works -} - -pascal void MacProcessSound(SndChannelPtr chan, SndCommand *cmd) -{ - #pragma unused (chan, cmd) - - if (soundQueued <= 0) - sndHeader.samplePtr = emptyBuffer; - else - { - sndHeader.samplePtr = soundBuffer[soundPlayAt]; - soundPlayAt++; - if (soundPlayAt >= kMaxSoundBuffers/*macBufferCount*/) - soundPlayAt = 0; - soundQueued--; - } - - SndCommand buffer = { bufferCmd, 0, (long) &sndHeader }; - SndDoImmediate(sndChannel, &buffer); - - SndCommand callback = { callBackCmd, 0, 0 }; - SndDoCommand(sndChannel, &callback, true); -} - -//////////////////////////////////////////////////////////////////////// -// SETUP SOUND -//////////////////////////////////////////////////////////////////////// - -static int buffer_size; -void SetupSound(void) -{ - int count; - - callBackUPP = NewSndCallBackUPP(MacProcessSound); - - if (sndChannel) - { - SndDisposeChannel(sndChannel, true); - sndChannel = nil; - } - - buffer_size = 1; - while (buffer_size < (44100 / 60)) - buffer_size <<= 1; - - memset(&sndHeader, 0, sizeof(sndHeader)); - sndHeader.numChannels = (iDisStereo ? 1 : 2); - sndHeader.sampleRate = 44100 << 16; - sndHeader.encode = cmpSH; - sndHeader.baseFrequency = kMiddleC; - sndHeader.numFrames = buffer_size; - sndHeader.sampleSize = 16; -//#ifdef __POWERPC__ -// sndHeader.format = k16BitBigEndianFormat; -//#else -// sndHeader.format = k16BitLittleEndianFormat; -//#endif - sndHeader.format = k16BitNativeEndianFormat; - sndHeader.compressionID = fixedCompression; - - if (soundBufferAt != -1) - { - free(soundBuffer[0]); - free(emptyBuffer); - } - - soundBuffer[0] = (char *) calloc(buffer_size << 2, kMaxSoundBuffers); - for (count = 1; count <= kMaxSoundBuffers; count++) - soundBuffer[count] = soundBuffer[count-1] + (buffer_size << 2); - emptyBuffer = (char *) calloc(buffer_size << 2, 1); - - soundBufferAt = soundPlayAt = soundQueued = 0; - bufferIndex = 0; - - SndNewChannel(&sndChannel, sampledSynth, initStereo, callBackUPP); - - SndCommand sndcmd; - UInt32 volume; - - volume = (UInt32) (256.0 * (float) macSoundVolume / 100.0); - - sndcmd.cmd = volumeCmd; - sndcmd.param1 = 0; - sndcmd.param2 = (volume << 16) | volume; - SndDoCommand(sndChannel, &sndcmd, true); - - sndcmd.cmd = callBackCmd; - sndcmd.param1 = 0; - sndcmd.param2 = 0; - SndDoCommand(sndChannel, &sndcmd, true); -} - -//////////////////////////////////////////////////////////////////////// -// REMOVE SOUND -//////////////////////////////////////////////////////////////////////// - -void RemoveSound(void) -{ - DisposeSndCallBackUPP(callBackUPP); -} - -//////////////////////////////////////////////////////////////////////// -// GET BYTES BUFFERED -//////////////////////////////////////////////////////////////////////// - -unsigned long SoundGetBytesBuffered(void) -{ - int bytes; - int playAt = soundPlayAt; - - if (soundBufferAt < playAt) { - bytes = (soundBuffer[kMaxSoundBuffers]-soundBuffer[playAt])+ - (soundBuffer[soundBufferAt]-soundBuffer[0]); - } else { - bytes = soundBuffer[soundBufferAt]-soundBuffer[playAt]; - } - //printf("sb=%i\n", bytes); - -// if (bytes < SOUNDSIZE/2) -// return 0; - - return bytes; -} - -//////////////////////////////////////////////////////////////////////// -// FEED SOUND DATA -//////////////////////////////////////////////////////////////////////// - -void SoundFeedStreamData(unsigned char* pSound,long lBytes) -{ - int rem; - - if (lBytes > (buffer_size<<2)*kMaxSoundBuffers) { - printf("sound feed overflow!\n"); - return; - } - - rem = soundBuffer[kMaxSoundBuffers]-(soundBuffer[soundBufferAt]+bufferIndex); - if (lBytes > rem) { - memcpy(soundBuffer[soundBufferAt]+bufferIndex, pSound, rem); - lBytes -= rem; pSound += rem; - soundQueued += kMaxSoundBuffers-soundBufferAt; - soundBufferAt = 0; bufferIndex = 0; - } - memcpy(soundBuffer[soundBufferAt]+bufferIndex, pSound, lBytes); - soundBufferAt += (lBytes+bufferIndex)/(buffer_size<<2); - soundQueued += (lBytes+bufferIndex)/(buffer_size<<2); - bufferIndex = (lBytes+bufferIndex)%(buffer_size<<2); - - if (soundQueued >= kMaxSoundBuffers) { - printf("sound buffer overflow!\n"); - } -} - -#endif -- cgit v1.2.3