macosx - dfsound - plugincontroller-null

- (MaddTheSane) Redo files from last bad shalma diff


git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61373 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 0 insertions, 190 deletions

diff --git a/macosx/plugins/DFSound/macsrc/PluginController-Null.h b/macosx/plugins/DFSound/macsrc/PluginController-Null.h
index 3ba22731..c9635e39 100644
--- a/macosx/plugins/DFSound/macsrc/PluginController-Null.h
+++ b/macosx/plugins/DFSound/macsrc/PluginController-Null.h
@@ -14,35 +14,3 @@ void LoadConfiguration();
 }

 - (IBAction)ok:(id)sender;

 @end

-/* NetSfPeopsSPUPluginController */

-

-#import <Cocoa/Cocoa.h>

-#import "NamedSlider.h"

-

-void DoAbout();

-long DoConfiguration();

-void LoadConfiguration();

-

-#define PluginController NullSPUPluginController

-

-@interface PluginController : NSWindowController

-{

-}

-- (IBAction)ok:(id)sender;

-@end

-/* NetSfPeopsSPUPluginController */

-

-#import <Cocoa/Cocoa.h>

-#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
index 844d0736..b4fc694d 100644
--- a/macosx/plugins/DFSound/macsrc/PluginController-Null.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController-Null.m
@@ -77,161 +77,3 @@ void ReadConfig(void)
 }

 

 @end

-#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

-#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