[Scummvm-git-logs] scummvm master -> 6da591df88181a0edfc88973e959acb4abb6b856

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4a9446490a IOS: Disable idle timer while an engine is running
6da591df88 Merge pull request #853 from criezy/ios-no-sleep


Commit: 4a9446490af0b8018b4999c8fa11a6d5ec4ea980
    https://github.com/scummvm/scummvm/commit/4a9446490af0b8018b4999c8fa11a6d5ec4ea980
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-10-20T22:38:14+01:00

Commit Message:
IOS: Disable idle timer while an engine is running

Changed paths:
    backends/platform/ios7/ios7_osys_main.h
    backends/platform/ios7/ios7_osys_video.mm



diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index 174c160..0f89cf7 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -123,6 +123,9 @@ public:
 	static OSystem_iOS7 *sharedInstance();
 
 	virtual void initBackend();
+	
+	virtual void engineInit();
+	virtual void engineDone();
 
 	virtual bool hasFeature(Feature f);
 	virtual void setFeatureState(Feature f, bool enable);
diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 6784cf4..5370ef0 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -61,6 +61,18 @@ void OSystem_iOS7::fatalError() {
 	}
 }
 
+void OSystem_iOS7::engineInit() {
+	EventsBaseBackend::engineInit();
+	// Prevent the device going to sleep during game play (and in particular cut scenes)
+	[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+}
+
+void OSystem_iOS7::engineDone() {
+	EventsBaseBackend::engineDone();
+	// Allow the device going to sleep if idle while in the Launcher
+	[[UIApplication sharedApplication] setIdleTimerDisabled:NO];
+}
+
 void OSystem_iOS7::initVideoContext() {
 	_videoContext = [[iOS7AppDelegate iPhoneView] getVideoContext];
 }


Commit: 6da591df88181a0edfc88973e959acb4abb6b856
    https://github.com/scummvm/scummvm/commit/6da591df88181a0edfc88973e959acb4abb6b856
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-12T12:20:17+01:00

Commit Message:
Merge pull request #853 from criezy/ios-no-sleep

IOS: Disable idle timer while an engine is running

Changed paths:
    backends/platform/ios7/ios7_osys_main.h
    backends/platform/ios7/ios7_osys_video.mm