diff --git a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj index 5289bc187..29c48b488 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj @@ -1108,6 +1108,41 @@ ABC3AFCF14B8D16700D5B13D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1914AACA9600E83E91 /* libz.dylib */; }; ABD0A53A1501AA5A0074A094 /* coreaudiosound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD0A5341501AA5A0074A094 /* coreaudiosound.cpp */; }; ABD0A53B1501AA5A0074A094 /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD0A5351501AA5A0074A094 /* ringbuffer.cpp */; }; + ABD597BC187CD95A00069403 /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */; }; + ABD597BD187CD95A00069403 /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */; }; + ABD597BE187CD95A00069403 /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */; }; + ABD597BF187CD95A00069403 /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */; }; + ABD597C0187CD95A00069403 /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */; }; + ABD59817187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABD59818187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABD59819187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABD5981A187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABD5981B187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABD5981C187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABD5981D187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABD5981E187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABD5981F187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABD59820187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABD59821187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABD59822187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABD59823187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABD59824187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABD59825187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABD59826187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABD59827187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABD59828187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABD59829187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABD5982A187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABD59837187D466700069403 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59836187D466700069403 /* Icon_Piano_256x256.png */; }; + ABD59838187D466700069403 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59836187D466700069403 /* Icon_Piano_256x256.png */; }; + ABD59839187D466700069403 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59836187D466700069403 /* Icon_Piano_256x256.png */; }; + ABD5983A187D466700069403 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59836187D466700069403 /* Icon_Piano_256x256.png */; }; + ABD5983B187D466700069403 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59836187D466700069403 /* Icon_Piano_256x256.png */; }; + ABD59847187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */; }; + ABD59848187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */; }; + ABD59849187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */; }; + ABD5984A187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */; }; + ABD5984B187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */; }; ABEF84721873576300E99ADC /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB8C6E56186CD07E00E3EC64 /* ForceFeedback.framework */; }; ABEF84831873578F00E99ADC /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB8C6E56186CD07E00E3EC64 /* ForceFeedback.framework */; }; ABEF84841873579400E99ADC /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB8C6E56186CD07E00E3EC64 /* ForceFeedback.framework */; }; @@ -1540,6 +1575,13 @@ ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SndOut.cpp; sourceTree = ""; }; ABD1FF7B1345ACFA00AF11D1 /* SndOut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SndOut.h; sourceTree = ""; }; ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timestretcher.cpp; sourceTree = ""; }; + ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Image_GuitarGrip.png; path = images/Image_GuitarGrip.png; sourceTree = ""; }; + ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Blue_512x512.png; path = images/Icon_GuitarGrip_Button_Blue_512x512.png; sourceTree = ""; }; + ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Green_512x512.png; path = images/Icon_GuitarGrip_Button_Green_512x512.png; sourceTree = ""; }; + ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Red_512x512.png; path = images/Icon_GuitarGrip_Button_Red_512x512.png; sourceTree = ""; }; + ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Yellow_512x512.png; path = images/Icon_GuitarGrip_Button_Yellow_512x512.png; sourceTree = ""; }; + ABD59836187D466700069403 /* Icon_Piano_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Piano_256x256.png; path = images/Icon_Piano_256x256.png; sourceTree = ""; }; + ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_PaddleKnob_256x256.png; path = images/Icon_PaddleKnob_256x256.png; sourceTree = ""; }; ABD9A46313DB99B300777194 /* mic_ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mic_ext.h; sourceTree = ""; }; ABD9A46413DB99B300777194 /* mic_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mic_ext.cpp; sourceTree = ""; }; ABE5DFE3143FB1DA00835AD8 /* cocoa_videofilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_videofilter.h; sourceTree = ""; }; @@ -1962,10 +2004,16 @@ AB0F299C14BE7213009ABC6F /* Icon_DSButtonY_420x420.png */, AB0F299D14BE7213009ABC6F /* Icon_Emulation_420x420.png */, AB0F28FE14BE6E68009ABC6F /* Icon_Execute_420x420.png */, + ABD59813187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png */, + ABD59814187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png */, + ABD59815187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png */, + ABD59816187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png */, AB0F299E14BE7213009ABC6F /* Icon_Input_420x420.png */, AB0F299F14BE7213009ABC6F /* Icon_Microphone_420x420.png */, AB0F29A014BE7213009ABC6F /* Icon_OpenROM_420x420.png */, + ABD59846187D4A6C00069403 /* Icon_PaddleKnob_256x256.png */, AB0F28FF14BE6E68009ABC6F /* Icon_Pause_420x420.png */, + ABD59836187D466700069403 /* Icon_Piano_256x256.png */, AB0F29A114BE7213009ABC6F /* Icon_Reset_420x420.png */, AB0F29A214BE7213009ABC6F /* Icon_RotateCCW_420x420.png */, AB0F29A314BE7213009ABC6F /* Icon_RotateCW_420x420.png */, @@ -1977,6 +2025,7 @@ ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */, ABC3AF2D14B7F06900D5B13D /* Icon_VolumeOneThird_16x16.png */, ABC3AF2E14B7F06900D5B13D /* Icon_VolumeTwoThird_16x16.png */, + ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */, AB142025186E2CD80015D52F /* Image_MemoryExpansionPak.png */, AB8FFE491872032B00C10085 /* Image_PaddleController.png */, AB8C6CBE186A950C00E3EC64 /* Image_PassME.png */, @@ -2597,6 +2646,13 @@ AB8C6CC3186A950C00E3EC64 /* Image_PassME.png in Resources */, AB14202A186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */, AB8FFE4E1872032B00C10085 /* Image_PaddleController.png in Resources */, + ABD597C0187CD95A00069403 /* Image_GuitarGrip.png in Resources */, + ABD59827187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABD59828187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABD59829187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABD5982A187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABD5983B187D466700069403 /* Icon_Piano_256x256.png in Resources */, + ABD5984B187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2680,6 +2736,13 @@ AB8C6CBF186A950C00E3EC64 /* Image_PassME.png in Resources */, AB142026186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */, AB8FFE4A1872032B00C10085 /* Image_PaddleController.png in Resources */, + ABD597BC187CD95A00069403 /* Image_GuitarGrip.png in Resources */, + ABD59817187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABD59818187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABD59819187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABD5981A187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABD59837187D466700069403 /* Icon_Piano_256x256.png in Resources */, + ABD59847187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2763,6 +2826,13 @@ AB8C6CC0186A950C00E3EC64 /* Image_PassME.png in Resources */, AB142027186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */, AB8FFE4B1872032B00C10085 /* Image_PaddleController.png in Resources */, + ABD597BD187CD95A00069403 /* Image_GuitarGrip.png in Resources */, + ABD5981B187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABD5981C187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABD5981D187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABD5981E187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABD59838187D466700069403 /* Icon_Piano_256x256.png in Resources */, + ABD59848187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2846,6 +2916,13 @@ AB8C6CC2186A950C00E3EC64 /* Image_PassME.png in Resources */, AB142029186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */, AB8FFE4D1872032B00C10085 /* Image_PaddleController.png in Resources */, + ABD597BF187CD95A00069403 /* Image_GuitarGrip.png in Resources */, + ABD59823187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABD59824187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABD59825187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABD59826187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABD5983A187D466700069403 /* Icon_Piano_256x256.png in Resources */, + ABD5984A187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2929,6 +3006,13 @@ AB8C6CC1186A950C00E3EC64 /* Image_PassME.png in Resources */, AB142028186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */, AB8FFE4C1872032B00C10085 /* Image_PaddleController.png in Resources */, + ABD597BE187CD95A00069403 /* Image_GuitarGrip.png in Resources */, + ABD5981F187D417900069403 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABD59820187D417900069403 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABD59821187D417900069403 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABD59822187D417900069403 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABD59839187D466700069403 /* Icon_Piano_256x256.png in Resources */, + ABD59849187D4A6C00069403 /* Icon_PaddleKnob_256x256.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj index 7fc1402f2..096731268 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj @@ -531,6 +531,20 @@ ABB97877144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png in Resources */ = {isa = PBXBuildFile; fileRef = ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */; }; ABB97878144E89CC00793FA3 /* Icon_DeSmuME_32x32.png in Resources */ = {isa = PBXBuildFile; fileRef = ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */; }; ABBC0F8D1394B1AA0028B6BD /* DefaultUserPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */; }; + ABBCA214187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA20D187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABBCA215187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA20D187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + ABBCA216187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA20E187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABBCA217187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA20E187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + ABBCA218187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA20F187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABBCA219187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA20F187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + ABBCA21A187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA210187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABBCA21B187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA210187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + ABBCA21C187D4BED00383DBE /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA211187D4BED00383DBE /* Icon_PaddleKnob_256x256.png */; }; + ABBCA21D187D4BED00383DBE /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA211187D4BED00383DBE /* Icon_PaddleKnob_256x256.png */; }; + ABBCA21E187D4BED00383DBE /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA212187D4BED00383DBE /* Icon_Piano_256x256.png */; }; + ABBCA21F187D4BED00383DBE /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA212187D4BED00383DBE /* Icon_Piano_256x256.png */; }; + ABBCA220187D4BED00383DBE /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA213187D4BED00383DBE /* Image_GuitarGrip.png */; }; + ABBCA221187D4BED00383DBE /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABBCA213187D4BED00383DBE /* Image_GuitarGrip.png */; }; ABBF04A514B515F300E505A0 /* AppIcon_ROMCheats.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABBF04A414B515F300E505A0 /* AppIcon_ROMCheats.icns */; }; ABC3AF2F14B7F06900D5B13D /* Icon_VolumeFull_16x16.png in Resources */ = {isa = PBXBuildFile; fileRef = ABC3AF2B14B7F06900D5B13D /* Icon_VolumeFull_16x16.png */; }; ABC3AF3014B7F06900D5B13D /* Icon_VolumeMute_16x16.png in Resources */ = {isa = PBXBuildFile; fileRef = ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */; }; @@ -911,6 +925,13 @@ ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_DeSmuME_32x32.png; path = Images/Icon_DeSmuME_32x32.png; sourceTree = ""; }; ABBB421516B4A5F30012E5AB /* OGLRender_3_2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OGLRender_3_2.h; path = ../OGLRender_3_2.h; sourceTree = ""; }; ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = DefaultUserPrefs.plist; sourceTree = ""; }; + ABBCA20D187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Blue_512x512.png; path = images/Icon_GuitarGrip_Button_Blue_512x512.png; sourceTree = ""; }; + ABBCA20E187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Green_512x512.png; path = images/Icon_GuitarGrip_Button_Green_512x512.png; sourceTree = ""; }; + ABBCA20F187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Red_512x512.png; path = images/Icon_GuitarGrip_Button_Red_512x512.png; sourceTree = ""; }; + ABBCA210187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Yellow_512x512.png; path = images/Icon_GuitarGrip_Button_Yellow_512x512.png; sourceTree = ""; }; + ABBCA211187D4BED00383DBE /* Icon_PaddleKnob_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_PaddleKnob_256x256.png; path = images/Icon_PaddleKnob_256x256.png; sourceTree = ""; }; + ABBCA212187D4BED00383DBE /* Icon_Piano_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Piano_256x256.png; path = images/Icon_Piano_256x256.png; sourceTree = ""; }; + ABBCA213187D4BED00383DBE /* Image_GuitarGrip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Image_GuitarGrip.png; path = images/Image_GuitarGrip.png; sourceTree = ""; }; ABBF04A414B515F300E505A0 /* AppIcon_ROMCheats.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_ROMCheats.icns; sourceTree = ""; }; ABC3AF2B14B7F06900D5B13D /* Icon_VolumeFull_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_VolumeFull_16x16.png; path = images/Icon_VolumeFull_16x16.png; sourceTree = ""; }; ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_VolumeMute_16x16.png; path = images/Icon_VolumeMute_16x16.png; sourceTree = ""; }; @@ -1529,10 +1550,16 @@ AB0F299C14BE7213009ABC6F /* Icon_DSButtonY_420x420.png */, AB0F299D14BE7213009ABC6F /* Icon_Emulation_420x420.png */, AB0F28FE14BE6E68009ABC6F /* Icon_Execute_420x420.png */, + ABBCA20D187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png */, + ABBCA20E187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png */, + ABBCA20F187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png */, + ABBCA210187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png */, AB0F299E14BE7213009ABC6F /* Icon_Input_420x420.png */, AB0F299F14BE7213009ABC6F /* Icon_Microphone_420x420.png */, AB0F29A014BE7213009ABC6F /* Icon_OpenROM_420x420.png */, + ABBCA211187D4BED00383DBE /* Icon_PaddleKnob_256x256.png */, AB0F28FF14BE6E68009ABC6F /* Icon_Pause_420x420.png */, + ABBCA212187D4BED00383DBE /* Icon_Piano_256x256.png */, AB0F29A114BE7213009ABC6F /* Icon_Reset_420x420.png */, AB0F29A214BE7213009ABC6F /* Icon_RotateCCW_420x420.png */, AB0F29A314BE7213009ABC6F /* Icon_RotateCW_420x420.png */, @@ -1544,6 +1571,7 @@ ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */, ABC3AF2D14B7F06900D5B13D /* Icon_VolumeOneThird_16x16.png */, ABC3AF2E14B7F06900D5B13D /* Icon_VolumeTwoThird_16x16.png */, + ABBCA213187D4BED00383DBE /* Image_GuitarGrip.png */, ABC9ED1818750221001A7D02 /* Image_MemoryExpansionPak.png */, ABC9ED1918750221001A7D02 /* Image_PaddleController.png */, ABC9ED1A18750221001A7D02 /* Image_PassME.png */, @@ -2047,6 +2075,13 @@ ABC9ED1F18750221001A7D02 /* Image_PaddleController.png in Resources */, ABC9ED2118750221001A7D02 /* Image_PassME.png in Resources */, ABC9ED2318750221001A7D02 /* Image_Piano.png in Resources */, + ABBCA215187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABBCA217187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABBCA219187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABBCA21B187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABBCA21D187D4BED00383DBE /* Icon_PaddleKnob_256x256.png in Resources */, + ABBCA21F187D4BED00383DBE /* Icon_Piano_256x256.png in Resources */, + ABBCA221187D4BED00383DBE /* Image_GuitarGrip.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2130,6 +2165,13 @@ ABC9ED1E18750221001A7D02 /* Image_PaddleController.png in Resources */, ABC9ED2018750221001A7D02 /* Image_PassME.png in Resources */, ABC9ED2218750221001A7D02 /* Image_Piano.png in Resources */, + ABBCA214187D4BED00383DBE /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, + ABBCA216187D4BED00383DBE /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, + ABBCA218187D4BED00383DBE /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABBCA21A187D4BED00383DBE /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, + ABBCA21C187D4BED00383DBE /* Icon_PaddleKnob_256x256.png in Resources */, + ABBCA21E187D4BED00383DBE /* Icon_Piano_256x256.png in Resources */, + ABBCA220187D4BED00383DBE /* Image_GuitarGrip.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj index a40fb8db8..2d4b66c80 100644 --- a/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj @@ -217,6 +217,18 @@ AB5785FD17176AFC002C5FC7 /* OpenEmuBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB5785FC17176AFC002C5FC7 /* OpenEmuBase.framework */; }; AB58F32D1364F44B0074C376 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB58F32C1364F44B0074C376 /* cocoa_file.mm */; }; AB64987C13ECC73800EE7DD2 /* FileTypeInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB64987B13ECC73800EE7DD2 /* FileTypeInfo.plist */; }; + AB68101B187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681013187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + AB68101C187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681013187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png */; }; + AB68101D187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681014187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + AB68101E187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681014187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png */; }; + AB68101F187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681015187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + AB681020187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681015187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png */; }; + AB681021187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681016187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + AB681022187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681016187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png */; }; + AB681025187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681018187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png */; }; + AB681026187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681018187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png */; }; + AB681027187D4AEF0049F2C2 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681019187D4AEF0049F2C2 /* Icon_Piano_256x256.png */; }; + AB681028187D4AEF0049F2C2 /* Icon_Piano_256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = AB681019187D4AEF0049F2C2 /* Icon_Piano_256x256.png */; }; AB68A0DD16B139BC00DE0546 /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; }; AB6FBEF6139B6258007BB045 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; }; AB74EC8A1738499C0026C41E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB74EC891738499C0026C41E /* Carbon.framework */; }; @@ -442,6 +454,8 @@ AB9038BA17C5ED2200F410BD /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */; }; AB91D46B13BD013800462471 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; }; ABA6574B14511EC90077E5E9 /* cocoa_cheat.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */; }; + ABAB454F187CDB70007BE20C /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABAB454E187CDB70007BE20C /* Image_GuitarGrip.png */; }; + ABAB4550187CDB70007BE20C /* Image_GuitarGrip.png in Resources */ = {isa = PBXBuildFile; fileRef = ABAB454E187CDB70007BE20C /* Image_GuitarGrip.png */; }; ABACB8DC1710B621003B845D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABACB8DB1710B621003B845D /* AudioToolbox.framework */; }; ABACB8DD1710B656003B845D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABACB8DB1710B621003B845D /* AudioToolbox.framework */; }; ABACB8DE1710B65F003B845D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABACB8DB1710B621003B845D /* AudioToolbox.framework */; }; @@ -858,6 +872,12 @@ AB58F32B1364F44B0074C376 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = ""; }; AB58F32C1364F44B0074C376 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = ""; }; AB64987B13ECC73800EE7DD2 /* FileTypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = FileTypeInfo.plist; sourceTree = ""; }; + AB681013187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Blue_512x512.png; path = images/Icon_GuitarGrip_Button_Blue_512x512.png; sourceTree = ""; }; + AB681014187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Green_512x512.png; path = images/Icon_GuitarGrip_Button_Green_512x512.png; sourceTree = ""; }; + AB681015187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Red_512x512.png; path = images/Icon_GuitarGrip_Button_Red_512x512.png; sourceTree = ""; }; + AB681016187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_GuitarGrip_Button_Yellow_512x512.png; path = images/Icon_GuitarGrip_Button_Yellow_512x512.png; sourceTree = ""; }; + AB681018187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_PaddleKnob_256x256.png; path = images/Icon_PaddleKnob_256x256.png; sourceTree = ""; }; + AB681019187D4AEF0049F2C2 /* Icon_Piano_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Piano_256x256.png; path = images/Icon_Piano_256x256.png; sourceTree = ""; }; AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OGLRender_3_2.cpp; path = ../OGLRender_3_2.cpp; sourceTree = ""; }; AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_nand.cpp; sourceTree = ""; }; AB74EC891738499C0026C41E /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; @@ -895,6 +915,7 @@ AB9971CE134EDA0800531BA7 /* cocoa_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_globals.h; sourceTree = ""; }; ABA6574914511EC90077E5E9 /* cocoa_cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_cheat.h; sourceTree = ""; }; ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_cheat.mm; sourceTree = ""; }; + ABAB454E187CDB70007BE20C /* Image_GuitarGrip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Image_GuitarGrip.png; path = images/Image_GuitarGrip.png; sourceTree = ""; }; ABACB8DB1710B621003B845D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; ABAD3E5913AF1D6D00502E1E /* AAFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAFilter.h; sourceTree = ""; }; ABAD3E5A13AF1D6D00502E1E /* BPMDetect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BPMDetect.h; sourceTree = ""; }; @@ -1529,10 +1550,16 @@ AB0F299C14BE7213009ABC6F /* Icon_DSButtonY_420x420.png */, AB0F299D14BE7213009ABC6F /* Icon_Emulation_420x420.png */, AB0F28FE14BE6E68009ABC6F /* Icon_Execute_420x420.png */, + AB681013187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png */, + AB681014187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png */, + AB681015187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png */, + AB681016187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png */, AB0F299E14BE7213009ABC6F /* Icon_Input_420x420.png */, AB0F299F14BE7213009ABC6F /* Icon_Microphone_420x420.png */, AB0F29A014BE7213009ABC6F /* Icon_OpenROM_420x420.png */, + AB681018187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png */, AB0F28FF14BE6E68009ABC6F /* Icon_Pause_420x420.png */, + AB681019187D4AEF0049F2C2 /* Icon_Piano_256x256.png */, AB0F29A114BE7213009ABC6F /* Icon_Reset_420x420.png */, AB0F29A214BE7213009ABC6F /* Icon_RotateCCW_420x420.png */, AB0F29A314BE7213009ABC6F /* Icon_RotateCW_420x420.png */, @@ -1544,6 +1571,7 @@ ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */, ABC3AF2D14B7F06900D5B13D /* Icon_VolumeOneThird_16x16.png */, ABC3AF2E14B7F06900D5B13D /* Icon_VolumeTwoThird_16x16.png */, + ABAB454E187CDB70007BE20C /* Image_GuitarGrip.png */, AB564909186E6F67002740F4 /* Image_MemoryExpansionPak.png */, AB0038A61872A96700B0B055 /* Image_PaddleController.png */, AB56490A186E6F67002740F4 /* Image_PassME.png */, @@ -2007,7 +2035,9 @@ AB0F294014BE6FA7009ABC6F /* ColorSwatch_Magenta_16x16.png in Resources */, AB0F294114BE6FA7009ABC6F /* ColorSwatch_Orange_16x16.png in Resources */, AB0F294214BE6FA7009ABC6F /* ColorSwatch_Pink_16x16.png in Resources */, + AB68101E187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, AB0F294314BE6FA7009ABC6F /* ColorSwatch_Red_16x16.png in Resources */, + AB68101C187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, AB0F294414BE6FA7009ABC6F /* ColorSwatch_SeaGreen_16x16.png in Resources */, AB0F294514BE6FA7009ABC6F /* ColorSwatch_Turquoise_16x16.png in Resources */, AB564911186E6F67002740F4 /* Image_MemoryExpansionPak.png in Resources */, @@ -2017,6 +2047,7 @@ AB0F296E14BE705D009ABC6F /* Icon_CodeBreaker_128x128.png in Resources */, AB0F297A14BE70BC009ABC6F /* VideoFilterPreview_64x64.png in Resources */, AB564913186E6F67002740F4 /* Image_PassME.png in Resources */, + AB681026187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png in Resources */, AB0F298C14BE71E0009ABC6F /* Icon_ArrowDown_420x420.png in Resources */, AB0F298D14BE71E0009ABC6F /* Icon_ArrowLeft_420x420.png in Resources */, AB0F298E14BE71E0009ABC6F /* Icon_ArrowRight_420x420.png in Resources */, @@ -2024,6 +2055,7 @@ AB0F29A614BE7213009ABC6F /* Icon_DoubleSpeed_420x420.png in Resources */, AB0F29A714BE7213009ABC6F /* Icon_DSButtonA_420x420.png in Resources */, AB0F29A814BE7213009ABC6F /* Icon_DSButtonB_420x420.png in Resources */, + AB681028187D4AEF0049F2C2 /* Icon_Piano_256x256.png in Resources */, AB0F29A914BE7213009ABC6F /* Icon_DSButtonL_420x420.png in Resources */, AB0F29AA14BE7213009ABC6F /* Icon_DSButtonR_420x420.png in Resources */, AB0F29AB14BE7213009ABC6F /* Icon_DSButtonSelect_420x420.png in Resources */, @@ -2044,6 +2076,9 @@ AB3ACC3F14C24D5400D7D192 /* ChangeLog in Resources */, AB3ACC4014C24D5400D7D192 /* COPYING in Resources */, AB3ACC4114C24D5400D7D192 /* README in Resources */, + AB681020187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABAB4550187CDB70007BE20C /* Image_GuitarGrip.png in Resources */, + AB681022187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, AB3ACC4314C24D5400D7D192 /* README.MAC in Resources */, AB75226E14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns in Resources */, AB8967DE16D2ED2700F826F1 /* DisplayWindow.xib in Resources */, @@ -2090,7 +2125,9 @@ AB796CC715CDCBA200C59155 /* ColorSwatch_Magenta_16x16.png in Resources */, AB796CC815CDCBA200C59155 /* ColorSwatch_Orange_16x16.png in Resources */, AB796CC915CDCBA200C59155 /* ColorSwatch_Pink_16x16.png in Resources */, + AB68101D187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, AB796CCA15CDCBA200C59155 /* ColorSwatch_Red_16x16.png in Resources */, + AB68101B187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, AB796CCB15CDCBA200C59155 /* ColorSwatch_SeaGreen_16x16.png in Resources */, AB796CCC15CDCBA200C59155 /* ColorSwatch_Turquoise_16x16.png in Resources */, AB564910186E6F67002740F4 /* Image_MemoryExpansionPak.png in Resources */, @@ -2100,6 +2137,7 @@ AB796CD015CDCBA200C59155 /* Icon_CodeBreaker_128x128.png in Resources */, AB796CD115CDCBA200C59155 /* VideoFilterPreview_64x64.png in Resources */, AB564912186E6F67002740F4 /* Image_PassME.png in Resources */, + AB681025187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png in Resources */, AB796CD215CDCBA200C59155 /* Icon_ArrowDown_420x420.png in Resources */, AB796CD315CDCBA200C59155 /* Icon_ArrowLeft_420x420.png in Resources */, AB796CD415CDCBA200C59155 /* Icon_ArrowRight_420x420.png in Resources */, @@ -2107,6 +2145,7 @@ AB796CD615CDCBA200C59155 /* Icon_DoubleSpeed_420x420.png in Resources */, AB796CD715CDCBA200C59155 /* Icon_DSButtonA_420x420.png in Resources */, AB796CD815CDCBA200C59155 /* Icon_DSButtonB_420x420.png in Resources */, + AB681027187D4AEF0049F2C2 /* Icon_Piano_256x256.png in Resources */, AB796CD915CDCBA200C59155 /* Icon_DSButtonL_420x420.png in Resources */, AB796CDA15CDCBA200C59155 /* Icon_DSButtonR_420x420.png in Resources */, AB796CDB15CDCBA200C59155 /* Icon_DSButtonSelect_420x420.png in Resources */, @@ -2127,6 +2166,9 @@ AB796CE915CDCBA200C59155 /* ChangeLog in Resources */, AB796CEA15CDCBA200C59155 /* COPYING in Resources */, AB796CEB15CDCBA200C59155 /* README in Resources */, + AB68101F187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Red_512x512.png in Resources */, + ABAB454F187CDB70007BE20C /* Image_GuitarGrip.png in Resources */, + AB681021187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Yellow_512x512.png in Resources */, AB796CEC15CDCBA200C59155 /* README.MAC in Resources */, AB796CED15CDCBA200C59155 /* AppIcon_FirmwareConfig.icns in Resources */, AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */, diff --git a/desmume/src/cocoa/DefaultKeyMappings.plist b/desmume/src/cocoa/DefaultKeyMappings.plist index 47e070cca..3c93abd51 100644 --- a/desmume/src/cocoa/DefaultKeyMappings.plist +++ b/desmume/src/cocoa/DefaultKeyMappings.plist @@ -20,6 +20,23 @@ Microphone Lid Debug + Guitar Grip: Green + Guitar Grip: Red + Guitar Grip: Yellow + Guitar Grip: Blue + Piano: C + Piano: C# + Piano: D + Piano: D# + Piano: E + Piano: F + Piano: F# + Piano: G + Piano: G# + Piano: A + Piano: A# + Piano: B + Piano: High C Paddle Execute/Pause Reset @@ -281,7 +298,187 @@ Debug - Paddle + Guitar Grip: Green + + + deviceInfoSummary + Keyboard: E + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 14 + elementName + E + + + Guitar Grip: Red + + + deviceInfoSummary + Keyboard: R + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 15 + elementName + R + + + Guitar Grip: Yellow + + + deviceInfoSummary + Keyboard: T + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 17 + elementName + T + + + Guitar Grip: Blue + + + deviceInfoSummary + Keyboard: Y + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 16 + elementName + Y + + + Piano: C + + + deviceInfoSummary + Keyboard: C + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 8 + elementName + C + + + Piano: C# + + + deviceInfoSummary + Keyboard: F + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 3 + elementName + F + + + Piano: D + + + deviceInfoSummary + Keyboard: V + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 9 + elementName + V + + + Piano: D# + + + deviceInfoSummary + Keyboard: G + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 5 + elementName + G + + + Piano: E + + + deviceInfoSummary + Keyboard: B + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 11 + elementName + B + + + Piano: F + + + deviceInfoSummary + Keyboard: N + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 45 + elementName + N + + + Piano: F# + + + deviceInfoSummary + Keyboard: J + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 38 + elementName + J + + + Piano: G + + + deviceInfoSummary + Keyboard: M + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 46 + elementName + M + + + Piano: G# deviceInfoSummary @@ -294,13 +491,25 @@ 40 elementName K - isInputAnalog - - inputSettingsSummary - Paddle Adjust: -5 - intValue1 - -5 + + Piano: A + + + deviceInfoSummary + Keyboard: , (Comma) + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 43 + elementName + , (Comma) + + + Piano: A# + deviceInfoSummary Keyboard: L @@ -312,6 +521,69 @@ 37 elementName L + + + Piano: B + + + deviceInfoSummary + Keyboard: . (Period) + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 47 + elementName + . (Period) + + + Piano: High C + + + deviceInfoSummary + Keyboard: / + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 44 + elementName + / + + + Paddle + + + deviceInfoSummary + Keyboard: O + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 31 + elementName + O + isInputAnalog + + inputSettingsSummary + Paddle Adjust: -5 + intValue1 + -5 + + + deviceInfoSummary + Keyboard: P + deviceCode + NSEventKeyboard + deviceName + Keyboard + elementCode + 35 + elementName + P isInputAnalog inputSettingsSummary diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist index cb61778ee..382adba77 100644 Binary files a/desmume/src/cocoa/DefaultUserPrefs.plist and b/desmume/src/cocoa/DefaultUserPrefs.plist differ diff --git a/desmume/src/cocoa/cocoa_GPU.mm b/desmume/src/cocoa/cocoa_GPU.mm index beaecd991..f3a4359e8 100644 --- a/desmume/src/cocoa/cocoa_GPU.mm +++ b/desmume/src/cocoa/cocoa_GPU.mm @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 DeSmuME team + Copyright (C) 2013-2014 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -104,6 +104,7 @@ GPU3DInterface *core3DList[] = { - (void)dealloc { + NDS_3D_ChangeCore(CORE3DLIST_NULL); DestroyOpenGLRenderer(); [super dealloc]; diff --git a/desmume/src/cocoa/cocoa_input.mm b/desmume/src/cocoa/cocoa_input.mm index d0aa96c41..70c1139d7 100644 --- a/desmume/src/cocoa/cocoa_input.mm +++ b/desmume/src/cocoa/cocoa_input.mm @@ -1,6 +1,6 @@ /* Copyright (C) 2011 Roger Manuel - Copyright (C) 2012-2013 DeSmuME team + Copyright (C) 2012-2014 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -134,11 +134,42 @@ NDS_releaseTouch(); } - // Setup the paddle. - if (slot2_GetSelectedType() == NDS_SLOT2_PADDLE) + // Setup the inputs from SLOT-2 devices. + const NDS_SLOT2_TYPE slot2DeviceType = slot2_GetSelectedType(); + switch (slot2DeviceType) { - const u16 newPaddleValue = Paddle_GetValue() + (u16)[self paddleAdjust]; - Paddle_SetValue(newPaddleValue); + case NDS_SLOT2_GUITARGRIP: + guitarGrip_setKey(flushedStates[DSControllerState_GuitarGrip_Green], + flushedStates[DSControllerState_GuitarGrip_Red], + flushedStates[DSControllerState_GuitarGrip_Yellow], + flushedStates[DSControllerState_GuitarGrip_Blue]); + break; + + case NDS_SLOT2_EASYPIANO: + piano_setKey(flushedStates[DSControllerState_Piano_C], + flushedStates[DSControllerState_Piano_CSharp], + flushedStates[DSControllerState_Piano_D], + flushedStates[DSControllerState_Piano_DSharp], + flushedStates[DSControllerState_Piano_E], + flushedStates[DSControllerState_Piano_F], + flushedStates[DSControllerState_Piano_FSharp], + flushedStates[DSControllerState_Piano_G], + flushedStates[DSControllerState_Piano_GSharp], + flushedStates[DSControllerState_Piano_A], + flushedStates[DSControllerState_Piano_ASharp], + flushedStates[DSControllerState_Piano_B], + flushedStates[DSControllerState_Piano_HighC]); + break; + + case NDS_SLOT2_PADDLE: + { + const u16 newPaddleValue = Paddle_GetValue() + (u16)[self paddleAdjust]; + Paddle_SetValue(newPaddleValue); + break; + } + + default: + break; } // Setup the DS mic. diff --git a/desmume/src/cocoa/cocoa_slot2.mm b/desmume/src/cocoa/cocoa_slot2.mm index 89671286c..7783521b0 100644 --- a/desmume/src/cocoa/cocoa_slot2.mm +++ b/desmume/src/cocoa/cocoa_slot2.mm @@ -276,22 +276,19 @@ BOOL isSupported; }; - static const Slot2DeviceProperties deviceTypesList[] = { + static const Slot2DeviceProperties supportedDeviceTypesList[] = { { NDS_SLOT2_NONE, YES }, { NDS_SLOT2_AUTO, YES }, { NDS_SLOT2_CFLASH, YES }, { NDS_SLOT2_RUMBLEPAK, YES }, { NDS_SLOT2_GBACART, YES }, - { NDS_SLOT2_GUITARGRIP, NO }, + { NDS_SLOT2_GUITARGRIP, YES }, { NDS_SLOT2_EXPMEMORY, YES }, - { NDS_SLOT2_EASYPIANO, NO }, + { NDS_SLOT2_EASYPIANO, YES }, { NDS_SLOT2_PADDLE, YES }, { NDS_SLOT2_PASSME, YES } }; - Slot2DeviceProperties *supportedDeviceTypesList = (Slot2DeviceProperties *)calloc(NDS_SLOT2_COUNT, sizeof(Slot2DeviceProperties)); - memcpy(supportedDeviceTypesList, deviceTypesList, sizeof(deviceTypesList)); - for (size_t j = 0; j < NDS_SLOT2_COUNT; j++) { if (deviceType == supportedDeviceTypesList[j].typeID) @@ -300,10 +297,7 @@ break; } } - - free(supportedDeviceTypesList); - supportedDeviceTypesList = NULL; - + // If the new device is the current device, select it. if (!didSelectDevice && [newCdsDevice type] == slot2_GetCurrentType()) { diff --git a/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Blue_512x512.png b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Blue_512x512.png new file mode 100644 index 000000000..5a20509d4 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Blue_512x512.png differ diff --git a/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Green_512x512.png b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Green_512x512.png new file mode 100644 index 000000000..b38cb15bb Binary files /dev/null and b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Green_512x512.png differ diff --git a/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Red_512x512.png b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Red_512x512.png new file mode 100644 index 000000000..860b827de Binary files /dev/null and b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Red_512x512.png differ diff --git a/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Yellow_512x512.png b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Yellow_512x512.png new file mode 100644 index 000000000..aab9ecaec Binary files /dev/null and b/desmume/src/cocoa/images/Icon_GuitarGrip_Button_Yellow_512x512.png differ diff --git a/desmume/src/cocoa/images/Icon_PaddleKnob_256x256.png b/desmume/src/cocoa/images/Icon_PaddleKnob_256x256.png new file mode 100644 index 000000000..4150b86fb Binary files /dev/null and b/desmume/src/cocoa/images/Icon_PaddleKnob_256x256.png differ diff --git a/desmume/src/cocoa/images/Icon_Piano_256x256.png b/desmume/src/cocoa/images/Icon_Piano_256x256.png new file mode 100644 index 000000000..b362d33e7 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_Piano_256x256.png differ diff --git a/desmume/src/cocoa/images/Image_GuitarGrip.png b/desmume/src/cocoa/images/Image_GuitarGrip.png new file mode 100644 index 000000000..e3e77376c Binary files /dev/null and b/desmume/src/cocoa/images/Image_GuitarGrip.png differ diff --git a/desmume/src/cocoa/images/Image_Piano.png b/desmume/src/cocoa/images/Image_Piano.png index 5549d6dee..d0d30dddc 100644 Binary files a/desmume/src/cocoa/images/Image_Piano.png and b/desmume/src/cocoa/images/Image_Piano.png differ diff --git a/desmume/src/cocoa/openemu/NDSGameCore.mm b/desmume/src/cocoa/openemu/NDSGameCore.mm index 6d998b87c..4368d1d75 100644 --- a/desmume/src/cocoa/openemu/NDSGameCore.mm +++ b/desmume/src/cocoa/openemu/NDSGameCore.mm @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 DeSmuME team + Copyright (C) 2012-2014 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,6 @@ #include #include "../../NDSSystem.h" -#include "../../render3D.h" #undef BOOL @implementation NDSGameCore @@ -123,7 +122,6 @@ - (void)dealloc { SPU_ChangeSoundCore(SNDCORE_DUMMY, 0); - NDS_3D_ChangeCore(CORE3DLIST_NULL); [CocoaDSCore shutdownCore]; [self setCdsCheats:nil]; diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings index 04da50329..923b737e5 100644 Binary files a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings and b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings differ diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib index 68c947dfc..de606cf9e 100644 --- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib +++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib @@ -2,10 +2,10 @@ 1050 - 13B42 + 12F45 851 - 1265 - 696.00 + 1187.40 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin 851 @@ -2455,7 +2455,6 @@ NO - 1 @@ -2479,7 +2478,6 @@ NO - 1 {550, 450} @@ -2753,7 +2751,6 @@ NO - 1 @@ -2792,7 +2789,6 @@ NO - 1 @@ -2811,7 +2807,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 {{1, 1}, {484, 81}} @@ -2870,7 +2865,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -2909,7 +2903,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 {{1, 1}, {484, 45}} @@ -3189,7 +3182,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -3266,7 +3258,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -3755,7 +3746,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 {640, 495} @@ -3806,7 +3796,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -3824,7 +3813,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -4008,7 +3996,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -4026,7 +4013,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA NO - 1 @@ -4814,7 +4800,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -4897,7 +4882,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -4941,7 +4925,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -4959,7 +4942,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -4977,7 +4959,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -4995,7 +4976,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -5013,7 +4993,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {429, 141}} @@ -5345,7 +5324,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -5364,7 +5342,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -5638,7 +5615,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -5656,7 +5632,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -5783,7 +5758,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -5889,7 +5863,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -6131,7 +6104,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -6948,7 +6920,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7384,7 +7355,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7461,7 +7431,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7712,7 +7681,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7730,7 +7698,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7771,7 +7738,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7789,7 +7755,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7934,7 +7899,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -7952,7 +7916,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -8319,7 +8282,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -8360,7 +8322,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -8491,7 +8452,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -8531,7 +8491,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {452, 115} @@ -8856,7 +8815,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -8977,7 +8935,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9085,7 +9042,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {620, 267} @@ -9135,7 +9091,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9216,7 +9171,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9234,7 +9188,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9315,7 +9268,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {314, 74}} @@ -9403,7 +9355,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9443,7 +9394,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {350, 263} @@ -9626,7 +9576,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9688,7 +9637,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {350, 125} @@ -9871,7 +9819,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -9933,7 +9880,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {350, 125} @@ -9974,7 +9920,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10014,7 +9959,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10032,7 +9976,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10050,7 +9993,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10068,7 +10010,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10086,7 +10027,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10104,7 +10044,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10145,7 +10084,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10227,7 +10165,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10765,7 +10702,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {516, 283} @@ -10785,7 +10721,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {1.7976931348623157e+308, 1.7976931348623157e+308} - + 256 YES @@ -10794,7 +10730,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{17, 203}, {316, 17}} - YES 70254657 @@ -10807,7 +10742,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -10824,7 +10758,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{195.08984375, 16}, {38, 17}} - _NS:4068 YES @@ -10900,14 +10833,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 268 {{235, 11}, {19, 27}} - _NS:4123 YES @@ -10928,7 +10859,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{67, 16}, {127, 17}} - _NS:4068 YES @@ -10942,17 +10872,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {314, 46}} - {{17, 56}, {316, 62}} - {0, 0} 67108864 @@ -10976,7 +10903,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{240, 12}, {96, 32}} - 1 YES @@ -10999,7 +10925,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{144, 12}, {96, 32}} - YES 67108864 @@ -11031,7 +10956,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{83, 10}, {145, 21}} - _NS:700 YES @@ -11056,7 +10980,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 15}, {65, 11}} - _NS:4068 YES @@ -11070,14 +10993,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 268 {{231, 15}, {68, 11}} - _NS:4068 YES @@ -11091,18 +11012,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {314, 39}} - _NS:21 {{17, 122}, {316, 55}} - _NS:18 {0, 0} @@ -11127,7 +11045,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{17, 185}, {316, 17}} - _NS:4068 YES @@ -11141,14 +11058,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 268 {{17, 185}, {316, 17}} - _NS:4068 YES @@ -11162,12 +11077,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {350, 240} - - _NS:122 {{0, 0}, {1920, 1178}} @@ -11207,7 +11119,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11227,7 +11138,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11245,7 +11155,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11263,7 +11172,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11281,7 +11189,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11299,7 +11206,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11317,7 +11223,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11733,7 +11638,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11795,7 +11699,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -11856,7 +11759,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -12228,7 +12130,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -12289,7 +12190,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {380, 200} @@ -12329,7 +12229,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -12391,7 +12290,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -12826,7 +12724,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -12867,7 +12764,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -12885,7 +12781,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13002,7 +12897,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13048,7 +12942,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13130,7 +13023,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13148,7 +13040,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13252,7 +13143,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13270,7 +13160,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13651,7 +13540,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13669,7 +13557,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13772,7 +13659,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13791,7 +13677,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13810,7 +13695,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13829,7 +13713,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {500, 416} @@ -13926,7 +13809,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 255 NO - 1 @@ -13944,7 +13826,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -13962,7 +13843,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {328, 134} @@ -13989,7 +13869,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14007,7 +13886,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14055,7 +13933,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14073,7 +13950,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14208,7 +14084,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14226,7 +14101,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14270,7 +14144,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14343,7 +14216,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14361,7 +14233,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14380,7 +14251,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14398,7 +14268,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -14884,7 +14753,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {320, 290} @@ -14948,7 +14816,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {320, 290} @@ -15006,7 +14873,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -15047,7 +14913,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -15362,7 +15227,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -15404,7 +15268,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -15508,7 +15371,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -15911,7 +15773,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {512, 66}} @@ -15975,7 +15836,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -16005,7 +15865,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16025,7 +15884,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16045,7 +15903,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -16075,7 +15932,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16096,7 +15952,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16116,7 +15971,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16136,7 +15990,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16185,7 +16038,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16235,7 +16087,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -16265,7 +16116,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16413,7 +16263,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16632,7 +16481,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -16710,7 +16558,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16730,7 +16577,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16798,7 +16644,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -16818,7 +16663,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -16826,44 +16670,61 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSView - + 268 YES - + 268 - {{101, 60}, {282, 28}} + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{75, 96}, {254, 204}} - _NS:3939 + + _NS:2165 YES - - 67108864 - 272760832 - This is an input device. You can set up this device through your Input Preferences. - - _NS:3939 - - - + + 0 + 33554432 + + NSImage + Image_GuitarGrip + + _NS:2165 + 0 + 3 + 0 + NO NO - 1 + YES - + 268 - {{236, 12}, {150, 32}} + {{127, 12}, {150, 32}} + _NS:610 YES - + 67108864 134217728 Input Preferences _NS:610 - + -2038284288 129 @@ -16873,128 +16734,30 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - + 268 - {{101, 232}, {282, 68}} + {{17, 60}, {366, 28}} + _NS:3939 YES - + 67108864 - 272629760 - You can control the guitar grip by clicking the onscreen buttons. You can also map inputs to the guitar grip controls through your Input Preferences. - + 272760832 + This is an input device. You can set up this device through your Input Preferences. + _NS:3939 - + NO - 1 - - - - 268 - {{18, 23}, {68, 70}} - - _NS:2337 - YES - - 67108864 - 134217728 - - - LucidaGrande - 10 - 16 - - _NS:2337 - - -2033958912 - 130 - - - - 400 - 75 - - NO - - - - 268 - {{18, 95}, {68, 70}} - - _NS:2337 - YES - - 67108864 - 134217728 - - - _NS:2337 - - -2033958912 - 130 - - - - 400 - 75 - - NO - - - - 268 - {{18, 167}, {68, 70}} - - _NS:2337 - YES - - 67108864 - 134217728 - - - _NS:2337 - - -2033958912 - 130 - - - - 400 - 75 - - NO - - - - 268 - {{18, 239}, {68, 70}} - - _NS:2337 - YES - - 67108864 - 134217728 - - - _NS:2337 - - -2033958912 - 130 - - - - 400 - 75 - - NO {400, 320} + + _NS:1109 NSView @@ -17057,7 +16820,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -17065,7 +16827,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSView - + 268 YES @@ -17074,6 +16836,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{17, 60}, {366, 28}} + _NS:3939 YES @@ -17087,13 +16850,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 268 - {{125, 12}, {150, 32}} + {{127, 12}, {150, 32}} + _NS:610 YES @@ -17127,8 +16890,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NeXT TIFF v4.0 pasteboard type - {{25, 100}, {350, 200}} + {{87, 96}, {230, 204}} + _NS:2165 YES @@ -17149,6 +16913,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {400, 320} + + _NS:1109 NSView @@ -17160,7 +16926,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{124, 12}, {150, 32}} + {{127, 12}, {150, 32}} _NS:610 YES @@ -17195,7 +16961,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NeXT TIFF v4.0 pasteboard type - {{51, 96}, {297, 204}} + {{53, 96}, {297, 204}} _NS:2165 YES @@ -17233,7 +16999,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -17299,7 +17064,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {400, 320} @@ -17607,7 +17371,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {250, 85}} @@ -18091,7 +17854,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18109,7 +17871,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {250, 86}} @@ -18511,7 +18272,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18548,7 +18308,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18566,7 +18325,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18584,7 +18342,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18602,7 +18359,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18620,7 +18376,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18640,7 +18395,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -18660,7 +18414,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {260, 328} @@ -19785,7 +19538,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -19803,7 +19555,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -21685,7 +21436,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22125,7 +21875,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22144,7 +21893,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22163,7 +21911,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22182,7 +21929,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22205,7 +21951,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22225,7 +21970,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22245,7 +21989,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22265,7 +22008,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {408, 116}} @@ -22321,7 +22063,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22340,7 +22081,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22359,7 +22099,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22378,7 +22117,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22397,7 +22135,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22416,7 +22153,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22436,7 +22172,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22456,7 +22191,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22476,7 +22210,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22496,7 +22229,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22516,7 +22248,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22536,7 +22267,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {216, 400}} @@ -22592,7 +22322,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22611,7 +22340,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22630,7 +22358,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22649,7 +22376,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22668,7 +22394,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22687,7 +22412,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22706,7 +22430,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22725,7 +22448,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22744,7 +22466,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22764,7 +22485,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22784,7 +22504,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22804,7 +22523,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22824,7 +22542,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22844,7 +22561,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22864,7 +22580,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22884,7 +22599,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {324, 192}} @@ -22940,7 +22654,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22960,7 +22673,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22979,7 +22691,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -22999,7 +22710,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23018,7 +22728,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23038,7 +22747,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23057,7 +22765,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23077,7 +22784,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {324, 104}} @@ -23133,7 +22839,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23153,7 +22858,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23172,7 +22876,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23191,7 +22894,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {{1, 1}, {324, 60}} @@ -23284,7 +22986,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23303,7 +23004,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23322,7 +23022,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23341,7 +23040,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23360,7 +23058,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23379,7 +23076,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23421,7 +23117,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23503,7 +23198,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23592,7 +23286,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23610,7 +23303,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23628,7 +23320,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23646,7 +23337,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23730,7 +23420,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23748,7 +23437,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23853,7 +23541,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23871,7 +23558,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23889,7 +23575,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23907,7 +23592,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23925,7 +23609,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -23943,7 +23626,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24022,7 +23704,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24563,7 +24244,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 {450, 35} @@ -24619,7 +24299,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24809,7 +24488,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24849,7 +24527,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24867,7 +24544,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24907,7 +24583,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24925,7 +24600,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24965,7 +24639,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -24983,7 +24656,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25001,7 +24673,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25019,7 +24690,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25038,7 +24708,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25057,7 +24726,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25134,7 +24802,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25466,7 +25133,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25506,7 +25172,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25524,7 +25189,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25542,7 +25206,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25560,7 +25223,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25600,7 +25262,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25618,7 +25279,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25658,7 +25318,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25676,7 +25335,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25694,7 +25352,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25712,7 +25369,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25731,7 +25387,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25750,7 +25405,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -25840,7 +25494,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - 1 @@ -36679,14 +36332,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8650 - - - showInputPreferences: - - - - 8659 - showInputPreferences: @@ -36975,6 +36620,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8738 + + + showInputPreferences: + + + + 8745 + @@ -49247,87 +48900,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - - - - - - - + + + SLOT-2 Guitar Grip View - - 8433 - - - YES - - - - - - 8434 - - - - - 8435 - - - YES - - - - - - 8436 - - - - - 8437 - - - YES - - - - - - 8438 - - - - - 8439 - - - YES - - - - - - 8440 - - - - - 8443 - - - YES - - - - - - 8444 - - - 8445 @@ -49358,8 +48937,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - + @@ -49371,8 +48950,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - + SLOT-2 Paddle Controller View @@ -49809,20 +49388,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - - 8657 - - - YES - - - - - - 8658 - - - 8660 @@ -49865,20 +49430,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - - 8669 - - - YES - - - - - - 8670 - - - 8677 @@ -50072,6 +49623,48 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 8741 + + + YES + + + + + + 8742 + + + YES + + + + + + 8743 + + + + + 8744 + + + + + 8746 + + + YES + + + + + + 8747 + + + @@ -51968,22 +51561,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8428.IBPluginDependency 8428.IBViewBoundsToFrameTransform 843.IBPluginDependency - 8433.IBPluginDependency - 8433.IBViewBoundsToFrameTransform - 8434.IBPluginDependency - 8435.IBPluginDependency - 8435.IBViewBoundsToFrameTransform - 8436.IBPluginDependency - 8437.IBPluginDependency - 8437.IBViewBoundsToFrameTransform - 8438.IBPluginDependency - 8439.IBPluginDependency - 8439.IBViewBoundsToFrameTransform 844.IBPluginDependency - 8440.IBPluginDependency - 8443.IBPluginDependency - 8443.IBViewBoundsToFrameTransform - 8444.IBPluginDependency 8445.IBEditorWindowLastContentRect 8445.IBPluginDependency 8445.IBViewBoundsToFrameTransform @@ -52098,9 +51676,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8655.IBPluginDependency 8655.IBViewBoundsToFrameTransform 8656.IBPluginDependency - 8657.IBPluginDependency - 8657.IBViewBoundsToFrameTransform - 8658.IBPluginDependency 866.IBPluginDependency 8660.IBPluginDependency 8660.IBViewBoundsToFrameTransform @@ -52111,9 +51686,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8667.IBPluginDependency 8667.IBViewBoundsToFrameTransform 8668.IBPluginDependency - 8669.IBPluginDependency - 8669.IBViewBoundsToFrameTransform - 8670.IBPluginDependency 8677.IBPluginDependency 8677.IBViewBoundsToFrameTransform 8678.IBPluginDependency @@ -52155,6 +51727,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8736.IBPluginDependency 8739.IBPluginDependency 8740.IBPluginDependency + 8741.IBPluginDependency + 8741.IBViewBoundsToFrameTransform + 8742.IBPluginDependency + 8742.IBViewBoundsToFrameTransform + 8743.IBPluginDependency + 8744.IBPluginDependency + 8746.IBPluginDependency + 8746.IBViewBoundsToFrameTransform + 8747.IBPluginDependency 875.IBPluginDependency 876.IBPluginDependency 877.IBPluginDependency @@ -52820,7 +52401,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{616, 836}, {512, 20}} + {{1107, 1136}, {512, 20}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -55153,36 +54734,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 AUONAABDPwAAA - {{898, 836}, {400, 320}} + {{1090, 687}, {400, 320}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBYAAAw5MAAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBYAAAw14AAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBYAAAwxYAAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBYAAAwpwAAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABC/gAAw46AAA - - com.apple.InterfaceBuilder.CocoaPlugin {{911, 632}, {400, 320}} com.apple.InterfaceBuilder.CocoaPlugin @@ -55191,11 +54747,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 P4AAAL+AAABBiAAAwycAAA com.apple.InterfaceBuilder.CocoaPlugin - {{903, 433}, {400, 320}} + {{1193, 722}, {400, 320}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{913, 679}, {400, 320}} + {{1184, 327}, {400, 320}} com.apple.InterfaceBuilder.CocoaPlugin {{910, 193}, {400, 320}} @@ -55208,7 +54764,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUHIAABCwgAAA + AUMRAABCwAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -55350,12 +54906,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUHYAABCwAAAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDbAAAwigAAA + AUJMAABCwAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -55366,17 +54917,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDAgAAwhQAAA + P4AAAL+AAABC+AAAwigAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAwywAAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCygAAwrIAAA + P4AAAL+AAABBiAAAwqwAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -55447,6 +54993,21 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAADCSAAAwq4AAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCZAAAwiwAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + AUKQAABCwAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -55560,7 +55121,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 8740 + 8747 @@ -58583,6 +58144,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 Icon_ShowHUD_420x420 Icon_Speaker_420x420 Icon_VolumeFull_16x16 + Image_GuitarGrip Image_MemoryExpansionPak Image_PaddleController Image_PassME @@ -58623,11 +58185,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {420, 420} {420, 420} {20, 20} + {421, 339} {360, 136} {698, 479} {111.60000000000001, 85.600000000000009} - {350, 200} - {14, 14} + {515, 457} + {15, 15} {8, 8} {512, 512} {11, 11} diff --git a/desmume/src/cocoa/userinterface/InputManager.mm b/desmume/src/cocoa/userinterface/InputManager.mm index 31786dcd2..cd07315db 100644 --- a/desmume/src/cocoa/userinterface/InputManager.mm +++ b/desmume/src/cocoa/userinterface/InputManager.mm @@ -1026,6 +1026,24 @@ static std::tr1::unordered_map keyboardNameTable; / [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonStart_420x420" ofType:@"png"]] autorelease], @"Start", [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonSelect_420x420" ofType:@"png"]] autorelease], @"Select", [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Microphone_420x420" ofType:@"png"]] autorelease], @"Microphone", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Green_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Green", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Red_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Red", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Yellow_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Yellow", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Blue_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Blue", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: C", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: C#", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: D", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: D#", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: E", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: F", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: F#", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: G", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: G#", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: A", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: A#", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: B", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: High C", + [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_PaddleKnob_256x256" ofType:@"png"]] autorelease], @"Paddle", [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_RotateCCW_420x420" ofType:@"png"]] autorelease], @"Rotate Display Left", [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_RotateCW_420x420" ofType:@"png"]] autorelease], @"Rotate Display Right", [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ShowHUD_420x420" ofType:@"png"]] autorelease], @"HUD", @@ -1117,14 +1135,14 @@ static std::tr1::unordered_map keyboardNameTable; / CommandAttributes cmdPianoC = NewCommandAttributesForDSControl("Piano: C", DSControllerState_Piano_C); CommandAttributes cmdPianoCSharp = NewCommandAttributesForDSControl("Piano: C#", DSControllerState_Piano_CSharp); CommandAttributes cmdPianoD = NewCommandAttributesForDSControl("Piano: D", DSControllerState_Piano_D); - CommandAttributes cmdPianoDSharp = NewCommandAttributesForDSControl("Piano: DSharp", DSControllerState_Piano_DSharp); + CommandAttributes cmdPianoDSharp = NewCommandAttributesForDSControl("Piano: D#", DSControllerState_Piano_DSharp); CommandAttributes cmdPianoE = NewCommandAttributesForDSControl("Piano: E", DSControllerState_Piano_E); CommandAttributes cmdPianoF = NewCommandAttributesForDSControl("Piano: F", DSControllerState_Piano_F); - CommandAttributes cmdPianoFSharp = NewCommandAttributesForDSControl("Piano: FSharp", DSControllerState_Piano_FSharp); + CommandAttributes cmdPianoFSharp = NewCommandAttributesForDSControl("Piano: F#", DSControllerState_Piano_FSharp); CommandAttributes cmdPianoG = NewCommandAttributesForDSControl("Piano: G", DSControllerState_Piano_G); - CommandAttributes cmdPianoGSharp = NewCommandAttributesForDSControl("Piano: GSharp", DSControllerState_Piano_GSharp); + CommandAttributes cmdPianoGSharp = NewCommandAttributesForDSControl("Piano: G#", DSControllerState_Piano_GSharp); CommandAttributes cmdPianoA = NewCommandAttributesForDSControl("Piano: A", DSControllerState_Piano_A); - CommandAttributes cmdPianoASharp = NewCommandAttributesForDSControl("Piano: ASharp", DSControllerState_Piano_ASharp); + CommandAttributes cmdPianoASharp = NewCommandAttributesForDSControl("Piano: A#", DSControllerState_Piano_ASharp); CommandAttributes cmdPianoB = NewCommandAttributesForDSControl("Piano: B", DSControllerState_Piano_B); CommandAttributes cmdPianoHighC = NewCommandAttributesForDSControl("Piano: High C", DSControllerState_Piano_HighC); diff --git a/desmume/src/cocoa/userinterface/Slot2WindowDelegate.mm b/desmume/src/cocoa/userinterface/Slot2WindowDelegate.mm index 01914e3ef..fdb7d9081 100644 --- a/desmume/src/cocoa/userinterface/Slot2WindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/Slot2WindowDelegate.mm @@ -102,7 +102,8 @@ - (IBAction) applySettings:(id)sender { - const NDS_SLOT2_TYPE selectedDeviceType = (selectedDevice != nil) ? [selectedDevice type] : NDS_SLOT2_NONE; + CocoaDSSlot2Device *theDevice = [self selectedDevice]; + const NDS_SLOT2_TYPE selectedDeviceType = (theDevice != nil) ? [theDevice type] : NDS_SLOT2_NONE; if (selectedDeviceType == NDS_SLOT2_CFLASH) { @@ -116,11 +117,11 @@ break; case MPCF_OPTION_LOAD_DIRECTORY: - theURL = mpcfFolderURL; + theURL = [self mpcfFolderURL]; break; case MPCF_OPTION_LOAD_DISK_IMAGE: - theURL = mpcfDiskImageURL; + theURL = [self mpcfDiskImageURL]; break; default: @@ -131,12 +132,12 @@ } else if (selectedDeviceType == NDS_SLOT2_GBACART) { - [deviceManager setGbaCartridgeURL:gbaCartridgeURL]; - [deviceManager setGbaSRamURL:gbaSRamURL]; + [deviceManager setGbaCartridgeURL:[self gbaCartridgeURL]]; + [deviceManager setGbaSRamURL:[self gbaSRamURL]]; } - [[self deviceManager] setCurrentDevice:selectedDevice]; - [[NSUserDefaults standardUserDefaults] setInteger:[selectedDevice type] forKey:@"Slot2_LoadedDevice"]; + [[self deviceManager] setCurrentDevice:theDevice]; + [[NSUserDefaults standardUserDefaults] setInteger:[theDevice type] forKey:@"Slot2_LoadedDevice"]; } - (IBAction) showInputPreferences:(id)sender