summaryrefslogtreecommitdiff
path: root/macosx/PcsxrController.m
Commit message (Collapse)AuthorAgeFilesLines
* OS X: Move source files to their own folder.SND\MaddTheSane_cp2014-07-201-974/+0
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90999 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* OS X:SND\MaddTheSane_cp2014-03-281-2/+3
| | | | | | | Tell PCSX-R to push the save state status text to the GUI after emulation resumes. Tweak the networking a small bit. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89708 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* OS X:SND\MaddTheSane_cp2014-01-121-8/+12
| | | | | | Use createDirectoryAtURL:… instead of createDirectoryAtPath:… where appropriate. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88276 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* OS X:SND\MaddTheSane_cp2014-01-011-1/+1
| | | | | | Fixing a copy-paste error. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88208 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* OS X:SND\MaddTheSane_cp2013-12-301-1/+53
| | | | | | Check to see if a BIOS file has been passed to us, and ask if the user wants to move or copy the BIOS over. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88203 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Better checking if we are launched from the Finder if we are on Mavericks. ↵SND\MaddTheSane_cp2013-12-301-29/+34
| | | | | | Code adapted from the 1.2 fork of SDL. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88202 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Getting rid of a duplicate localization function.SND\MaddTheSane_cp2013-12-041-1/+1
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88054 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Removing old, outdated comments.SND\MaddTheSane_cp2013-12-021-1/+0
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88034 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Fixing a bug I introduced.SND\MaddTheSane_cp2013-10-051-2/+2
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87355 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Minor fixes and improvements on OS X code.SND\MaddTheSane_cp2013-10-041-8/+19
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87354 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Take into account if a user closed the emulator window before a new CD ↵SND\MaddTheSane_cp2013-09-221-1/+18
| | | | | | became available on OS X. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87257 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Updating the Info.plist files.SND\MaddTheSane_cp2013-09-171-6/+0
| | | | | | Don't deny directories being open, just in case we get to support UTIs that are OS X packages. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87222 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Wait for a new physical CD to be inserted when ejecting the CD on OS X.SND\MaddTheSane_cp2013-09-161-15/+60
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87220 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Changing a few Objective C classes to have their ivars hidden.SND\MaddTheSane_cp2013-09-131-1/+4
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87167 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Convert Objective-C code to modern syntax, mainly for the NSDictionaries.SND\MaddTheSane_cp2013-09-101-47/+38
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87115 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Remove 32-bit support on OS X.SND\MaddTheSane_cp2013-09-101-36/+5
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87114 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* OS X:SND\MaddTheSane_cp2013-08-241-4/+4
| | | | | | | Replace CFStringCreateByCombiningStrings with NSArray's componentsJoinedByString:. Moving some class interfaces out of CheatController.h to CheatController.m git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86897 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Messing with the order of arguments of the LaunchArg class in OS X.SND\MaddTheSane_cp2013-08-221-23/+23
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86847 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Fix a problem if the memory cards couldn't be found. This fixes the plug-ins ↵SND\MaddTheSane_cp2013-08-101-5/+24
| | | | | | in the preferences window not popping up. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86611 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Some work on OS X's cheat interface.SND\MaddTheSane_cp2013-08-011-1/+3
| | | | | | | Use .cht as the file extension for cheats. Create a file handler for cheat files. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86364 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Minor changes on OS X code.SND\MaddTheSane_cp2013-07-241-1/+1
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86216 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Remvoing SysPrintfs that I missed from Cocoa code the last time I did this.SND\MaddTheSane_cp2013-07-111-1/+1
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85968 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Revert some SysPrintfs in OS X to NSLogs.SND\MaddTheSane_cp2013-07-111-14/+3
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85963 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* minor code tweaks.SND\MaddTheSane_cp2013-07-101-13/+24
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85949 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Some more work on PCSXR's logging on OS X.SND\MaddTheSane_cp2013-07-091-0/+5
| | | | | | More fiddling with the configuration window. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85935 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Changing a lot of NSLogs to SysPrintf on OS X's PCSXR.SND\MaddTheSane_cp2013-07-091-23/+27
| | | | | | | | | Enable the emulog on OS X debug, and have create and use a log in ~/Library/Logs/PCSXR. Delete the hack that enabled PCSXR logs to go to the console in debug mode. Use modern syntax to create static NSArrays (and retain them in non-ARC code). Simplify the pauseSafeWithBlock to just create a new dispatch queue and run pauseSafe on the queue. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85931 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Have the arguments passed to the OS X app be done in a specific order, so ↵SND\MaddTheSane_cp2013-07-081-41/+80
| | | | | | i.e. you don't try to load a memory card after the emulator has started, or loading a freeze state before the emulator has started. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85919 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Clang apparently doesn't respond to -falign-loops or -finline-limit. ↵SND\MaddTheSane_cp2013-07-081-5/+5
| | | | | | | | Removing them from OS X project files. Quiet some warnings about implicit conversion from 64-bit integer to 32-bit in the main app, but only the Cocoa parts. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85897 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Rewriting the memory card management on OS X. It's lacking copy capability ↵SND\MaddTheSane_cp2013-07-081-3/+2
| | | | | | right now, though. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85886 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Moving the memory card manager to the preferences window.SND\MaddTheSane_cp2013-07-061-5/+0
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85870 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Minor OS X changes.SND\MaddTheSane_cp2013-07-061-1/+1
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85869 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Get rid of the seperate ARCBridge headers.SND\MaddTheSane_cp2013-07-051-1/+1
| | | | | | | Set the mime type on the InfoPlist.strings to be text. Why were we using sprintf with NSStrings? NSString does have methods for doing what we need. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85868 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Change some +stringWithCString and -initWithCString:encoding: to modern ↵SND\MaddTheSane_cp2013-07-051-1/+1
| | | | | | | | | | Objective-C syntax. Change the encoding of a couple of info.plists to UTF-8, otherwise Xcode was complaining. Removing some extra line breaks on OS X code. Other minor changes. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85867 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Making the SIO plug-ins work on OS X.SND\MaddTheSane_cp2013-07-051-0/+1
| | | | | | | Setting the deployment target on the SIO plug-in be set to 10.7, since we don't we have a 10.6 version of PCSXR that can use it. Adding Xcode config files. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85826 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* get rid of extra, blank lines on OS X.SND\MaddTheSane_cp2013-07-041-1/+0
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85818 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Even more work on the memory card management.SND\MaddTheSane_cp2013-06-261-5/+19
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85558 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Handle getting passed "files" that are actually command line options. This ↵SND\MaddTheSane_cp2013-06-221-0/+5
| | | | | | has the side effect of rejecting nonexistant files as well. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85491 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Minor spacing changes.SND\MaddTheSane_cp2013-06-221-8/+29
| | | | | | | | Enable logging in the debug build. Warn if we are passed multiple memory cards of the same type from the command line. Add a common method to set up the emulation thread. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85489 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Ignore files passed via the command line if we're parsing.SND\MaddTheSane_cp2013-06-221-52/+108
| | | | | | | Calls to GUI functions should happen on the main thread. Put the [NSApp presentError:] in a block to the main thread. Put some bools in PcsxrController inside a struct with a size of 1. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85488 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Adding some rudimentary command line support for OS XSND\MaddTheSane_cp2013-06-221-0/+157
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85486 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Make OS X use LidInterrupt.SND\MaddTheSane_cp2013-06-201-4/+5
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85469 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Apply patch 13980, with fixes to get it working properly. This allows a ↵SND\MaddTheSane_cp2013-03-031-3/+23
| | | | | | cheat interface for OS X. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@83306 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Only run the url if the emulator is running if we are using an ISO.SND\MaddTheSane_cp2013-03-021-2/+6
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@83303 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* sio;SND\edgbla_cp2013-02-141-1/+1
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82898 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Make sPluginList in PluginList.m unsafe-unretained so we can properly free ↵SND\MaddTheSane_cp2013-01-141-7/+5
| | | | | | | | | it when other sources are done with it. I didn't notice that the OS X app controller had a PluginList instance variable: use that instead of calling +[PluginList list]. A few other minor changes. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82281 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Disable the dynarec core on OS X i386. It will still run in 64-bit mode.SND\MaddTheSane_cp2013-01-101-1/+8
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82185 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Use strlcpy on OS X code.SND\MaddTheSane_cp2013-01-101-24/+37
| | | | | | > Better handling of the net system on OS X. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82182 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Use ARC in 64-bit mode on the Mac.SND\MaddTheSane_cp2013-01-091-12/+21
| | | | | | | | | | Register when we drag a disc image (or double click) to Pcsxr in the recent menu. Comment out ReleasePlugins() in SysClose: it was causing a pointer to be released twice when you changed a plug-in (specifically, the GPU). Cleaning up the Recent items code. One notable case is only releasing objects we have ownership of (this is pointless in ARC, but necessary in 32-bit code). Had to rewrite -[PluginList setActivePlugin:forType:] because the previous version wasn't ARC-friendly. If we select a disc while the emulator is running, load the disc into the current session. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82136 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Making PCSX-R for Mac handle the added disc image formats.SND\MaddTheSane_cp2013-01-081-78/+3
| | | | | | Getting rid of unneeded .cue to .bin handling code. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82120 e17a0e51-4ae3-4d35-97c3-1a29b211df97
* Setting end-of-line metadata.SND\MaddTheSane_cp2012-12-241-0/+0
| | | | git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81971 e17a0e51-4ae3-4d35-97c3-1a29b211df97