Revert "improve reliability of loading and saving"

This reverts commit 259102d.

Author: Gabriel O'Flaherty-Chan

gambatte_watchOS/GameCore.h

@@ -57,7 +57,8 @@ static int const kScreenHeight = 144;
 @property (strong, nonatomic) NSURL *workingDirectory;
 @property (nonatomic, strong) void (^didRender)(uint32_t *);
 @property (nonatomic) uint32_t *activeInput;
-@property (nonatomic) BOOL paused;
+
+@property (nonatomic) BOOL enableFrameSkip;
 
 - (void)startEmulation;
 - (void)stopEmulation;

gambatte_watchOS/GameCore.mm

@@ -54,11 +54,23 @@ @implementation GameCore {
 	uint32_t *videoBuffer;
 	uint32_t *unusedBuffer;
 	NSTimer *updateTimer;
+	BOOL running;
+}
+
+- (instancetype)init
+{
+	self = [super init];
+	if (self) {
+		videoBuffer = (uint32_t *)malloc(kScreenWidth * kScreenHeight * 4);
+		unusedBuffer = (uint32_t *)malloc(2064 * 2 * 4);
+	}
+	return self;
 }
 
 - (void)dealloc
 {
-	[self stopEmulation];
+	free(videoBuffer);
+	free(unusedBuffer);
 }
 
 - (void)loadFileAtPath:(NSString *)path success:(void (^)(GameCore * _Nonnull))success failure:(void (^)(NSError * _Nonnull))failure
@@ -87,14 +99,10 @@ - (void)loadFileAtPath:(NSString *)path success:(void (^)(GameCore * _Nonnull))s
 - (void)startEmulation
 {
 	// Using a Timer instead to trigger the game loop is slower, but ensures all frames are rendered
-	// TODO use enableFrameSkip property to switch betwen timer and NSThread
 //	NSTimeInterval interval = 1 / (frameInterval * 0.5);
 //	updateTimer = [NSTimer scheduledTimerWithTimeInterval:interval target:self selector:@selector(runGameLoop) userInfo:nil repeats:YES];
 
-	videoBuffer = (uint32_t *)malloc(kScreenWidth * kScreenHeight * 4);
-	unusedBuffer = (uint32_t *)malloc(2064 * 2 * 4);
-	
-	_paused = NO;
+	running = YES;
 	gameCoreThread = [[NSThread alloc] initWithTarget:self selector:@selector(runGameLoop) object:nil];
 	gameCoreThread.name = @"Giovanni Game Core";
 	gameCoreThread.qualityOfService = NSQualityOfServiceUserInteractive;
@@ -107,12 +115,12 @@ - (void)runGameLoop
 
 	OESetThreadRealtime(1. / (1. * frameInterval), .007, .03);
 
-	while (!_paused) { @autoreleasepool {
+	while (running) {
+		@autoreleasepool {
 		size_t samples = 2064;
-
+		
 		while (gb.runFor((gambatte::uint_least32_t *)videoBuffer, kScreenWidth,
-						 (gambatte::uint_least32_t *)unusedBuffer, samples) == -1 && !_paused) {
-			
+						 (gambatte::uint_least32_t *)unusedBuffer, samples) == -1 && running) {
 		}
 
 		NSTimeInterval advance = 1.0 / (1. * frameInterval);
@@ -131,28 +139,27 @@ - (void)runGameLoop
 		if (_didRender != nil) {
 			_didRender(videoBuffer);
 		}
-	}}
+	}
+}
 }
 
 - (void)stopEmulation
 {
-	if (gameCoreThread == nil) {
-		return;
-	}
-	
 	gb.saveSavedata();
-	free(videoBuffer);
-	free(unusedBuffer);
-
 	//	[updateTimer invalidate];
-	_paused = YES;
+	running = NO;
 	[gameCoreThread cancel];
-	gameCoreThread = nil;
 }
 
 - (void)resetEmulation
 {
 	[self stopEmulation];
+	
+	free(videoBuffer);
+	free(unusedBuffer);
+	videoBuffer = (uint32_t *)malloc(kScreenWidth * kScreenHeight * 4);
+	unusedBuffer = (uint32_t *)malloc(2064 * 2 * 4);
+	
 	gb.reset();
 	[self startEmulation];
 }
