Revert "Merge branch 'master' into 'dev'"
This reverts merge request !17
This commit is contained in:
parent
fdadc50fff
commit
cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project
|
||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
|
@ -21,7 +21,7 @@ public:
|
|||
|
||||
/**
|
||||
* Registers controller number to accept new inputs.
|
||||
* @param j_input_device suyuInputDevice object from the Android frontend to register.
|
||||
* @param j_input_device YuzuInputDevice object from the Android frontend to register.
|
||||
*/
|
||||
void RegisterController(jobject j_input_device);
|
||||
|
||||
|
|
@ -62,9 +62,9 @@ public:
|
|||
std::vector<Common::ParamPackage> GetInputDevices() const override;
|
||||
|
||||
/**
|
||||
* Gets the axes reported by the suyuInputDevice.
|
||||
* Gets the axes reported by the YuzuInputDevice.
|
||||
* @param env JNI environment pointer.
|
||||
* @param j_device suyuInputDevice from the Android frontend.
|
||||
* @param j_device YuzuInputDevice from the Android frontend.
|
||||
* @return Set of the axes reported by the underlying Android InputDevice
|
||||
*/
|
||||
std::set<s32> GetDeviceAxes(JNIEnv* env, jobject& j_device) const;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue