Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: Disable sensors when emulation is paused

Browse Source
This commit is contained in:
SachinVin 2020-06-13 23:00:45 +05:30 committed by bunnei
parent 337da335d6
commit 428b0910ef
5 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/jni/input_manager.cpp
View File

@ -307,6 +307,10 @@ std::string GenerateAnalogParamPackage(int axis_id) {
return param.Serialize();
}
NDKMotionFactory* NDKMotionHandler() {
return motion.get();
}
void Init() {
button = std::make_shared<ButtonFactory>();
analog = std::make_shared<AnalogFactory>();

4
src/android/app/src/main/jni/input_manager.h
View File

@ -8,6 +8,7 @@
#include <memory>
#include <string>
#include "core/frontend/input.h"
#include "jni/ndk_motion.h"
namespace InputManager {
@ -129,6 +130,9 @@ ButtonFactory* ButtonHandler();
/// Gets the gamepad analog device factory.
AnalogFactory* AnalogHandler();
/// Gets the NDK Motion device factory.
NDKMotionFactory* NDKMotionHandler();
std::string GenerateButtonParamPackage(int type);
std::string GenerateAnalogButtonParamPackage(int axis, float axis_val);

2
src/android/app/src/main/jni/native.cpp
View File

@ -300,11 +300,13 @@ void Java_org_citra_citra_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env,
[[maybe_unused]] jclass clazz) {
pause_emulation = false;
running_cv.notify_all();
InputManager::NDKMotionHandler()->EnableSensors();
}
void Java_org_citra_citra_1emu_NativeLibrary_PauseEmulation(JNIEnv* env,
[[maybe_unused]] jclass clazz) {
pause_emulation = true;
InputManager::NDKMotionHandler()->DisableSensors();
}
void Java_org_citra_citra_1emu_NativeLibrary_StopEmulation(JNIEnv* env,

78
src/android/app/src/main/jni/ndk_motion.cpp
View File

@ -16,6 +16,8 @@ using Common::Vec3;
}
class NDKMotion final : public Input::MotionDevice {
std::chrono::microseconds update_period;
ASensorManager* sensor_manager = nullptr;
ALooper* looper = nullptr;
ASensorEventQueue* event_queue;
@ -60,7 +62,7 @@ class NDKMotion final : public Input::MotionDevice {
return out;
}
void Construct(std::chrono::microseconds update_period) {
void Construct() {
sensor_manager = ASensorManager_getInstanceForPackage("org.citra.citra_emu");
looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
if (!sensor_manager || !looper) {
@ -72,21 +74,8 @@ class NDKMotion final : public Input::MotionDevice {
LOG_ERROR(Input, "Could not create sensor event queue");
return;
}
const auto init_sensor = [this, update_period](int sensor_type) {
ASensorRef sensor = ASensorManager_getDefaultSensor(sensor_manager, sensor_type);
if (!sensor) {
LOG_ERROR(Input, "Could not find sensor of type {}", sensor_type);
return;
}
int error = ASensorEventQueue_registerSensor(
event_queue, sensor,
std::max(ASensor_getMinDelay(sensor), static_cast<int>(update_period.count())), 0);
if (error < 0)
LOG_ERROR(Input, "Registering sensor returned error code {}", error);
};
init_sensor(ASENSOR_TYPE_ACCELEROMETER);
init_sensor(ASENSOR_TYPE_GYROSCOPE);
EnableSensors();
}
void Destruct() {
@ -117,10 +106,11 @@ class NDKMotion final : public Input::MotionDevice {
}
public:
NDKMotion(std::chrono::microseconds update_period, bool asynchronous = false) {
NDKMotion(std::chrono::microseconds update_period_, bool asynchronous = false)
: update_period(update_period_) {
if (asynchronous) {
poll_thread = std::thread([this, update_period] {
Construct(update_period);
poll_thread = std::thread([this] {
Construct();
auto start = std::chrono::high_resolution_clock::now();
while (!stop_polling) {
Update();
@ -129,7 +119,7 @@ public:
Destruct();
});
} else {
Construct(update_period);
Construct();
}
}
@ -148,11 +138,59 @@ public:
}
return {acceleration, rotation};
}
void EnableSensors() {
const auto init_sensor = [this](int sensor_type) {
ASensorRef sensor = ASensorManager_getDefaultSensor(sensor_manager, sensor_type);
if (!sensor) {
LOG_ERROR(Input, "Could not find sensor of type {}", sensor_type);
return;
}
int error = ASensorEventQueue_registerSensor(
event_queue, sensor,
std::max(ASensor_getMinDelay(sensor), static_cast<int>(update_period.count())), 0);
if (error < 0)
LOG_ERROR(Input, "Registering sensor returned error code {}", error);
};
LOG_TRACE(Input, "Enabling sensors..");
init_sensor(ASENSOR_TYPE_ACCELEROMETER);
init_sensor(ASENSOR_TYPE_GYROSCOPE);
}
void DisableSensors() {
const auto disable_sensor = [this](int sensor_type) {
ASensorRef sensor = ASensorManager_getDefaultSensor(sensor_manager, sensor_type);
if (!sensor) {
LOG_ERROR(Input, "Could not find sensor of type {}", sensor_type);
return;
}
int error = ASensorEventQueue_disableSensor(event_queue, sensor);
if (error < 0)
LOG_ERROR(Input, "Disabling sensor returned error code {}", error);
};
LOG_TRACE(Input, "Disabling sensors..");
disable_sensor(ASENSOR_TYPE_ACCELEROMETER);
disable_sensor(ASENSOR_TYPE_GYROSCOPE);
}
};
std::unique_ptr<Input::MotionDevice> NDKMotionFactory::Create(const Common::ParamPackage& params) {
std::chrono::milliseconds update_period{params.Get("update_period", 4)};
return std::make_unique<NDKMotion>(update_period);
std::unique_ptr<NDKMotion> ndk_motion = std::make_unique<NDKMotion>(update_period);
ndk_motion_device = ndk_motion.get();
return std::move(ndk_motion);
}
void NDKMotionFactory::EnableSensors() {
if(ndk_motion_device)
ndk_motion_device->EnableSensors();
}
void NDKMotionFactory::DisableSensors() {
if(ndk_motion_device)
ndk_motion_device->DisableSensors();
}
} // namespace InputManager

6
src/android/app/src/main/jni/ndk_motion.h
View File

@ -18,5 +18,11 @@ public:
* Creates a motion device that obtains data from device sensors
*/
std::unique_ptr<Input::MotionDevice> Create(const Common::ParamPackage& params) override;
void EnableSensors();
void DisableSensors();
private:
NDKMotion* ndk_motion_device;
};
} // namespace InputManager