@@ -179,8 +186,7 @@ - (void)saveToSlot:(NSInteger)slot
 {
 	gb.saveSavedata();
 	gb.selectState(slot);
-	int saved = gb.saveState(0, 0);
-	if (saved != 1) {
+	if (!gb.saveState((gambatte::uint_least32_t *)videoBuffer, kScreenWidth)) {
 		NSLog(@"Error saving to slot %@", @(slot));
 	}
 }

gambatte_watchOS/GameLoader.swift

@@ -64,16 +64,8 @@ public class GameLoader: NSObject {
 		var reason: String
 	}
 
-	var core: GameCore? {
-		didSet {
-			if let oldCore = oldValue {
-				oldCore.stopEmulation()
-			}
-			if let newCore = core {
-				newCore.startEmulation()
-			}
-		}
-	}
+	let core: GameCore
+	let documentDirectory: URL
 	let session = WCSession.default()
 	var activationState: WCSessionActivationState = .notActivated
 
@@ -84,6 +76,12 @@ public class GameLoader: NSObject {
 	static let shared = GameLoader()
 
 	private override init() {
+		
+		documentDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+		
+		core = GameCore()
+		core.workingDirectory = documentDirectory
+		
 		super.init()
 	}
 
@@ -104,13 +102,6 @@ public class GameLoader: NSObject {
 		}
 	}
 
-	func createCore() -> GameCore {
-		let documentDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-		let core = GameCore()
-		core.workingDirectory = documentDirectory
-		return core
-	}
-	
 	func requestGames(_ success: @escaping (([Game]) -> Void), failure: @escaping ((Error) -> Void)) {
 
 		let replyHandler: (([String: Any]) -> Void) = { (response) in
@@ -128,10 +119,7 @@ public class GameLoader: NSObject {
 	func loadGame(_ game: Game, _ success: @escaping ((GameCore) -> Void), failure: @escaping ((Error) -> Void)) {
 
 		gameResponse = { [unowned self] (dataPath) in
-			
-			let core = self.createCore()
-			self.core = core
-			core.loadFile(atPath: dataPath, success: { (core) in
+			self.core.loadFile(atPath: dataPath, success: { (core) in
 				UserDefaults.standard.lastPlayed = game
 				success(core)
 			}, failure: failure)

giovanni WatchKit Extension/GameplayController.swift

@@ -84,7 +84,7 @@ class GameplayController: WKInterfaceController {
 	@IBAction func BSelected()		{ pressInputOnce(.B) }
 
 	@IBAction func resetSelected() {
-		loader.core?.resetEmulation()
+		core?.resetEmulation()
 	}
 
 	@IBOutlet var ALabel: WKInterfaceLabel!
@@ -94,7 +94,7 @@ class GameplayController: WKInterfaceController {
 
 	func updateDirectionalInputs() {
 
-		guard let core = loader.core else {
+		guard let core = core else {
 			DPadLabel.setText(GameInput(rawValue: 0).displaySymbol)
 			return
 		}
@@ -126,6 +126,18 @@ class GameplayController: WKInterfaceController {
 	}
 
 	let loader = GameLoader.shared
+	var core: GameCore? {
+		didSet {
+			if let core = core {
+				core.didRender = { [weak self] buffer in
+					guard let s = self else {
+						return
+					}
+					s.updateSnapshotIfNeeded(with: buffer)
+				}
+			}
+		}
+	}
 
 	var tick = 0
 	let refreshRate = 20;
@@ -139,14 +151,8 @@ class GameplayController: WKInterfaceController {
 		}
 
 		let success: ((GameCore) -> Void) = { [unowned self] (core) in
-			core.didRender = { [weak self] buffer in
-				guard let s = self else {
-					return
-				}
-				s.updateSnapshotIfNeeded(with: buffer)
-			}
+			self.core = core
 		}
-		
 		let failureHandler: ((Error) -> Void) = { [unowned self] (error) in
 			print("error loading game \(error)")
 			self.presentAlert(withTitle: "There was an issue loading this game", message: nil, preferredStyle: .alert, actions: [
@@ -166,9 +172,9 @@ class GameplayController: WKInterfaceController {
 	override func didAppear() {
 		super.didAppear()
 
-		if let core = loader.core {
+		if let core = core {
+			core.startEmulation()
 			core.load(fromSlot: 0)
-			core.paused = false
 		}
 
 		crownSequencer.delegate = self
@@ -178,25 +184,25 @@ class GameplayController: WKInterfaceController {
 	override func didDeactivate() {
 		super.didDeactivate()
 
-		if let core = loader.core {
+		if let core = core {
 			core.save(toSlot: 0)
-			core.paused = true;
+			core.stopEmulation()
 		}
 
 		crownSequencer.delegate = nil
 		crownSequencer.resignFocus()
 	}
-
+	
 	var lastSnapshot: UIImage?
 
 	func updateSnapshotIfNeeded(with buffer: UnsafeMutablePointer<UInt32>) {
 
 		tick += 1
-		if tick > refreshRate || loader.core == nil {
+		if tick > refreshRate || core == nil {
 			return
 		}
 
-		let snapshot = loader.core!.createSnapshot(from: buffer)
+		let snapshot = core!.createSnapshot(from: buffer)
 
 		// compare before updating. Not sure if faster.
 //		if let lhs = lastSnapshot, let rhs = snapshot, lhs.equalPixels(to: rhs) {
@@ -224,7 +230,7 @@ class GameplayController: WKInterfaceController {
 
 	func setInputSelected(_ input: GameInput, selected: Bool) {
 
-		if let core = loader.core {
+		if let core = core {
 			core.update(input, selected: selected)
 		}
 

giovanni WatchKit Extension/LibraryController.swift

@@ -60,11 +60,6 @@ class LibraryController: WKInterfaceController {
 //		if let game = UserDefaults.standard.lastPlayed {
 //			presentGame(game)
 //		}
-		
-		let loader = GameLoader.shared
-		if loader.core != nil {
-			loader.core = nil
-		}
 	}
 
 	func reloadGames() {