From 887a72f1270ac12e39b08391c280f076b687d95f Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Thu, 4 Jul 2013 21:52:43 +0000 Subject: SVN is being stupid git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85823 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/Bladesio1/ARCBridge.h | 36 - macosx/plugins/Bladesio1/English.lproj/Credits.rtf | 13 - .../English.lproj/DFCdromPluginConfig.xib | 785 --------------------- .../Bladesio1/English.lproj/InfoPlist.strings | Bin 486 -> 0 bytes .../Bladesio1/English.lproj/Localizable.strings | 9 - macosx/plugins/Bladesio1/Info.plist | 24 - .../Bladesio1/macsrc/PluginConfigController.h | 18 - .../Bladesio1/macsrc/PluginConfigController.m | 171 ----- macosx/plugins/Bladesio1/macsrc/cfg.c | 53 -- macosx/plugins/Bladesio1/version.plist | 16 - 10 files changed, 1125 deletions(-) delete mode 100644 macosx/plugins/Bladesio1/ARCBridge.h delete mode 100644 macosx/plugins/Bladesio1/English.lproj/Credits.rtf delete mode 100644 macosx/plugins/Bladesio1/English.lproj/DFCdromPluginConfig.xib delete mode 100755 macosx/plugins/Bladesio1/English.lproj/InfoPlist.strings delete mode 100644 macosx/plugins/Bladesio1/English.lproj/Localizable.strings delete mode 100644 macosx/plugins/Bladesio1/Info.plist delete mode 100755 macosx/plugins/Bladesio1/macsrc/PluginConfigController.h delete mode 100755 macosx/plugins/Bladesio1/macsrc/PluginConfigController.m delete mode 100755 macosx/plugins/Bladesio1/macsrc/cfg.c delete mode 100644 macosx/plugins/Bladesio1/version.plist diff --git a/macosx/plugins/Bladesio1/ARCBridge.h b/macosx/plugins/Bladesio1/ARCBridge.h deleted file mode 100644 index ea274b84..00000000 --- a/macosx/plugins/Bladesio1/ARCBridge.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// ARCBridge.h -// PPMacho -// -// Created by C.W. Betts on 12/23/12. -// -// - -#ifndef PPMacho_ARCBridge_h -#define PPMacho_ARCBridge_h - -#if __has_feature(objc_arc) - -#define SUPERDEALLOC -#define RELEASEOBJ(obj) -#define RETAINOBJ(obj) obj -#define RETAINOBJNORETURN(obj) -#define AUTORELEASEOBJ(obj) obj -#define AUTORELEASEOBJNORETURN(obj) -#define BRIDGE(toType, obj) (__bridge toType)(obj) -#define __arcweak __weak - -#else - -#define SUPERDEALLOC [super dealloc] -#define RELEASEOBJ(obj) [obj release] -#define RETAINOBJ(obj) [obj retain] -#define RETAINOBJNORETURN(obj) [obj retain] -#define AUTORELEASEOBJ(obj) [obj autorelease] -#define AUTORELEASEOBJNORETURN(obj) [obj autorelease] -#define BRIDGE(toType, obj) (toType)obj -#define __arcweak - -#endif - -#endif diff --git a/macosx/plugins/Bladesio1/English.lproj/Credits.rtf b/macosx/plugins/Bladesio1/English.lproj/Credits.rtf deleted file mode 100644 index 76fa6442..00000000 --- a/macosx/plugins/Bladesio1/English.lproj/Credits.rtf +++ /dev/null @@ -1,13 +0,0 @@ -{\rtf1\mac\ansicpg10025\cocoartf824\cocoasubrtf420 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 Original coder: -\f1\b0 \ - linuzappz\ -\ - -\f0\b Macintosh Port: -\f1\b0 \ - Wei Mingzhi} \ No newline at end of file diff --git a/macosx/plugins/Bladesio1/English.lproj/DFCdromPluginConfig.xib b/macosx/plugins/Bladesio1/English.lproj/DFCdromPluginConfig.xib deleted file mode 100644 index 43710512..00000000 --- a/macosx/plugins/Bladesio1/English.lproj/DFCdromPluginConfig.xib +++ /dev/null @@ -1,785 +0,0 @@ - - - - 1060 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - NSPopUpButton - NSButton - NSMenu - NSTextFieldCell - NSButtonCell - NSMenuItem - NSBox - NSSlider - NSSliderCell - NSCustomObject - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - DFCdromPluginConfigController - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{131, 362}, {377, 238}} - 1886912512 - CDR Configuration - NSWindow - - View - - - {283.34100000000001, 107} - - - 256 - - - - 256 - {{119, 9}, {122, 32}} - - - YES - - 67239424 - 134217728 - Cancel - - LucidaGrande - 13 - 1044 - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - - 256 - {{241, 9}, {122, 32}} - - - YES - - 67239424 - 134217728 - OK - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - - - - 274 - - - - 256 - {{13, 43}, {114, 17}} - - - YES - - 67239424 - 272629760 - Q0QtUk9NIFNwZWVkOgo - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{26, 13}, {151, 18}} - - - YES - - 67239424 - 0 - Use Cached Reading - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{129, 38}, {197, 26}} - - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Default - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - - OtherViews - - - - - - 1 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - - - - - 2 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - - - - - 4 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 4 - - - - - 8 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 16 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 16 - - - - - 32 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 32 - - - - - -1 - 3 - YES - YES - 1 - - - - {{2, 2}, {339, 73}} - - - - - {{17, 128}, {343, 90}} - - - {0, 0} - - 67239424 - 0 - General Settings - - LucidaGrande - 11 - 3100 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - - - - 274 - - - - 256 - {{13, 19}, {114, 17}} - - - YES - - 67239424 - 272629760 - Q2FjaGUgU2l6ZToKA - - - - - - - - - 256 - {{130, 15}, {195, 25}} - - - YES - - 67239424 - 0 - - - - - Helvetica - 12 - 16 - - - 512 - 32 - 64 - 0.0 - 16 - 0 - YES - NO - - - - {{2, 2}, {339, 51}} - - - - - {{17, 49}, {343, 68}} - - - {0, 0} - - 67239424 - 0 - Misc - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - {377, 238} - - - - {{0, 0}, {1024, 746}} - {283.34100000000001, 129} - {10000000000000, 10000000000000} - YES - - - - - - - ok: - - - - 133 - - - - cancel: - - - - 134 - - - - window - - - - 141 - - - - Cached - - - - 183 - - - - CdSpeed - - - - 182 - - - - CacheSize - - - - 184 - - - - delegate - - - - 158 - - - - nextKeyView - - - - 9 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 5 - - - - - - Window - - - 6 - - - - - - - - - - - 7 - - - - - - - - 8 - - - - - - - - 162 - - - - - - - - - - 164 - - - - - - - - - 186 - - - - - 187 - - - - - -3 - - - Application - - - 168 - - - - - - - - 188 - - - - - 169 - - - - - - - - 189 - - - - - 173 - - - - - - - - 190 - - - - - - - - 174 - - - - - - - - - - - - - - 175 - - - - - 176 - - - - - 177 - - - - - 178 - - - - - 179 - - - - - 180 - - - - - 181 - - - - - 171 - - - - - - - - 191 - - - - - 172 - - - - - - - - 192 - - - - - - - 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 - 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 - 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 - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 192 - - - - - DFCdromPluginConfigController - NSWindowController - - IBProjectSource - ./Classes/DFCdromPluginConfigController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - diff --git a/macosx/plugins/Bladesio1/English.lproj/InfoPlist.strings b/macosx/plugins/Bladesio1/English.lproj/InfoPlist.strings deleted file mode 100755 index ea885a5d..00000000 Binary files a/macosx/plugins/Bladesio1/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/macosx/plugins/Bladesio1/English.lproj/Localizable.strings b/macosx/plugins/Bladesio1/English.lproj/Localizable.strings deleted file mode 100644 index 2faf6e07..00000000 --- a/macosx/plugins/Bladesio1/English.lproj/Localizable.strings +++ /dev/null @@ -1,9 +0,0 @@ -/* - Localizable.strings - DFCdrom - - Created by C.W. Betts on 11/16/11. - Copyright 2011 __MyCompanyName__. All rights reserved. - */ - -"CD-ROM Drive Reader" = "CD-ROM Drive Reader"; diff --git a/macosx/plugins/Bladesio1/Info.plist b/macosx/plugins/Bladesio1/Info.plist deleted file mode 100644 index 34e2144e..00000000 --- a/macosx/plugins/Bladesio1/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - net.pcsxr.DFCdrom - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - PsxP - CFBundleSignature - CdDI - CFBundleVersion - 1.0 - NSPrincipalClass - DFCdromPluginConfigController - - diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.h b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.h deleted file mode 100755 index b7f6fafb..00000000 --- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.h +++ /dev/null @@ -1,18 +0,0 @@ -#define PluginConfigController DFCdromPluginConfigController - -#import - -@interface PluginConfigController : NSWindowController -{ - IBOutlet NSControl *Cached; - IBOutlet NSSlider *CacheSize; - IBOutlet NSPopUpButton *CdSpeed; - - NSMutableDictionary *keyValues; -} -- (IBAction)cancel:(id)sender; -- (IBAction)ok:(id)sender; - -- (void)loadValues; - -@end diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m deleted file mode 100755 index 801a47f2..00000000 --- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (c) 2010, Wei Mingzhi . - * All Rights Reserved. - * - * Based on: Cdrom for Psemu Pro like Emulators - * By: linuzappz - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#import "PluginConfigController.h" -#include "cdr.h" -#import "ARCBridge.h" - -#define APP_ID @"net.pcsxr.DFCdrom" -#define PrefsKey APP_ID @" Settings" - -static PluginConfigController *windowController = nil; - -void AboutDlgProc() -{ - // 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]; - AUTORELEASEOBJNORETURN(credits); - - } else { - credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]); - } - - // 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]]; -} - -void ConfDlgProc() -{ - NSWindow *window; - - if (windowController == nil) { - windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"]; - } - window = [windowController window]; - - [windowController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; -} - -void ReadConfig() -{ - NSDictionary *keyValues; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys: - [NSDictionary dictionaryWithObjectsAndKeys: - @YES, @"Threaded", - @64, @"Cache Size", - @0, @"Speed", - nil], PrefsKey, nil]]; - - keyValues = [defaults dictionaryForKey:PrefsKey]; - - ReadMode = ([[keyValues objectForKey:@"Threaded"] boolValue] ? THREADED : NORMAL); - CacheSize = [[keyValues objectForKey:@"Cache Size"] intValue]; - CdrSpeed = [[keyValues objectForKey:@"Speed"] intValue]; -} - -@implementation PluginConfigController - -- (IBAction)cancel:(id)sender -{ - [self close]; -} - -- (IBAction)ok:(id)sender -{ - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues]; - - [writeDic setObject:@((BOOL)[Cached intValue]) forKey:@"Threaded"]; - [writeDic setObject:@([CacheSize intValue]) forKey:@"Cache Size"]; - - switch ([CdSpeed indexOfSelectedItem]) { - case 1: [writeDic setObject:@1 forKey:@"Speed"]; break; - case 2: [writeDic setObject:@2 forKey:@"Speed"]; break; - case 3: [writeDic setObject:@4 forKey:@"Speed"]; break; - case 4: [writeDic setObject:@8 forKey:@"Speed"]; break; - case 5: [writeDic setObject:@16 forKey:@"Speed"]; break; - case 6: [writeDic setObject:@32 forKey:@"Speed"]; break; - default: [writeDic setObject:@0 forKey:@"Speed"]; break; - } - - // write to defaults - [defaults setObject:writeDic forKey:PrefsKey]; - [defaults synchronize]; - - // and set global values accordingly - ReadConfig(); - - [self close]; -} - -- (void)loadValues -{ - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - ReadConfig(); - - // load from preferences - RELEASEOBJ(keyValues); - keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; - - [Cached setIntValue:[[keyValues objectForKey:@"Threaded"] intValue]]; - [CacheSize setIntValue:[[keyValues objectForKey:@"Cache Size"] intValue]]; - - switch ([[keyValues objectForKey:@"Speed"] intValue]) { - case 1: [CdSpeed selectItemAtIndex:1]; break; - case 2: [CdSpeed selectItemAtIndex:2]; break; - case 4: [CdSpeed selectItemAtIndex:3]; break; - case 8: [CdSpeed selectItemAtIndex:4]; break; - case 16: [CdSpeed selectItemAtIndex:5]; break; - case 32: [CdSpeed selectItemAtIndex:6]; break; - default: [CdSpeed selectItemAtIndex:0]; break; - } -} - -- (void)awakeFromNib -{ -} - -@end - -char* PLUGLOC(char *toloc) -{ - NSBundle *mainBundle = [NSBundle bundleForClass:[PluginConfigController class]]; - NSString *origString = nil, *transString = nil; - origString = [NSString stringWithCString:toloc encoding:NSUTF8StringEncoding]; - transString = [mainBundle localizedStringForKey:origString value:nil table:nil]; - return (char*)[transString cStringUsingEncoding:NSUTF8StringEncoding]; -} - diff --git a/macosx/plugins/Bladesio1/macsrc/cfg.c b/macosx/plugins/Bladesio1/macsrc/cfg.c deleted file mode 100755 index 6b5c1513..00000000 --- a/macosx/plugins/Bladesio1/macsrc/cfg.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2010, Wei Mingzhi . - * All Rights Reserved. - * - * Based on: Cdrom for Psemu Pro like Emulators - * By: linuzappz - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "cdr.h" - -void AboutDlgProc(); -void ConfDlgProc(); -void ReadConfig(); - -char CdromDev[256]; -long ReadMode; -long UseSubQ; -long CacheSize; -long CdrSpeed; -long SpinDown; - -void LoadConf() { - strcpy(CdromDev, ""); - ReadMode = THREADED; - UseSubQ = 0; - CacheSize = 64; - CdrSpeed = 0; - SpinDown = SPINDOWN_VENDOR_SPECIFIC; - - ReadConfig(); -} - -long CDRconfigure() { - ConfDlgProc(); - return 0; -} - -void CDRabout() { - AboutDlgProc(); -} \ No newline at end of file diff --git a/macosx/plugins/Bladesio1/version.plist b/macosx/plugins/Bladesio1/version.plist deleted file mode 100644 index a9c51a62..00000000 --- a/macosx/plugins/Bladesio1/version.plist +++ /dev/null @@ -1,16 +0,0 @@ - - - - - BuildVersion - 38 - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - ProjectName - DFCdrom - SourceVersion - 2350000 - - -- cgit v1.2.3