diff --git a/NESAdvancedPreference.h b/NESAdvancedPreference.h deleted file mode 100644 index 0b44b4d..0000000 --- a/NESAdvancedPreference.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Copyright (c) 2009, OpenEmu Team - - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the OpenEmu Team nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY OpenEmu Team ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL OpenEmu Team BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import -#import -//#import - -OE_EXPORTED_CLASS -@interface NESAdvancedPreference -//@interface NESAdvancedPreference : OEPreferenceViewController -@end diff --git a/NESAdvancedPreference.m b/NESAdvancedPreference.m deleted file mode 100644 index 4fd2630..0000000 --- a/NESAdvancedPreference.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (c) 2009, OpenEmu Team - - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the OpenEmu Team nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY OpenEmu Team ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL OpenEmu Team BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "NESAdvancedPreference.h" - - -@implementation NESAdvancedPreference - -@end diff --git a/NESGameController.h b/NESGameController.h index 7f26ad0..45d82f2 100644 --- a/NESGameController.h +++ b/NESGameController.h @@ -1,7 +1,6 @@ /* Copyright (c) 2009, OpenEmu Team - - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright @@ -12,7 +11,7 @@ * Neither the name of the OpenEmu Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY OpenEmu Team ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -29,9 +28,6 @@ #import #import -extern NSArray *NESRawControlNames; -extern NSArray *NESUsedControlNames; - OE_EXPORTED_CLASS @interface NESGameController : OEGameCoreController @end diff --git a/NESGameController.m b/NESGameController.m index fc55d47..83f9207 100644 --- a/NESGameController.m +++ b/NESGameController.m @@ -1,7 +1,6 @@ /* Copyright (c) 2009, OpenEmu Team - - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright @@ -12,7 +11,7 @@ * Neither the name of the OpenEmu Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY OpenEmu Team ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -26,36 +25,6 @@ */ #import "NESGameController.h" -#import "NESAdvancedPreference.h" -#import "NESGameCore.h" - -NSArray *NESRawControlNames = nil; -NSArray *NESUsedControlNames = nil; -NSArray *NESUsedSettingNames = nil; @implementation NESGameController - -+ (void)initialize -{ - if(self == [NESGameController class]) - { - [self registerPreferenceViewControllerClasses: - [NSDictionary dictionaryWithObjectsAndKeys: - //[NESAdvancedPreference class], OEAdvancedPreferenceKey, - nil]]; - - NESUsedSettingNames = [[NSArray alloc] initWithObjects:NESNTSC, NESBrightness, NESSaturation, NESContrast, NESSharpness, NESColorRes, NESColorBleed, NESColorArtifacts, NESColorFringing, NESHue, NESUnlimitedSprites, nil]; - } -} - -- (NSArray *)genericControlNames -{ - return NESRawControlNames; -} - -- (NSArray *)usedSettingNames -{ - return NESUsedSettingNames; -} - @end diff --git a/Nestopia.xcodeproj/project.pbxproj b/Nestopia.xcodeproj/project.pbxproj index 12dc05e..c5333ff 100644 --- a/Nestopia.xcodeproj/project.pbxproj +++ b/Nestopia.xcodeproj/project.pbxproj @@ -331,7 +331,6 @@ 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; 942597D3151470A40074E3A3 /* OpenEmuBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 942597D2151470A40074E3A3 /* OpenEmuBase.framework */; }; C6296AA20FCECA2C004F84C4 /* NESGameController.m in Sources */ = {isa = PBXBuildFile; fileRef = C6296AA10FCECA2C004F84C4 /* NESGameController.m */; }; - C6296C600FCEEDF8004F84C4 /* NESAdvancedPreference.m in Sources */ = {isa = PBXBuildFile; fileRef = C6296C5F0FCEEDF8004F84C4 /* NESAdvancedPreference.m */; }; C6296C620FCEEE45004F84C4 /* AdvancedPreference.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6296C610FCEEE45004F84C4 /* AdvancedPreference.xib */; }; /* End PBXBuildFile section */ @@ -995,8 +994,6 @@ 942597D2151470A40074E3A3 /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenEmuBase.framework; path = ../OpenEmu/build/Release/OpenEmuBase.framework; sourceTree = ""; }; C6296AA00FCECA2C004F84C4 /* NESGameController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NESGameController.h; sourceTree = ""; }; C6296AA10FCECA2C004F84C4 /* NESGameController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NESGameController.m; sourceTree = ""; }; - C6296C5E0FCEEDF8004F84C4 /* NESAdvancedPreference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NESAdvancedPreference.h; sourceTree = ""; }; - C6296C5F0FCEEDF8004F84C4 /* NESAdvancedPreference.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NESAdvancedPreference.m; sourceTree = ""; }; C6296C610FCEEE45004F84C4 /* AdvancedPreference.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AdvancedPreference.xib; sourceTree = ""; }; C6B3E692136525EB00D34947 /* OENESSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OENESSystemResponderClient.h; path = ../OpenEmu/NES/OENESSystemResponderClient.h; sourceTree = ""; }; D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; @@ -1061,8 +1058,6 @@ 82F3642E0F51FB4A001495F6 /* NESGameCore+NESFeatures.mm */, C6296AA00FCECA2C004F84C4 /* NESGameController.h */, C6296AA10FCECA2C004F84C4 /* NESGameController.m */, - C6296C5E0FCEEDF8004F84C4 /* NESAdvancedPreference.h */, - C6296C5F0FCEEDF8004F84C4 /* NESAdvancedPreference.m */, C6B3E692136525EB00D34947 /* OENESSystemResponderClient.h */, ); name = Classes; @@ -2162,7 +2157,6 @@ 82C5EDE70F0C4CE70019E2DC /* NstApiRam.cpp in Sources */, 82F3642F0F51FB4A001495F6 /* NESGameCore+NESFeatures.mm in Sources */, C6296AA20FCECA2C004F84C4 /* NESGameController.m in Sources */, - C6296C600FCEEDF8004F84C4 /* NESAdvancedPreference.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };