diff --git a/Classes/File Browser/EMUROMBrowserViewController.h b/Classes/File Browser/EMUROMBrowserViewController.h index ce654c8..d96560c 100644 --- a/Classes/File Browser/EMUROMBrowserViewController.h +++ b/Classes/File Browser/EMUROMBrowserViewController.h @@ -30,18 +30,8 @@ + (NSString *)getFileImportedNotificationName; -<<<<<<< HEAD -+ (NSString *)getFileImportedNotificationName; - -@property (nonatomic, retain) NSArray *roms, *indexTitles; -@property (nonatomic, retain) NSIndexPath *selectedIndexPath; -@property (nonatomic, assign) id delegate; -@property (nonatomic, retain) id context; -@property (nonatomic, retain) AdfImporter *adfImporter; -======= @property (nonatomic, assign) id delegate; @property (nonatomic, retain) id context; ->>>>>>> dev @property (nonatomic, retain) NSArray *extensions; // extensions of files to show @end diff --git a/Classes/File Browser/EMUROMBrowserViewController.mm b/Classes/File Browser/EMUROMBrowserViewController.mm index 4c83a7a..7f6334f 100644 --- a/Classes/File Browser/EMUROMBrowserViewController.mm +++ b/Classes/File Browser/EMUROMBrowserViewController.mm @@ -38,19 +38,13 @@ + (NSString *)getFileImportedNotificationName { - (void)viewDidLoad { [super viewDidLoad]; self.title = @"Browser"; -<<<<<<< HEAD - self.adfImporter = [[AdfImporter alloc] init]; - [self reloadAdfs]; - - -======= _adfImporter = [[AdfImporter alloc] init]; _indexTitles = [@[@"A", @"B", @"C", @"D", @"E", @"F", @"G", @"H", @"I", @"J", @"K", @"L", @"M", @"N", @"O", @"P", @"Q", @"R", @"S", @"T", @"U", @"V", @"W", @"X", @"Y", @"Z", @"#"] retain]; _scrollToRowHandler = [[ScrollToRowHandler alloc] initWithTableView:self.tableView identity:[_extensions description]]; ->>>>>>> dev + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onAdfChanged) name:[EMUROMBrowserViewController getFileImportedNotificationName] @@ -69,11 +63,8 @@ - (void)reloadAdfs { } [sections addObject:[[EMUFileGroup alloc] initWithSectionName:@"#"]]; -<<<<<<< HEAD - EMUBrowser *browser = [[EMUBrowser alloc] init]; -======= EMUBrowser *browser = [[[EMUBrowser alloc] init] autorelease]; ->>>>>>> dev + NSArray *files = [browser getFileInfosForExtensions:self.extensions]; for (EMUFileInfo* f in files) { unichar c = [[f fileName] characterAtIndex:0]; @@ -128,28 +119,11 @@ - (NSInteger)tableView:(UITableView *)table numberOfRowsInSection:(NSInteger)sec } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { -<<<<<<< HEAD - if (indexPath == selectedIndexPath) - return; - UITableViewCell *cell = [tableView cellForRowAtIndexPath:self.selectedIndexPath]; - cell.accessoryType = UITableViewCellAccessoryNone; - - cell = [tableView cellForRowAtIndexPath:indexPath]; - self.selectedIndexPath = indexPath; - - EMUFileGroup *g = (EMUFileGroup*)[self.roms objectAtIndex:indexPath.section]; - EMUFileInfo *fi = [g.files objectAtIndex:indexPath.row]; - [self.navigationController popViewControllerAnimated:YES]; - if (self.delegate) { - [self.delegate didSelectROM:fi withContext:context]; - } -======= EMUFileGroup *g = (EMUFileGroup*)[_roms objectAtIndex:indexPath.section]; EMUFileInfo *fi = [g.files objectAtIndex:indexPath.row]; [self.navigationController popViewControllerAnimated:YES]; [self.delegate didSelectROM:fi withContext:self.context]; [_scrollToRowHandler setRow:indexPath]; ->>>>>>> dev } - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { @@ -176,19 +150,13 @@ - (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NS shareAction.backgroundColor = [UIColor blueColor]; [editActions addObject:shareAction]; -<<<<<<< HEAD - BOOL okToDelete = [self.adfImporter isDownloadedAdf:fileInfo.path]; -======= BOOL okToDelete = [_adfImporter isDownloadedAdf:fileInfo.path]; ->>>>>>> dev + if (okToDelete) { UITableViewRowAction *deleteAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"Delete" handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) { BOOL deleted = [[NSFileManager defaultManager] removeItemAtPath:fileInfo.path error:NULL]; if (deleted) { -<<<<<<< HEAD -======= [_scrollToRowHandler clearRow]; ->>>>>>> dev [self reloadAdfs]; [tableView beginUpdates]; [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic]; @@ -222,22 +190,14 @@ - (EMUFileInfo *)getFileInfoForIndexPath:(NSIndexPath *)indexPath { } - (void)dealloc { -<<<<<<< HEAD - self.roms = nil; - self.indexTitles = nil; - self.selectedIndexPath = nil; - self.context = nil; - self.adfImporter = nil; - self.extensions = nil; -======= self.context = nil; self.extensions = nil; [_roms release]; [_indexTitles release]; [_adfImporter release]; [_scrollToRowHandler release]; ->>>>>>> dev + [[NSNotificationCenter defaultCenter] removeObserver:self]; [super dealloc]; diff --git a/Classes/StateManagementController.mm b/Classes/StateManagementController.mm index 2f8b196..77ab63c 100644 --- a/Classes/StateManagementController.mm +++ b/Classes/StateManagementController.mm @@ -20,10 +20,7 @@ #include "savestate.h" #import "CoreSetting.h" -<<<<<<< HEAD -======= #import "ScrollToRowHandler.h" ->>>>>>> dev #import "State.h" #import "StateManagementController.h" #import "StateFileManager.h" diff --git a/Storyboard.storyboard b/Storyboard.storyboard index 8206587..b808a14 100644 --- a/Storyboard.storyboard +++ b/Storyboard.storyboard @@ -1,9 +1,5 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -181,11 +177,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -1342,11 +1334,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -1764,95 +1752,6 @@ -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= ->>>>>>> dev @@ -2132,54 +2031,6 @@ -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= ->>>>>>> dev @@ -2492,11 +2343,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -2504,11 +2351,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -2516,11 +2359,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -2528,11 +2367,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev @@ -2555,11 +2390,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev diff --git a/iUAE.xcodeproj/project.pbxproj b/iUAE.xcodeproj/project.pbxproj index e77172e..f32bb83 100644 --- a/iUAE.xcodeproj/project.pbxproj +++ b/iUAE.xcodeproj/project.pbxproj @@ -211,10 +211,7 @@ 7E5AF61E1C444C65000BF5CB /* keyboard_unselected.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E5AF61D1C444C65000BF5CB /* keyboard_unselected.png */; }; 7E5AF6201C444C83000BF5CB /* gear_unselected.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E5AF61F1C444C83000BF5CB /* gear_unselected.png */; }; 7E66C1C21C5E1E89008B34D0 /* SettingsJoypadMainController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E66C1C11C5E1E89008B34D0 /* SettingsJoypadMainController.mm */; }; -<<<<<<< HEAD -======= 7E6BCCDB1D591DA900826CBD /* SettingsMouseController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E6BCCDA1D591DA900826CBD /* SettingsMouseController.m */; }; ->>>>>>> dev 7E6F37791CDB4E58005BA173 /* SettingsSelectPortViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E6F37781CDB4E58005BA173 /* SettingsSelectPortViewController.mm */; }; 7E770D791D109BF4000E5E1A /* UnappliedSettingLabelHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E770D781D109BF4000E5E1A /* UnappliedSettingLabelHandler.m */; }; 7E770D7C1D109DEC000E5E1A /* CoreSetting.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E770D7B1D109DEC000E5E1A /* CoreSetting.m */; }; @@ -222,10 +219,7 @@ 7E82CBF419E1C0BA0014AC6D /* m68k_intrf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0552BD010F3D797C005B30DF /* m68k_intrf.cpp */; }; 7E82CBF719E1CFE10014AC6D /* combined_modules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 054525AF106EC5550032FC41 /* combined_modules.cpp */; }; 7E922A801CF0AD6000D8006F /* touchstick.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E922A7F1CF0AD6000D8006F /* touchstick.mm */; }; -<<<<<<< HEAD -======= 7E98D5751D4E1241002EFBE0 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97855145153A454100580B91 /* savestate.cpp */; }; ->>>>>>> dev 7EA2BCA1188B0EF6003DCE10 /* SingleWindowAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 053368B113B1BDD60012D55A /* SingleWindowAppDelegate.mm */; }; 7EA2BCA2188B0EFF003DCE10 /* BaseEmulationViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 053368B613B1CC980012D55A /* BaseEmulationViewController.mm */; }; 7EA2BCA3188B0F02003DCE10 /* AnimatedImageSequenceView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 055FD7F813B45AAA00BB3F8B /* AnimatedImageSequenceView.mm */; }; @@ -1256,10 +1250,7 @@ BE951AFD1CA942B1008DD94B /* expansion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE951AFC1CA942B1008DD94B /* expansion.cpp */; }; BE951B001CA9442A008DD94B /* fsdb_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE951AFF1CA9442A008DD94B /* fsdb_unix.cpp */; }; BECE7E0C1CB3E12600EBFB40 /* hardfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BECE7E0B1CB3E12600EBFB40 /* hardfile.cpp */; }; -<<<<<<< HEAD -======= BEE4172E1D6AA35E00E3ED45 /* ScrollToRowHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4172D1D6AA35E00E3ED45 /* ScrollToRowHandler.m */; }; ->>>>>>> dev BEE41BC31B4782D200CE487D /* AdfImporter.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEE41BC11B4782D200CE487D /* AdfImporter.mm */; }; BEE41BC61B47836D00CE487D /* ZipArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEE41BC41B47836D00CE487D /* ZipArchive.mm */; }; BEE41BD31B4784AC00CE487D /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = BEE41BCB1B4784AC00CE487D /* zip.c */; }; @@ -1591,11 +1582,8 @@ 7E5AF61F1C444C83000BF5CB /* gear_unselected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gear_unselected.png; sourceTree = ""; }; 7E66C1C01C5E1E89008B34D0 /* SettingsJoypadMainController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsJoypadMainController.h; sourceTree = ""; }; 7E66C1C11C5E1E89008B34D0 /* SettingsJoypadMainController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsJoypadMainController.mm; sourceTree = ""; }; -<<<<<<< HEAD -======= 7E6BCCD91D591DA900826CBD /* SettingsMouseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMouseController.h; sourceTree = ""; }; 7E6BCCDA1D591DA900826CBD /* SettingsMouseController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsMouseController.m; sourceTree = ""; }; ->>>>>>> dev 7E6F37771CDB4E58005BA173 /* SettingsSelectPortViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsSelectPortViewController.h; sourceTree = ""; }; 7E6F37781CDB4E58005BA173 /* SettingsSelectPortViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsSelectPortViewController.mm; sourceTree = ""; }; 7E770D771D109BF4000E5E1A /* UnappliedSettingLabelHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnappliedSettingLabelHandler.h; sourceTree = ""; }; @@ -2150,11 +2138,8 @@ BE951AFE1CA942E5008DD94B /* picasso96.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picasso96.h; path = include/picasso96.h; sourceTree = ""; }; BE951AFF1CA9442A008DD94B /* fsdb_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fsdb_unix.cpp; sourceTree = ""; }; BECE7E0B1CB3E12600EBFB40 /* hardfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hardfile.cpp; sourceTree = ""; }; -<<<<<<< HEAD -======= BEE4172C1D6AA35E00E3ED45 /* ScrollToRowHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollToRowHandler.h; sourceTree = ""; }; BEE4172D1D6AA35E00E3ED45 /* ScrollToRowHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScrollToRowHandler.m; sourceTree = ""; }; ->>>>>>> dev BEE41BC11B4782D200CE487D /* AdfImporter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AdfImporter.mm; sourceTree = ""; }; BEE41BC21B4782D200CE487D /* AdfImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdfImporter.h; sourceTree = ""; }; BEE41BC41B47836D00CE487D /* ZipArchive.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ZipArchive.mm; sourceTree = ""; }; @@ -2840,28 +2825,17 @@ BEF413D11CA411CF00CCC1F5 /* HardDriveService.mm */, 7EDCD04D1C3C59420006EB50 /* JoypadMainSettingsController.h */, 7EDCD04E1C3C59420006EB50 /* JoypadMainSettingsController.mm */, -<<<<<<< HEAD - BEF413D01CA411CF00CCC1F5 /* HardDriveService.h */, - BEF413D11CA411CF00CCC1F5 /* HardDriveService.mm */, -======= 7EADD3141CB2FAA100136978 /* JoypadSelectionController.h */, 7EADD3151CB2FAA100136978 /* JoypadSelectionController.mm */, ->>>>>>> dev BE66229E1C32861C009C2809 /* KeyButtonConfiguration.h */, BE66229F1C32861C009C2809 /* KeyButtonConfiguration.m */, BE66229B1C3285B3009C2809 /* KeyButtonConfigurationController.h */, BE66229C1C3285B3009C2809 /* KeyButtonConfigurationController.m */, BE6622981C328442009C2809 /* KeyButtonManagementController.h */, BE6622991C328442009C2809 /* KeyButtonManagementController.mm */, -<<<<<<< HEAD - 7EF97ABB1A7586E7002CC332 /* SelectConfigurationViewController.h */, - 7EADD3141CB2FAA100136978 /* JoypadSelectionController.h */, - 7EADD3151CB2FAA100136978 /* JoypadSelectionController.mm */, -======= BEE4172C1D6AA35E00E3ED45 /* ScrollToRowHandler.h */, BEE4172D1D6AA35E00E3ED45 /* ScrollToRowHandler.m */, 7EF97ABB1A7586E7002CC332 /* SelectConfigurationViewController.h */, ->>>>>>> dev 7EF97ABC1A7586E7002CC332 /* SelectConfigurationViewController.mm */, 05D5233412E8030E007912AE /* SelectEffectController.h */, 05D5233512E8030E007912AE /* SelectEffectController.mm */, @@ -2879,17 +2853,12 @@ 7EC59ED11BAC52390097B87A /* SettingsJoypadStyle.mm */, 7EF076621B9B2C7A00224DF0 /* SettingsJoypadVpadController.h */, 7EF076631B9B2C7A00224DF0 /* SettingsJoypadVpadController.mm */, -<<<<<<< HEAD - 7EDA12161CDB39640002B670 /* SettingsSelectKeyViewController.h */, - 7EB0177F1B0921B000C74B9D /* SettingsSelectKeyViewController.mm */, -======= 7E6BCCD91D591DA900826CBD /* SettingsMouseController.h */, 7E6BCCDA1D591DA900826CBD /* SettingsMouseController.m */, 7EDA12161CDB39640002B670 /* SettingsSelectKeyViewController.h */, 7EB0177F1B0921B000C74B9D /* SettingsSelectKeyViewController.mm */, 7E6F37771CDB4E58005BA173 /* SettingsSelectPortViewController.h */, 7E6F37781CDB4E58005BA173 /* SettingsSelectPortViewController.mm */, ->>>>>>> dev 7EB017771B09164900C74B9D /* State.h */, 7EB017761B09164900C74B9D /* State.mm */, 7EB017741B09164900C74B9D /* StateFileManager.mm */, @@ -2900,11 +2869,8 @@ 7E770D781D109BF4000E5E1A /* UnappliedSettingLabelHandler.m */, 7EEFD2901BAC3DE300C7F247 /* VPadLeftOrRight.h */, BE6F9F611C4E2C420061B98C /* VPadLeftOrRight.mm */, -<<<<<<< HEAD -======= E937D8AE1CB58CE3008DCC27 /* VPadTouchOrGyro.h */, E937D8AF1CB58CE3008DCC27 /* VPadTouchOrGyro.mm */, ->>>>>>> dev ); name = Settings; sourceTree = ""; @@ -4881,19 +4847,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD -======= 7E98D5751D4E1241002EFBE0 /* savestate.cpp in Sources */, ->>>>>>> dev 7E4D0FBF1CF4E8F600758750 /* VirtualKeyboard.mm in Sources */, 7E82CBF719E1CFE10014AC6D /* combined_modules.cpp in Sources */, 7E82CBF419E1C0BA0014AC6D /* m68k_intrf.cpp in Sources */, 7E82CBF319E1C0A70014AC6D /* m68k_interface.cpp in Sources */, 7EC59ED21BAC52390097B87A /* SettingsJoypadStyle.mm in Sources */, -<<<<<<< HEAD - 7EA7D6F0187B47AE0092FC2F /* savestate.cpp in Sources */, -======= ->>>>>>> dev 7EA2BCA2188B0EFF003DCE10 /* BaseEmulationViewController.mm in Sources */, 7EB017711B09143000C74B9D /* SVProgressHUD.m in Sources */, 051B23B012C994BB000C2800 /* DisaSupport.cpp in Sources */, @@ -4986,10 +4945,7 @@ 978550DF153A3F2E00580B91 /* SDL.mm in Sources */, 978550E2153A3F2E00580B91 /* SDL_error.c in Sources */, 7E2EF0DD1D004B9500CDD9B9 /* iUAEApplication.mm in Sources */, -<<<<<<< HEAD -======= 7E6BCCDB1D591DA900826CBD /* SettingsMouseController.m in Sources */, ->>>>>>> dev BE2CA1E21C42219000B84C2C /* KeyButtonViewHandler.m in Sources */, BECE7E0C1CB3E12600EBFB40 /* hardfile.cpp in Sources */, BE951AF71CA93F86008DD94B /* scsi-none.cpp in Sources */, diff --git a/iUAEParents/MultiPeerConnectivityController.mm b/iUAEParents/MultiPeerConnectivityController.mm index bed5b51..f16d2f3 100644 --- a/iUAEParents/MultiPeerConnectivityController.mm +++ b/iUAEParents/MultiPeerConnectivityController.mm @@ -569,11 +569,8 @@ - (int) dpadstatetojoypadkey:(NSString *)direction hatstate:(TouchStickDPadState } else if(hat_state == DPadUpRight) { -<<<<<<< HEAD - if([direction isEqual:@"horizontal"]) -======= if([direction isEqual:@"vertical"]) ->>>>>>> dev + return BTN_UP; else return BTN_RIGHT; diff --git a/iUAEParents/Settings.h b/iUAEParents/Settings.h index 1c72dca..84330d0 100644 --- a/iUAEParents/Settings.h +++ b/iUAEParents/Settings.h @@ -45,13 +45,10 @@ static NSString *const kJoyStyleFourButton = @"FourButton"; @property (nonatomic, readonly, assign) BOOL DPadModeIsMotion; @property (nonatomic, readwrite, assign) BOOL gyroToggleUpDown; @property (nonatomic, readwrite, assign) float gyroSensitivity; -<<<<<<< HEAD -======= @property (nonatomic, readwrite, assign) BOOL LStickAnalogIsMouse; @property (nonatomic, readwrite, assign) BOOL RStickAnalogIsMouse; @property (nonatomic, readwrite, assign) BOOL useL2forMouseButton; @property (nonatomic, readwrite, assign) BOOL useR2forRightMouseButton; ->>>>>>> dev @property (nonatomic, readwrite, assign) NSUInteger controllersnextid; @property (nonatomic, readwrite, assign) NSArray *controllers; @property (nonatomic, readwrite, assign) NSInteger keyConfigurationCount; diff --git a/iUAEParents/Settings.mm b/iUAEParents/Settings.mm index 126b846..c6efa75 100644 --- a/iUAEParents/Settings.mm +++ b/iUAEParents/Settings.mm @@ -56,14 +56,11 @@ static NSString *const kGyroToggleUpDown = @"_gyroToggleUpDown"; static NSString *const kGyroSensitivity = @"_gyroSensitivity"; -<<<<<<< HEAD -======= static NSString *const kRstickmouseFlag = @"_rstickmouseflag"; static NSString *const kLstickmouseFlag = @"_lstickmouseflag"; static NSString *const kL2mouseFlag = @"_L2mouseFlag"; static NSString *const kR2mouseFlag = @"_R2mouseFlag"; ->>>>>>> dev static NSString *const kRomPath = @"romPath"; static NSString *const kDf1EnabledKey = @"df1Enabled"; static NSString *const kDf2EnabledKey = @"df2Enabled"; @@ -150,16 +147,11 @@ - (void)initializespecificsettings { self.gyroSensitivity = [self keyExists:kGyroSensitivity] ? self.gyroSensitivity : 0.1; self.controllersnextid = [self keyExists:kControllersNextIDKey] ? self.controllersnextid : 1; self.controllers = [self keyExists:kControllersKey] ? self.controllers : [NSArray arrayWithObjects:@1, nil]; -<<<<<<< HEAD - - -======= self.LStickAnalogIsMouse = [self keyExists:kLstickmouseFlag] ? self.LStickAnalogIsMouse : NO; self.RStickAnalogIsMouse = [self keyExists:kRstickmouseFlag] ? self.RStickAnalogIsMouse : NO; self.useL2forMouseButton = [self keyExists:kL2mouseFlag] ? self.useL2forMouseButton : NO; self.useR2forRightMouseButton = [self keyExists:kR2mouseFlag] ? self.useR2forRightMouseButton : NO; ->>>>>>> dev for(int i=1;i<=8;i++) { if(![self keyConfigurationforButton:BTN_A forController:i]) @@ -316,8 +308,7 @@ - (void)setGyroSensitivity:(float)gyroSensitivity { [self setFloat:gyroSensitivity forKey:kGyroSensitivity]; } -<<<<<<< HEAD -======= + - (BOOL)RStickAnalogIsMouse { return [self boolForKey:kRstickmouseFlag]; } @@ -353,7 +344,6 @@ - (void)setLStickAnalogIsMouse:(BOOL)lstickmouseFlag [self setBool:lstickmouseFlag forKey:kLstickmouseFlag]; } ->>>>>>> dev -(NSString *)keyConfigurationforButton:(int)bID forController:(int)cNumber { if(cNumber == 1) diff --git a/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.h b/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.h index bf76601..9051a0b 100644 --- a/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.h +++ b/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.h @@ -30,16 +30,8 @@ @property (readonly) BOOL buttonl2pressed; @property (readonly) BOOL buttonr1pressed; @property (readonly) BOOL buttonr2pressed; - -<<<<<<< HEAD - - - @property (readonly) int paused; - -======= @property (readonly) int paused; -(void)moveMouse:(NSTimer *)timer; ->>>>>>> dev @end diff --git a/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.mm b/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.mm index db087ce..b8b694e 100644 --- a/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.mm +++ b/libraries/sdl-mini/src/joystick/iOS/MFIControllerReaderView.mm @@ -1,8 +1,5 @@ // Created by Emufr3ak on 29.05.14. -<<<<<<< HEAD -======= // Changed By Emufr3ak on 21.08.16 ->>>>>>> dev // // iUAE is free software: you may copy, redistribute // and/or modify it under the terms of the GNU General Public License as @@ -26,10 +23,7 @@ #import "Settings.h" #import "SDL_events.h" #import "MultiPeerConnectivityController.h" -<<<<<<< HEAD -#import -======= extern "C" { #import "SDL_events.h" #import "SDL_mouse_c.h" @@ -48,17 +42,11 @@ static NSString *const kranalogStick = @"ranalogStick"; ->>>>>>> dev @implementation MFIControllerReaderView { int _button[9]; TouchStickDPadState _hat_statelast; TouchStickDPadState _hat_state; -<<<<<<< HEAD - MultiPeerConnectivityController *mpcController; - int _buttontoreleasehorizontal; - int _buttontoreleasevertical; - int _devCount; -======= + TouchStickDPadState _mlastHatstate; TouchStickDPadState _mHatstate; @@ -72,7 +60,6 @@ @implementation MFIControllerReaderView { int _mouseX; int _mouseY; NSTimer *_mouseTimer; ->>>>>>> dev } @@ -83,10 +70,6 @@ - (id)initWithFrame:(CGRect)frame _devCount = 0; _hat_state = DPadCenter; _buttonapressed = false; -<<<<<<< HEAD - //_thejoystick = &g_touchStick; -======= ->>>>>>> dev _hat_statelast = DPadCenter; mpcController = [MultiPeerConnectivityController getinstance]; @@ -96,9 +79,6 @@ - (id)initWithFrame:(CGRect)frame [self initNotifications]; [self initControllers]; -<<<<<<< HEAD - return self; -======= _settings = [[Settings alloc] init]; if(_settings.LStickAnalogIsMouse || _settings.RStickAnalogIsMouse) { @@ -112,7 +92,6 @@ - (id)initWithFrame:(CGRect)frame return self; ->>>>>>> dev } - (void)initNotifications { @@ -150,13 +129,10 @@ - (void) initControllers { } -<<<<<<< HEAD -======= -(void)moveMouse:(NSTimer *)timer { SDL_SendMouseMotion(NULL, SDL_MOTIONRELATIVE, _mouseX, _mouseY); } ->>>>>>> dev - (void)deviceConnected:(NSNotification *)devNotification { /* Make sure this is an MFI Controller */ @@ -183,12 +159,7 @@ - (void)deviceDisconnected:(NSNotification *)devNotification { - (void)handleinputbuttons:(int)buttonid forDeviceid:(NSString *)devID { -<<<<<<< HEAD - - _button[buttonid] = [mpcController handleinputbuttons:buttonid buttonstate:_button[buttonid] deviceid:devID]; - - NSLog(@"Buttonstate: %d",_button[buttonid]); -======= + if((buttonid == BTN_L2 && _settings.useL2forMouseButton == true) || (buttonid == BTN_R2 && _settings.useR2forRightMouseButton == true)) [self handleminputbuttons:(int)buttonid]; @@ -252,8 +223,7 @@ - (void) handlemhatstate:(float)xAxis yAxis:(float)yAxis { _mouseX = (int) (xAxis * MOUSESPEED); _mouseY = (int) (yAxis * MOUSESPEED) * -1; - ->>>>>>> dev + } - (void)controllerDisconnected:(EAAccessory *)btDevice { @@ -296,63 +266,6 @@ - (void)controllerDiscovered:(EAAccessory *)btDevice { else if(gamepad.controller.extendedGamepad.leftTrigger.isPressed != _button[BTN_L2]) [self handleinputbuttons: BTN_L2 forDeviceid:devID]; -<<<<<<< HEAD - if(gamepad.dpad.left.pressed || gamepad.controller.extendedGamepad.leftThumbstick.left.pressed) - { - if(gamepad.dpad.up.pressed) - { - _hat_state = DPadUpLeft; - } - else if(gamepad.dpad.down.pressed || gamepad.controller.extendedGamepad.leftThumbstick.down.pressed) - { - _hat_state = DPadDownLeft; - } - else - { - _hat_state = DPadLeft; - } - } - else if(gamepad.dpad.right.pressed || gamepad.controller.extendedGamepad.leftThumbstick.right.pressed) - { - if(gamepad.dpad.up.pressed || gamepad.controller.extendedGamepad.leftThumbstick.up.pressed) - { - _hat_state = DPadUpRight; - } - else if(gamepad.dpad.down.pressed || gamepad.controller.extendedGamepad.leftThumbstick.down.pressed) - { - _hat_state = DPadDownRight; - } - else - { - _hat_state = DPadRight; - } - } - else if(gamepad.dpad.up.pressed || gamepad.controller.extendedGamepad.leftThumbstick.up.pressed) - { - _hat_state = DPadUp; - } - else if(gamepad.dpad.down.pressed || gamepad.controller.extendedGamepad.leftThumbstick.down.pressed) - { - _hat_state = DPadDown; - } - else - { - _hat_state = DPadCenter; - } - - if (_hat_state != _hat_statelast) { - _hat_statelast = _hat_state; - - int buttonvertical = [mpcController dpadstatetojoypadkey:@"vertical" hatstate:_hat_state]; - int buttonhorizontal = [mpcController dpadstatetojoypadkey:@"horizontal" hatstate: _hat_state]; - - [mpcController handleinputdirections:_hat_state buttontoreleasevertical:_buttontoreleasevertical buttontoreleasehorizontal: _buttontoreleasehorizontal deviceid:devID]; - - _buttontoreleasevertical = buttonvertical; - _buttontoreleasehorizontal = buttonhorizontal; - } - -======= float dxValue = gamepad.dpad.xAxis.value; float dyValue = gamepad.dpad.yAxis.value; float alxValue = gamepad.controller.extendedGamepad.leftThumbstick.xAxis.value; @@ -370,7 +283,6 @@ - (void)controllerDiscovered:(EAAccessory *)btDevice { [self handlejhatstate:DPadCenter forDeviceid:devID]; [self handlemhatstate:0.00 yAxis:0.00]; } ->>>>>>> dev }; GCControllerDirectionPad *dpad = controller.gamepad.dpad; @@ -387,13 +299,10 @@ - (void)controllerDiscovered:(EAAccessory *)btDevice { -(void)dealloc { -<<<<<<< HEAD -======= if (_mouseTimer) { [_mouseTimer release]; } ->>>>>>> dev [super dealloc]; } diff --git a/uae4all_gp2x_0.7.2a/src/custom.cpp b/uae4all_gp2x_0.7.2a/src/custom.cpp index 67d4771..64a686b 100755 --- a/uae4all_gp2x_0.7.2a/src/custom.cpp +++ b/uae4all_gp2x_0.7.2a/src/custom.cpp @@ -2652,11 +2652,7 @@ static _INLINE_ uae_u16 JOY0DAT (void) if(bDontCareMouseIUAE) //mithrendil return joy0dir; -<<<<<<< HEAD - -======= ->>>>>>> dev return ((uae_u8)mouse_x) + ((uae_u16)mouse_y << 8) + joy0dir; } diff --git a/uae4all_gp2x_0.7.2a/src/filesys.cpp b/uae4all_gp2x_0.7.2a/src/filesys.cpp index 369c4a9..3578206 100755 --- a/uae4all_gp2x_0.7.2a/src/filesys.cpp +++ b/uae4all_gp2x_0.7.2a/src/filesys.cpp @@ -2923,13 +2923,8 @@ static int handle_packet (Unit *unit, dpacket pck) case ACTION_FIND_WRITE: action_find_write (unit, pck); break; case ACTION_FIND_OUTPUT: action_find_output (unit, pck); break; case ACTION_END: action_end (unit, pck); break; -<<<<<<< HEAD - case ACTION_READ: action_read (unit, pck); break; //gui_data.hdled = HDLED_READ; break; // stoens: missing hd led support - case ACTION_WRITE: action_write (unit, pck); break; //gui_data.hdled = HDLED_WRITE; break; -======= case ACTION_READ: action_read (unit, pck); gui_data.hdled = HDLED_READ; break; case ACTION_WRITE: action_write (unit, pck); gui_data.hdled = HDLED_WRITE; break; ->>>>>>> dev case ACTION_SEEK: action_seek (unit, pck); break; case ACTION_SET_PROTECT: action_set_protect (unit, pck); break; case ACTION_SET_COMMENT: action_set_comment (unit, pck); break; diff --git a/uae4all_gp2x_0.7.2a/src/hardfile.cpp b/uae4all_gp2x_0.7.2a/src/hardfile.cpp index b681ab0..bd33954 100755 --- a/uae4all_gp2x_0.7.2a/src/hardfile.cpp +++ b/uae4all_gp2x_0.7.2a/src/hardfile.cpp @@ -72,11 +72,7 @@ static uae_u32 hardfile_beginio (void) /* put_byte (tmp1 + 30, get_byte (tmp1 + 30) & ~1);*/ switch (tmp2) { case CMD_READ: -<<<<<<< HEAD - //gui_data.hdled = HDLED_READ; // stoens: missing hd led support -======= gui_data.hdled = HDLED_READ; ->>>>>>> dev dataptr = get_long (tmp1 + 40); if (dataptr & 1) @@ -105,13 +101,7 @@ static uae_u32 hardfile_beginio (void) case CMD_WRITE: case 11: /* Format */ -<<<<<<< HEAD - //gui_data.hdled = HDLED_WRITE; // stoens: missing hd led support - -======= gui_data.hdled = HDLED_WRITE; - ->>>>>>> dev dataptr = get_long (tmp1 + 40); if (dataptr & 1) goto bad_command; diff --git a/uae4all_gp2x_0.7.2a/src/memory.cpp b/uae4all_gp2x_0.7.2a/src/memory.cpp index 8d9dc09..1756b65 100644 --- a/uae4all_gp2x_0.7.2a/src/memory.cpp +++ b/uae4all_gp2x_0.7.2a/src/memory.cpp @@ -42,11 +42,7 @@ int ersatzkickfile = 0; uae_u32 allocated_chipmem=0; uae_u32 allocated_fastmem=0; uae_u32 allocated_bogomem=0; -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev uae_u32 allocated_gfxmem=0; uae_u32 allocated_z3fastmem=0; uae_u32 allocated_a3000mem=0; @@ -107,11 +103,7 @@ int REGPARAM2 dummy_check (uaecptr addr, uae_u32 size) return 0; } -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev /* A3000 "motherboard resources" bank. */ static uae_u32 mbres_lget (uaecptr) REGPARAM; static uae_u32 mbres_wget (uaecptr) REGPARAM; @@ -349,11 +341,7 @@ uae_u8 REGPARAM2 *bogomem_xlate (uaecptr addr) return bogomemory + addr; } -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev /* A3000 motherboard fast memory */ /*static uae_u8 *a3000memory; @@ -693,11 +681,7 @@ addrbank dummy_bank = { }; -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev addrbank mbres_bank = { mbres_lget, mbres_wget, mbres_bget, mbres_lput, mbres_wput, mbres_bput, @@ -720,11 +704,7 @@ addrbank bogomem_bank = { }; -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev /*addrbank a3000mem_bank = { a3000mem_lget, a3000mem_wget, a3000mem_bget, a3000mem_lput, a3000mem_wput, a3000mem_bput, @@ -1096,11 +1076,8 @@ void memory_reset (void) map_banks (&clock_bank, 0xDC, 1, 0); -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev + /*if (a3000memory != 0) { map_banks (&a3000mem_bank, a3000mem_start >> 16, allocated_a3000mem >> 16, allocated_a3000mem); @@ -1146,11 +1123,8 @@ void memory_init (void) { allocated_chipmem = 0; allocated_bogomem = 0; -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= + #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev allocated_a3000mem = 0; //a3000memory = 0; #endif @@ -1173,11 +1147,8 @@ void memory_init (void) void memory_cleanup (void) { -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= + #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev /*if (a3000memory) mapped_free (a3000memory);*/ #endif @@ -1190,11 +1161,8 @@ void memory_cleanup (void) if (chipmemory) mapped_free (chipmemory); -<<<<<<< HEAD -#if !( defined(PANDORA) || defined(ANDROIDSDL) ) -======= + #if !( defined(PANDORA) || defined(ANDROIDSDL) || defined(IPHONE) ) ->>>>>>> dev //a3000memory = 0; #endif bogomemory = 0;