Compare commits
1 Commits
android-87
...
android-70
Author | SHA1 | Date | |
---|---|---|---|
bda8a00421 |
@ -333,7 +333,6 @@ find_package(LLVM 17 MODULE COMPONENTS Demangle)
|
|||||||
find_package(lz4 REQUIRED)
|
find_package(lz4 REQUIRED)
|
||||||
find_package(nlohmann_json 3.8 REQUIRED)
|
find_package(nlohmann_json 3.8 REQUIRED)
|
||||||
find_package(Opus 1.3 MODULE)
|
find_package(Opus 1.3 MODULE)
|
||||||
find_package(RenderDoc MODULE)
|
|
||||||
find_package(VulkanMemoryAllocator CONFIG)
|
find_package(VulkanMemoryAllocator CONFIG)
|
||||||
find_package(ZLIB 1.2 REQUIRED)
|
find_package(ZLIB 1.2 REQUIRED)
|
||||||
find_package(zstd 1.5 REQUIRED)
|
find_package(zstd 1.5 REQUIRED)
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
find_path(RenderDoc_INCLUDE_DIR renderdoc_app.h)
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args(RenderDoc
|
|
||||||
REQUIRED_VARS RenderDoc_INCLUDE_DIR
|
|
||||||
)
|
|
||||||
|
|
||||||
if (RenderDoc_FOUND AND NOT TARGET RenderDoc::API)
|
|
||||||
add_library(RenderDoc::API INTERFACE IMPORTED)
|
|
||||||
set_target_properties(RenderDoc::API PROPERTIES
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${RenderDoc_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
mark_as_advanced(RenderDoc_INCLUDE_DIR)
|
|
6
externals/CMakeLists.txt
vendored
6
externals/CMakeLists.txt
vendored
@ -174,12 +174,6 @@ target_include_directories(stb PUBLIC ./stb)
|
|||||||
add_library(bc_decoder bc_decoder/bc_decoder.cpp)
|
add_library(bc_decoder bc_decoder/bc_decoder.cpp)
|
||||||
target_include_directories(bc_decoder PUBLIC ./bc_decoder)
|
target_include_directories(bc_decoder PUBLIC ./bc_decoder)
|
||||||
|
|
||||||
if (NOT TARGET RenderDoc::API)
|
|
||||||
add_library(renderdoc INTERFACE)
|
|
||||||
target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
|
|
||||||
add_library(RenderDoc::API ALIAS renderdoc)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
if (ARCHITECTURE_arm64)
|
if (ARCHITECTURE_arm64)
|
||||||
add_subdirectory(libadrenotools)
|
add_subdirectory(libadrenotools)
|
||||||
|
744
externals/renderdoc/renderdoc_app.h
vendored
744
externals/renderdoc/renderdoc_app.h
vendored
@ -1,744 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Baldur Karlsson
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2019-2023 Baldur Karlsson
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Documentation for the API is available at https://renderdoc.org/docs/in_application_api.html
|
|
||||||
//
|
|
||||||
|
|
||||||
#if !defined(RENDERDOC_NO_STDINT)
|
|
||||||
#include <stdint.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
|
|
||||||
#define RENDERDOC_CC __cdecl
|
|
||||||
#elif defined(__linux__)
|
|
||||||
#define RENDERDOC_CC
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
#define RENDERDOC_CC
|
|
||||||
#else
|
|
||||||
#error "Unknown platform"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Constants not used directly in below API
|
|
||||||
|
|
||||||
// This is a GUID/magic value used for when applications pass a path where shader debug
|
|
||||||
// information can be found to match up with a stripped shader.
|
|
||||||
// the define can be used like so: const GUID RENDERDOC_ShaderDebugMagicValue =
|
|
||||||
// RENDERDOC_ShaderDebugMagicValue_value
|
|
||||||
#define RENDERDOC_ShaderDebugMagicValue_struct \
|
|
||||||
{ \
|
|
||||||
0xeab25520, 0x6670, 0x4865, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
|
|
||||||
}
|
|
||||||
|
|
||||||
// as an alternative when you want a byte array (assuming x86 endianness):
|
|
||||||
#define RENDERDOC_ShaderDebugMagicValue_bytearray \
|
|
||||||
{ \
|
|
||||||
0x20, 0x55, 0xb2, 0xea, 0x70, 0x66, 0x65, 0x48, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
|
|
||||||
}
|
|
||||||
|
|
||||||
// truncated version when only a uint64_t is available (e.g. Vulkan tags):
|
|
||||||
#define RENDERDOC_ShaderDebugMagicValue_truncated 0x48656670eab25520ULL
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// RenderDoc capture options
|
|
||||||
//
|
|
||||||
|
|
||||||
typedef enum RENDERDOC_CaptureOption
|
|
||||||
{
|
|
||||||
// Allow the application to enable vsync
|
|
||||||
//
|
|
||||||
// Default - enabled
|
|
||||||
//
|
|
||||||
// 1 - The application can enable or disable vsync at will
|
|
||||||
// 0 - vsync is force disabled
|
|
||||||
eRENDERDOC_Option_AllowVSync = 0,
|
|
||||||
|
|
||||||
// Allow the application to enable fullscreen
|
|
||||||
//
|
|
||||||
// Default - enabled
|
|
||||||
//
|
|
||||||
// 1 - The application can enable or disable fullscreen at will
|
|
||||||
// 0 - fullscreen is force disabled
|
|
||||||
eRENDERDOC_Option_AllowFullscreen = 1,
|
|
||||||
|
|
||||||
// Record API debugging events and messages
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - Enable built-in API debugging features and records the results into
|
|
||||||
// the capture, which is matched up with events on replay
|
|
||||||
// 0 - no API debugging is forcibly enabled
|
|
||||||
eRENDERDOC_Option_APIValidation = 2,
|
|
||||||
eRENDERDOC_Option_DebugDeviceMode = 2, // deprecated name of this enum
|
|
||||||
|
|
||||||
// Capture CPU callstacks for API events
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - Enables capturing of callstacks
|
|
||||||
// 0 - no callstacks are captured
|
|
||||||
eRENDERDOC_Option_CaptureCallstacks = 3,
|
|
||||||
|
|
||||||
// When capturing CPU callstacks, only capture them from actions.
|
|
||||||
// This option does nothing without the above option being enabled
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - Only captures callstacks for actions.
|
|
||||||
// Ignored if CaptureCallstacks is disabled
|
|
||||||
// 0 - Callstacks, if enabled, are captured for every event.
|
|
||||||
eRENDERDOC_Option_CaptureCallstacksOnlyDraws = 4,
|
|
||||||
eRENDERDOC_Option_CaptureCallstacksOnlyActions = 4,
|
|
||||||
|
|
||||||
// Specify a delay in seconds to wait for a debugger to attach, after
|
|
||||||
// creating or injecting into a process, before continuing to allow it to run.
|
|
||||||
//
|
|
||||||
// 0 indicates no delay, and the process will run immediately after injection
|
|
||||||
//
|
|
||||||
// Default - 0 seconds
|
|
||||||
//
|
|
||||||
eRENDERDOC_Option_DelayForDebugger = 5,
|
|
||||||
|
|
||||||
// Verify buffer access. This includes checking the memory returned by a Map() call to
|
|
||||||
// detect any out-of-bounds modification, as well as initialising buffers with undefined contents
|
|
||||||
// to a marker value to catch use of uninitialised memory.
|
|
||||||
//
|
|
||||||
// NOTE: This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
|
|
||||||
// not do the same kind of interception & checking and undefined contents are really undefined.
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - Verify buffer access
|
|
||||||
// 0 - No verification is performed, and overwriting bounds may cause crashes or corruption in
|
|
||||||
// RenderDoc.
|
|
||||||
eRENDERDOC_Option_VerifyBufferAccess = 6,
|
|
||||||
|
|
||||||
// The old name for eRENDERDOC_Option_VerifyBufferAccess was eRENDERDOC_Option_VerifyMapWrites.
|
|
||||||
// This option now controls the filling of uninitialised buffers with 0xdddddddd which was
|
|
||||||
// previously always enabled
|
|
||||||
eRENDERDOC_Option_VerifyMapWrites = eRENDERDOC_Option_VerifyBufferAccess,
|
|
||||||
|
|
||||||
// Hooks any system API calls that create child processes, and injects
|
|
||||||
// RenderDoc into them recursively with the same options.
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - Hooks into spawned child processes
|
|
||||||
// 0 - Child processes are not hooked by RenderDoc
|
|
||||||
eRENDERDOC_Option_HookIntoChildren = 7,
|
|
||||||
|
|
||||||
// By default RenderDoc only includes resources in the final capture necessary
|
|
||||||
// for that frame, this allows you to override that behaviour.
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - all live resources at the time of capture are included in the capture
|
|
||||||
// and available for inspection
|
|
||||||
// 0 - only the resources referenced by the captured frame are included
|
|
||||||
eRENDERDOC_Option_RefAllResources = 8,
|
|
||||||
|
|
||||||
// **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
|
|
||||||
// getting it will be ignored, to allow compatibility with older versions.
|
|
||||||
// In v1.1 the option acts as if it's always enabled.
|
|
||||||
//
|
|
||||||
// By default RenderDoc skips saving initial states for resources where the
|
|
||||||
// previous contents don't appear to be used, assuming that writes before
|
|
||||||
// reads indicate previous contents aren't used.
|
|
||||||
//
|
|
||||||
// Default - disabled
|
|
||||||
//
|
|
||||||
// 1 - initial contents at the start of each captured frame are saved, even if
|
|
||||||
// they are later overwritten or cleared before being used.
|
|
||||||
// 0 - unless a read is detected, initial contents will not be saved and will
|
|
||||||
// appear as black or empty data.
|
|
||||||
eRENDERDOC_Option_SaveAllInitials = 9,
|
|
||||||
|
|
||||||
// In APIs that allow for the recording of command lists to be replayed later,
|
|
||||||
// RenderDoc may choose to not capture command lists before a frame capture is
|
|
||||||
// triggered, to reduce overheads. This means any command lists recorded once
|
|
||||||
// and replayed many times will not be available and may cause a failure to
|
|
||||||
// capture.
|
|
||||||
//
|
|
||||||
// NOTE: This is only true for APIs where multithreading is difficult or
|
|
||||||
// discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
|
|
||||||
// and always capture all command lists since the API is heavily oriented
|
|
||||||
// around it and the overheads have been reduced by API design.
|
|
||||||
//
|
|
||||||
// 1 - All command lists are captured from the start of the application
|
|
||||||
// 0 - Command lists are only captured if their recording begins during
|
|
||||||
// the period when a frame capture is in progress.
|
|
||||||
eRENDERDOC_Option_CaptureAllCmdLists = 10,
|
|
||||||
|
|
||||||
// Mute API debugging output when the API validation mode option is enabled
|
|
||||||
//
|
|
||||||
// Default - enabled
|
|
||||||
//
|
|
||||||
// 1 - Mute any API debug messages from being displayed or passed through
|
|
||||||
// 0 - API debugging is displayed as normal
|
|
||||||
eRENDERDOC_Option_DebugOutputMute = 11,
|
|
||||||
|
|
||||||
// Option to allow vendor extensions to be used even when they may be
|
|
||||||
// incompatible with RenderDoc and cause corrupted replays or crashes.
|
|
||||||
//
|
|
||||||
// Default - inactive
|
|
||||||
//
|
|
||||||
// No values are documented, this option should only be used when absolutely
|
|
||||||
// necessary as directed by a RenderDoc developer.
|
|
||||||
eRENDERDOC_Option_AllowUnsupportedVendorExtensions = 12,
|
|
||||||
|
|
||||||
// Define a soft memory limit which some APIs may aim to keep overhead under where
|
|
||||||
// possible. Anything above this limit will where possible be saved directly to disk during
|
|
||||||
// capture.
|
|
||||||
// This will cause increased disk space use (which may cause a capture to fail if disk space is
|
|
||||||
// exhausted) as well as slower capture times.
|
|
||||||
//
|
|
||||||
// Not all memory allocations may be deferred like this so it is not a guarantee of a memory
|
|
||||||
// limit.
|
|
||||||
//
|
|
||||||
// Units are in MBs, suggested values would range from 200MB to 1000MB.
|
|
||||||
//
|
|
||||||
// Default - 0 Megabytes
|
|
||||||
eRENDERDOC_Option_SoftMemoryLimit = 13,
|
|
||||||
} RENDERDOC_CaptureOption;
|
|
||||||
|
|
||||||
// Sets an option that controls how RenderDoc behaves on capture.
|
|
||||||
//
|
|
||||||
// Returns 1 if the option and value are valid
|
|
||||||
// Returns 0 if either is invalid and the option is unchanged
|
|
||||||
typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionU32)(RENDERDOC_CaptureOption opt, uint32_t val);
|
|
||||||
typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionF32)(RENDERDOC_CaptureOption opt, float val);
|
|
||||||
|
|
||||||
// Gets the current value of an option as a uint32_t
|
|
||||||
//
|
|
||||||
// If the option is invalid, 0xffffffff is returned
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionU32)(RENDERDOC_CaptureOption opt);
|
|
||||||
|
|
||||||
// Gets the current value of an option as a float
|
|
||||||
//
|
|
||||||
// If the option is invalid, -FLT_MAX is returned
|
|
||||||
typedef float(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionF32)(RENDERDOC_CaptureOption opt);
|
|
||||||
|
|
||||||
typedef enum RENDERDOC_InputButton
|
|
||||||
{
|
|
||||||
// '0' - '9' matches ASCII values
|
|
||||||
eRENDERDOC_Key_0 = 0x30,
|
|
||||||
eRENDERDOC_Key_1 = 0x31,
|
|
||||||
eRENDERDOC_Key_2 = 0x32,
|
|
||||||
eRENDERDOC_Key_3 = 0x33,
|
|
||||||
eRENDERDOC_Key_4 = 0x34,
|
|
||||||
eRENDERDOC_Key_5 = 0x35,
|
|
||||||
eRENDERDOC_Key_6 = 0x36,
|
|
||||||
eRENDERDOC_Key_7 = 0x37,
|
|
||||||
eRENDERDOC_Key_8 = 0x38,
|
|
||||||
eRENDERDOC_Key_9 = 0x39,
|
|
||||||
|
|
||||||
// 'A' - 'Z' matches ASCII values
|
|
||||||
eRENDERDOC_Key_A = 0x41,
|
|
||||||
eRENDERDOC_Key_B = 0x42,
|
|
||||||
eRENDERDOC_Key_C = 0x43,
|
|
||||||
eRENDERDOC_Key_D = 0x44,
|
|
||||||
eRENDERDOC_Key_E = 0x45,
|
|
||||||
eRENDERDOC_Key_F = 0x46,
|
|
||||||
eRENDERDOC_Key_G = 0x47,
|
|
||||||
eRENDERDOC_Key_H = 0x48,
|
|
||||||
eRENDERDOC_Key_I = 0x49,
|
|
||||||
eRENDERDOC_Key_J = 0x4A,
|
|
||||||
eRENDERDOC_Key_K = 0x4B,
|
|
||||||
eRENDERDOC_Key_L = 0x4C,
|
|
||||||
eRENDERDOC_Key_M = 0x4D,
|
|
||||||
eRENDERDOC_Key_N = 0x4E,
|
|
||||||
eRENDERDOC_Key_O = 0x4F,
|
|
||||||
eRENDERDOC_Key_P = 0x50,
|
|
||||||
eRENDERDOC_Key_Q = 0x51,
|
|
||||||
eRENDERDOC_Key_R = 0x52,
|
|
||||||
eRENDERDOC_Key_S = 0x53,
|
|
||||||
eRENDERDOC_Key_T = 0x54,
|
|
||||||
eRENDERDOC_Key_U = 0x55,
|
|
||||||
eRENDERDOC_Key_V = 0x56,
|
|
||||||
eRENDERDOC_Key_W = 0x57,
|
|
||||||
eRENDERDOC_Key_X = 0x58,
|
|
||||||
eRENDERDOC_Key_Y = 0x59,
|
|
||||||
eRENDERDOC_Key_Z = 0x5A,
|
|
||||||
|
|
||||||
// leave the rest of the ASCII range free
|
|
||||||
// in case we want to use it later
|
|
||||||
eRENDERDOC_Key_NonPrintable = 0x100,
|
|
||||||
|
|
||||||
eRENDERDOC_Key_Divide,
|
|
||||||
eRENDERDOC_Key_Multiply,
|
|
||||||
eRENDERDOC_Key_Subtract,
|
|
||||||
eRENDERDOC_Key_Plus,
|
|
||||||
|
|
||||||
eRENDERDOC_Key_F1,
|
|
||||||
eRENDERDOC_Key_F2,
|
|
||||||
eRENDERDOC_Key_F3,
|
|
||||||
eRENDERDOC_Key_F4,
|
|
||||||
eRENDERDOC_Key_F5,
|
|
||||||
eRENDERDOC_Key_F6,
|
|
||||||
eRENDERDOC_Key_F7,
|
|
||||||
eRENDERDOC_Key_F8,
|
|
||||||
eRENDERDOC_Key_F9,
|
|
||||||
eRENDERDOC_Key_F10,
|
|
||||||
eRENDERDOC_Key_F11,
|
|
||||||
eRENDERDOC_Key_F12,
|
|
||||||
|
|
||||||
eRENDERDOC_Key_Home,
|
|
||||||
eRENDERDOC_Key_End,
|
|
||||||
eRENDERDOC_Key_Insert,
|
|
||||||
eRENDERDOC_Key_Delete,
|
|
||||||
eRENDERDOC_Key_PageUp,
|
|
||||||
eRENDERDOC_Key_PageDn,
|
|
||||||
|
|
||||||
eRENDERDOC_Key_Backspace,
|
|
||||||
eRENDERDOC_Key_Tab,
|
|
||||||
eRENDERDOC_Key_PrtScrn,
|
|
||||||
eRENDERDOC_Key_Pause,
|
|
||||||
|
|
||||||
eRENDERDOC_Key_Max,
|
|
||||||
} RENDERDOC_InputButton;
|
|
||||||
|
|
||||||
// Sets which key or keys can be used to toggle focus between multiple windows
|
|
||||||
//
|
|
||||||
// If keys is NULL or num is 0, toggle keys will be disabled
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_SetFocusToggleKeys)(RENDERDOC_InputButton *keys, int num);
|
|
||||||
|
|
||||||
// Sets which key or keys can be used to capture the next frame
|
|
||||||
//
|
|
||||||
// If keys is NULL or num is 0, captures keys will be disabled
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureKeys)(RENDERDOC_InputButton *keys, int num);
|
|
||||||
|
|
||||||
typedef enum RENDERDOC_OverlayBits
|
|
||||||
{
|
|
||||||
// This single bit controls whether the overlay is enabled or disabled globally
|
|
||||||
eRENDERDOC_Overlay_Enabled = 0x1,
|
|
||||||
|
|
||||||
// Show the average framerate over several seconds as well as min/max
|
|
||||||
eRENDERDOC_Overlay_FrameRate = 0x2,
|
|
||||||
|
|
||||||
// Show the current frame number
|
|
||||||
eRENDERDOC_Overlay_FrameNumber = 0x4,
|
|
||||||
|
|
||||||
// Show a list of recent captures, and how many captures have been made
|
|
||||||
eRENDERDOC_Overlay_CaptureList = 0x8,
|
|
||||||
|
|
||||||
// Default values for the overlay mask
|
|
||||||
eRENDERDOC_Overlay_Default = (eRENDERDOC_Overlay_Enabled | eRENDERDOC_Overlay_FrameRate |
|
|
||||||
eRENDERDOC_Overlay_FrameNumber | eRENDERDOC_Overlay_CaptureList),
|
|
||||||
|
|
||||||
// Enable all bits
|
|
||||||
eRENDERDOC_Overlay_All = ~0U,
|
|
||||||
|
|
||||||
// Disable all bits
|
|
||||||
eRENDERDOC_Overlay_None = 0,
|
|
||||||
} RENDERDOC_OverlayBits;
|
|
||||||
|
|
||||||
// returns the overlay bits that have been set
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetOverlayBits)();
|
|
||||||
// sets the overlay bits with an and & or mask
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t And, uint32_t Or);
|
|
||||||
|
|
||||||
// this function will attempt to remove RenderDoc's hooks in the application.
|
|
||||||
//
|
|
||||||
// Note: that this can only work correctly if done immediately after
|
|
||||||
// the module is loaded, before any API work happens. RenderDoc will remove its
|
|
||||||
// injected hooks and shut down. Behaviour is undefined if this is called
|
|
||||||
// after any API functions have been called, and there is still no guarantee of
|
|
||||||
// success.
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_RemoveHooks)();
|
|
||||||
|
|
||||||
// DEPRECATED: compatibility for code compiled against pre-1.4.1 headers.
|
|
||||||
typedef pRENDERDOC_RemoveHooks pRENDERDOC_Shutdown;
|
|
||||||
|
|
||||||
// This function will unload RenderDoc's crash handler.
|
|
||||||
//
|
|
||||||
// If you use your own crash handler and don't want RenderDoc's handler to
|
|
||||||
// intercede, you can call this function to unload it and any unhandled
|
|
||||||
// exceptions will pass to the next handler.
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_UnloadCrashHandler)();
|
|
||||||
|
|
||||||
// Sets the capture file path template
|
|
||||||
//
|
|
||||||
// pathtemplate is a UTF-8 string that gives a template for how captures will be named
|
|
||||||
// and where they will be saved.
|
|
||||||
//
|
|
||||||
// Any extension is stripped off the path, and captures are saved in the directory
|
|
||||||
// specified, and named with the filename and the frame number appended. If the
|
|
||||||
// directory does not exist it will be created, including any parent directories.
|
|
||||||
//
|
|
||||||
// If pathtemplate is NULL, the template will remain unchanged
|
|
||||||
//
|
|
||||||
// Example:
|
|
||||||
//
|
|
||||||
// SetCaptureFilePathTemplate("my_captures/example");
|
|
||||||
//
|
|
||||||
// Capture #1 -> my_captures/example_frame123.rdc
|
|
||||||
// Capture #2 -> my_captures/example_frame456.rdc
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFilePathTemplate)(const char *pathtemplate);
|
|
||||||
|
|
||||||
// returns the current capture path template, see SetCaptureFileTemplate above, as a UTF-8 string
|
|
||||||
typedef const char *(RENDERDOC_CC *pRENDERDOC_GetCaptureFilePathTemplate)();
|
|
||||||
|
|
||||||
// DEPRECATED: compatibility for code compiled against pre-1.1.2 headers.
|
|
||||||
typedef pRENDERDOC_SetCaptureFilePathTemplate pRENDERDOC_SetLogFilePathTemplate;
|
|
||||||
typedef pRENDERDOC_GetCaptureFilePathTemplate pRENDERDOC_GetLogFilePathTemplate;
|
|
||||||
|
|
||||||
// returns the number of captures that have been made
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetNumCaptures)();
|
|
||||||
|
|
||||||
// This function returns the details of a capture, by index. New captures are added
|
|
||||||
// to the end of the list.
|
|
||||||
//
|
|
||||||
// filename will be filled with the absolute path to the capture file, as a UTF-8 string
|
|
||||||
// pathlength will be written with the length in bytes of the filename string
|
|
||||||
// timestamp will be written with the time of the capture, in seconds since the Unix epoch
|
|
||||||
//
|
|
||||||
// Any of the parameters can be NULL and they'll be skipped.
|
|
||||||
//
|
|
||||||
// The function will return 1 if the capture index is valid, or 0 if the index is invalid
|
|
||||||
// If the index is invalid, the values will be unchanged
|
|
||||||
//
|
|
||||||
// Note: when captures are deleted in the UI they will remain in this list, so the
|
|
||||||
// capture path may not exist anymore.
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCapture)(uint32_t idx, char *filename,
|
|
||||||
uint32_t *pathlength, uint64_t *timestamp);
|
|
||||||
|
|
||||||
// Sets the comments associated with a capture file. These comments are displayed in the
|
|
||||||
// UI program when opening.
|
|
||||||
//
|
|
||||||
// filePath should be a path to the capture file to add comments to. If set to NULL or ""
|
|
||||||
// the most recent capture file created made will be used instead.
|
|
||||||
// comments should be a NULL-terminated UTF-8 string to add as comments.
|
|
||||||
//
|
|
||||||
// Any existing comments will be overwritten.
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFileComments)(const char *filePath,
|
|
||||||
const char *comments);
|
|
||||||
|
|
||||||
// returns 1 if the RenderDoc UI is connected to this application, 0 otherwise
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsTargetControlConnected)();
|
|
||||||
|
|
||||||
// DEPRECATED: compatibility for code compiled against pre-1.1.1 headers.
|
|
||||||
// This was renamed to IsTargetControlConnected in API 1.1.1, the old typedef is kept here for
|
|
||||||
// backwards compatibility with old code, it is castable either way since it's ABI compatible
|
|
||||||
// as the same function pointer type.
|
|
||||||
typedef pRENDERDOC_IsTargetControlConnected pRENDERDOC_IsRemoteAccessConnected;
|
|
||||||
|
|
||||||
// This function will launch the Replay UI associated with the RenderDoc library injected
|
|
||||||
// into the running application.
|
|
||||||
//
|
|
||||||
// if connectTargetControl is 1, the Replay UI will be launched with a command line parameter
|
|
||||||
// to connect to this application
|
|
||||||
// cmdline is the rest of the command line, as a UTF-8 string. E.g. a captures to open
|
|
||||||
// if cmdline is NULL, the command line will be empty.
|
|
||||||
//
|
|
||||||
// returns the PID of the replay UI if successful, 0 if not successful.
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_LaunchReplayUI)(uint32_t connectTargetControl,
|
|
||||||
const char *cmdline);
|
|
||||||
|
|
||||||
// RenderDoc can return a higher version than requested if it's backwards compatible,
|
|
||||||
// this function returns the actual version returned. If a parameter is NULL, it will be
|
|
||||||
// ignored and the others will be filled out.
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_GetAPIVersion)(int *major, int *minor, int *patch);
|
|
||||||
|
|
||||||
// Requests that the replay UI show itself (if hidden or not the current top window). This can be
|
|
||||||
// used in conjunction with IsTargetControlConnected and LaunchReplayUI to intelligently handle
|
|
||||||
// showing the UI after making a capture.
|
|
||||||
//
|
|
||||||
// This will return 1 if the request was successfully passed on, though it's not guaranteed that
|
|
||||||
// the UI will be on top in all cases depending on OS rules. It will return 0 if there is no current
|
|
||||||
// target control connection to make such a request, or if there was another error
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_ShowReplayUI)();
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
|
||||||
// Capturing functions
|
|
||||||
//
|
|
||||||
|
|
||||||
// A device pointer is a pointer to the API's root handle.
|
|
||||||
//
|
|
||||||
// This would be an ID3D11Device, HGLRC/GLXContext, ID3D12Device, etc
|
|
||||||
typedef void *RENDERDOC_DevicePointer;
|
|
||||||
|
|
||||||
// A window handle is the OS's native window handle
|
|
||||||
//
|
|
||||||
// This would be an HWND, GLXDrawable, etc
|
|
||||||
typedef void *RENDERDOC_WindowHandle;
|
|
||||||
|
|
||||||
// A helper macro for Vulkan, where the device handle cannot be used directly.
|
|
||||||
//
|
|
||||||
// Passing the VkInstance to this macro will return the RENDERDOC_DevicePointer to use.
|
|
||||||
//
|
|
||||||
// Specifically, the value needed is the dispatch table pointer, which sits as the first
|
|
||||||
// pointer-sized object in the memory pointed to by the VkInstance. Thus we cast to a void** and
|
|
||||||
// indirect once.
|
|
||||||
#define RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(inst) (*((void **)(inst)))
|
|
||||||
|
|
||||||
// This sets the RenderDoc in-app overlay in the API/window pair as 'active' and it will
|
|
||||||
// respond to keypresses. Neither parameter can be NULL
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_SetActiveWindow)(RENDERDOC_DevicePointer device,
|
|
||||||
RENDERDOC_WindowHandle wndHandle);
|
|
||||||
|
|
||||||
// capture the next frame on whichever window and API is currently considered active
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_TriggerCapture)();
|
|
||||||
|
|
||||||
// capture the next N frames on whichever window and API is currently considered active
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_TriggerMultiFrameCapture)(uint32_t numFrames);
|
|
||||||
|
|
||||||
// When choosing either a device pointer or a window handle to capture, you can pass NULL.
|
|
||||||
// Passing NULL specifies a 'wildcard' match against anything. This allows you to specify
|
|
||||||
// any API rendering to a specific window, or a specific API instance rendering to any window,
|
|
||||||
// or in the simplest case of one window and one API, you can just pass NULL for both.
|
|
||||||
//
|
|
||||||
// In either case, if there are two or more possible matching (device,window) pairs it
|
|
||||||
// is undefined which one will be captured.
|
|
||||||
//
|
|
||||||
// Note: for headless rendering you can pass NULL for the window handle and either specify
|
|
||||||
// a device pointer or leave it NULL as above.
|
|
||||||
|
|
||||||
// Immediately starts capturing API calls on the specified device pointer and window handle.
|
|
||||||
//
|
|
||||||
// If there is no matching thing to capture (e.g. no supported API has been initialised),
|
|
||||||
// this will do nothing.
|
|
||||||
//
|
|
||||||
// The results are undefined (including crashes) if two captures are started overlapping,
|
|
||||||
// even on separate devices and/oror windows.
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_StartFrameCapture)(RENDERDOC_DevicePointer device,
|
|
||||||
RENDERDOC_WindowHandle wndHandle);
|
|
||||||
|
|
||||||
// Returns whether or not a frame capture is currently ongoing anywhere.
|
|
||||||
//
|
|
||||||
// This will return 1 if a capture is ongoing, and 0 if there is no capture running
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsFrameCapturing)();
|
|
||||||
|
|
||||||
// Ends capturing immediately.
|
|
||||||
//
|
|
||||||
// This will return 1 if the capture succeeded, and 0 if there was an error capturing.
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_EndFrameCapture)(RENDERDOC_DevicePointer device,
|
|
||||||
RENDERDOC_WindowHandle wndHandle);
|
|
||||||
|
|
||||||
// Ends capturing immediately and discard any data stored without saving to disk.
|
|
||||||
//
|
|
||||||
// This will return 1 if the capture was discarded, and 0 if there was an error or no capture
|
|
||||||
// was in progress
|
|
||||||
typedef uint32_t(RENDERDOC_CC *pRENDERDOC_DiscardFrameCapture)(RENDERDOC_DevicePointer device,
|
|
||||||
RENDERDOC_WindowHandle wndHandle);
|
|
||||||
|
|
||||||
// Only valid to be called between a call to StartFrameCapture and EndFrameCapture. Gives a custom
|
|
||||||
// title to the capture produced which will be displayed in the UI.
|
|
||||||
//
|
|
||||||
// If multiple captures are ongoing, this title will be applied to the first capture to end after
|
|
||||||
// this call. The second capture to end will have no title, unless this function is called again.
|
|
||||||
//
|
|
||||||
// Calling this function has no effect if no capture is currently running, and if it is called
|
|
||||||
// multiple times only the last title will be used.
|
|
||||||
typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureTitle)(const char *title);
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// RenderDoc API versions
|
|
||||||
//
|
|
||||||
|
|
||||||
// RenderDoc uses semantic versioning (http://semver.org/).
|
|
||||||
//
|
|
||||||
// MAJOR version is incremented when incompatible API changes happen.
|
|
||||||
// MINOR version is incremented when functionality is added in a backwards-compatible manner.
|
|
||||||
// PATCH version is incremented when backwards-compatible bug fixes happen.
|
|
||||||
//
|
|
||||||
// Note that this means the API returned can be higher than the one you might have requested.
|
|
||||||
// e.g. if you are running against a newer RenderDoc that supports 1.0.1, it will be returned
|
|
||||||
// instead of 1.0.0. You can check this with the GetAPIVersion entry point
|
|
||||||
typedef enum RENDERDOC_Version
|
|
||||||
{
|
|
||||||
eRENDERDOC_API_Version_1_0_0 = 10000, // RENDERDOC_API_1_0_0 = 1 00 00
|
|
||||||
eRENDERDOC_API_Version_1_0_1 = 10001, // RENDERDOC_API_1_0_1 = 1 00 01
|
|
||||||
eRENDERDOC_API_Version_1_0_2 = 10002, // RENDERDOC_API_1_0_2 = 1 00 02
|
|
||||||
eRENDERDOC_API_Version_1_1_0 = 10100, // RENDERDOC_API_1_1_0 = 1 01 00
|
|
||||||
eRENDERDOC_API_Version_1_1_1 = 10101, // RENDERDOC_API_1_1_1 = 1 01 01
|
|
||||||
eRENDERDOC_API_Version_1_1_2 = 10102, // RENDERDOC_API_1_1_2 = 1 01 02
|
|
||||||
eRENDERDOC_API_Version_1_2_0 = 10200, // RENDERDOC_API_1_2_0 = 1 02 00
|
|
||||||
eRENDERDOC_API_Version_1_3_0 = 10300, // RENDERDOC_API_1_3_0 = 1 03 00
|
|
||||||
eRENDERDOC_API_Version_1_4_0 = 10400, // RENDERDOC_API_1_4_0 = 1 04 00
|
|
||||||
eRENDERDOC_API_Version_1_4_1 = 10401, // RENDERDOC_API_1_4_1 = 1 04 01
|
|
||||||
eRENDERDOC_API_Version_1_4_2 = 10402, // RENDERDOC_API_1_4_2 = 1 04 02
|
|
||||||
eRENDERDOC_API_Version_1_5_0 = 10500, // RENDERDOC_API_1_5_0 = 1 05 00
|
|
||||||
eRENDERDOC_API_Version_1_6_0 = 10600, // RENDERDOC_API_1_6_0 = 1 06 00
|
|
||||||
} RENDERDOC_Version;
|
|
||||||
|
|
||||||
// API version changelog:
|
|
||||||
//
|
|
||||||
// 1.0.0 - initial release
|
|
||||||
// 1.0.1 - Bugfix: IsFrameCapturing() was returning false for captures that were triggered
|
|
||||||
// by keypress or TriggerCapture, instead of Start/EndFrameCapture.
|
|
||||||
// 1.0.2 - Refactor: Renamed eRENDERDOC_Option_DebugDeviceMode to eRENDERDOC_Option_APIValidation
|
|
||||||
// 1.1.0 - Add feature: TriggerMultiFrameCapture(). Backwards compatible with 1.0.x since the new
|
|
||||||
// function pointer is added to the end of the struct, the original layout is identical
|
|
||||||
// 1.1.1 - Refactor: Renamed remote access to target control (to better disambiguate from remote
|
|
||||||
// replay/remote server concept in replay UI)
|
|
||||||
// 1.1.2 - Refactor: Renamed "log file" in function names to just capture, to clarify that these
|
|
||||||
// are captures and not debug logging files. This is the first API version in the v1.0
|
|
||||||
// branch.
|
|
||||||
// 1.2.0 - Added feature: SetCaptureFileComments() to add comments to a capture file that will be
|
|
||||||
// displayed in the UI program on load.
|
|
||||||
// 1.3.0 - Added feature: New capture option eRENDERDOC_Option_AllowUnsupportedVendorExtensions
|
|
||||||
// which allows users to opt-in to allowing unsupported vendor extensions to function.
|
|
||||||
// Should be used at the user's own risk.
|
|
||||||
// Refactor: Renamed eRENDERDOC_Option_VerifyMapWrites to
|
|
||||||
// eRENDERDOC_Option_VerifyBufferAccess, which now also controls initialisation to
|
|
||||||
// 0xdddddddd of uninitialised buffer contents.
|
|
||||||
// 1.4.0 - Added feature: DiscardFrameCapture() to discard a frame capture in progress and stop
|
|
||||||
// capturing without saving anything to disk.
|
|
||||||
// 1.4.1 - Refactor: Renamed Shutdown to RemoveHooks to better clarify what is happening
|
|
||||||
// 1.4.2 - Refactor: Renamed 'draws' to 'actions' in callstack capture option.
|
|
||||||
// 1.5.0 - Added feature: ShowReplayUI() to request that the replay UI show itself if connected
|
|
||||||
// 1.6.0 - Added feature: SetCaptureTitle() which can be used to set a title for a
|
|
||||||
// capture made with StartFrameCapture() or EndFrameCapture()
|
|
||||||
|
|
||||||
typedef struct RENDERDOC_API_1_6_0
|
|
||||||
{
|
|
||||||
pRENDERDOC_GetAPIVersion GetAPIVersion;
|
|
||||||
|
|
||||||
pRENDERDOC_SetCaptureOptionU32 SetCaptureOptionU32;
|
|
||||||
pRENDERDOC_SetCaptureOptionF32 SetCaptureOptionF32;
|
|
||||||
|
|
||||||
pRENDERDOC_GetCaptureOptionU32 GetCaptureOptionU32;
|
|
||||||
pRENDERDOC_GetCaptureOptionF32 GetCaptureOptionF32;
|
|
||||||
|
|
||||||
pRENDERDOC_SetFocusToggleKeys SetFocusToggleKeys;
|
|
||||||
pRENDERDOC_SetCaptureKeys SetCaptureKeys;
|
|
||||||
|
|
||||||
pRENDERDOC_GetOverlayBits GetOverlayBits;
|
|
||||||
pRENDERDOC_MaskOverlayBits MaskOverlayBits;
|
|
||||||
|
|
||||||
// Shutdown was renamed to RemoveHooks in 1.4.1.
|
|
||||||
// These unions allow old code to continue compiling without changes
|
|
||||||
union
|
|
||||||
{
|
|
||||||
pRENDERDOC_Shutdown Shutdown;
|
|
||||||
pRENDERDOC_RemoveHooks RemoveHooks;
|
|
||||||
};
|
|
||||||
pRENDERDOC_UnloadCrashHandler UnloadCrashHandler;
|
|
||||||
|
|
||||||
// Get/SetLogFilePathTemplate was renamed to Get/SetCaptureFilePathTemplate in 1.1.2.
|
|
||||||
// These unions allow old code to continue compiling without changes
|
|
||||||
union
|
|
||||||
{
|
|
||||||
// deprecated name
|
|
||||||
pRENDERDOC_SetLogFilePathTemplate SetLogFilePathTemplate;
|
|
||||||
// current name
|
|
||||||
pRENDERDOC_SetCaptureFilePathTemplate SetCaptureFilePathTemplate;
|
|
||||||
};
|
|
||||||
union
|
|
||||||
{
|
|
||||||
// deprecated name
|
|
||||||
pRENDERDOC_GetLogFilePathTemplate GetLogFilePathTemplate;
|
|
||||||
// current name
|
|
||||||
pRENDERDOC_GetCaptureFilePathTemplate GetCaptureFilePathTemplate;
|
|
||||||
};
|
|
||||||
|
|
||||||
pRENDERDOC_GetNumCaptures GetNumCaptures;
|
|
||||||
pRENDERDOC_GetCapture GetCapture;
|
|
||||||
|
|
||||||
pRENDERDOC_TriggerCapture TriggerCapture;
|
|
||||||
|
|
||||||
// IsRemoteAccessConnected was renamed to IsTargetControlConnected in 1.1.1.
|
|
||||||
// This union allows old code to continue compiling without changes
|
|
||||||
union
|
|
||||||
{
|
|
||||||
// deprecated name
|
|
||||||
pRENDERDOC_IsRemoteAccessConnected IsRemoteAccessConnected;
|
|
||||||
// current name
|
|
||||||
pRENDERDOC_IsTargetControlConnected IsTargetControlConnected;
|
|
||||||
};
|
|
||||||
pRENDERDOC_LaunchReplayUI LaunchReplayUI;
|
|
||||||
|
|
||||||
pRENDERDOC_SetActiveWindow SetActiveWindow;
|
|
||||||
|
|
||||||
pRENDERDOC_StartFrameCapture StartFrameCapture;
|
|
||||||
pRENDERDOC_IsFrameCapturing IsFrameCapturing;
|
|
||||||
pRENDERDOC_EndFrameCapture EndFrameCapture;
|
|
||||||
|
|
||||||
// new function in 1.1.0
|
|
||||||
pRENDERDOC_TriggerMultiFrameCapture TriggerMultiFrameCapture;
|
|
||||||
|
|
||||||
// new function in 1.2.0
|
|
||||||
pRENDERDOC_SetCaptureFileComments SetCaptureFileComments;
|
|
||||||
|
|
||||||
// new function in 1.4.0
|
|
||||||
pRENDERDOC_DiscardFrameCapture DiscardFrameCapture;
|
|
||||||
|
|
||||||
// new function in 1.5.0
|
|
||||||
pRENDERDOC_ShowReplayUI ShowReplayUI;
|
|
||||||
|
|
||||||
// new function in 1.6.0
|
|
||||||
pRENDERDOC_SetCaptureTitle SetCaptureTitle;
|
|
||||||
} RENDERDOC_API_1_6_0;
|
|
||||||
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_0;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_1;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_2;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_0;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_1;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_2;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_2_0;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_3_0;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_0;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_1;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_2;
|
|
||||||
typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_5_0;
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// RenderDoc API entry point
|
|
||||||
//
|
|
||||||
// This entry point can be obtained via GetProcAddress/dlsym if RenderDoc is available.
|
|
||||||
//
|
|
||||||
// The name is the same as the typedef - "RENDERDOC_GetAPI"
|
|
||||||
//
|
|
||||||
// This function is not thread safe, and should not be called on multiple threads at once.
|
|
||||||
// Ideally, call this once as early as possible in your application's startup, before doing
|
|
||||||
// any API work, since some configuration functionality etc has to be done also before
|
|
||||||
// initialising any APIs.
|
|
||||||
//
|
|
||||||
// Parameters:
|
|
||||||
// version is a single value from the RENDERDOC_Version above.
|
|
||||||
//
|
|
||||||
// outAPIPointers will be filled out with a pointer to the corresponding struct of function
|
|
||||||
// pointers.
|
|
||||||
//
|
|
||||||
// Returns:
|
|
||||||
// 1 - if the outAPIPointers has been filled with a pointer to the API struct requested
|
|
||||||
// 0 - if the requested version is not supported or the arguments are invalid.
|
|
||||||
//
|
|
||||||
typedef int(RENDERDOC_CC *pRENDERDOC_GetAPI)(RENDERDOC_Version version, void **outAPIPointers);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} // extern "C"
|
|
||||||
#endif
|
|
3
src/android/.gitignore
vendored
3
src/android/.gitignore
vendored
@ -63,6 +63,3 @@ fastlane/Preview.html
|
|||||||
fastlane/screenshots
|
fastlane/screenshots
|
||||||
fastlane/test_output
|
fastlane/test_output
|
||||||
fastlane/readme.md
|
fastlane/readme.md
|
||||||
|
|
||||||
# Autogenerated library for vulkan validation layers
|
|
||||||
libVkLayer_khronos_validation.so
|
|
||||||
|
@ -77,30 +77,13 @@ android {
|
|||||||
buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
|
buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
|
||||||
}
|
}
|
||||||
|
|
||||||
val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
|
|
||||||
if (keystoreFile != null) {
|
|
||||||
signingConfigs {
|
|
||||||
create("release") {
|
|
||||||
storeFile = file(keystoreFile)
|
|
||||||
storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
|
|
||||||
keyAlias = System.getenv("ANDROID_KEY_ALIAS")
|
|
||||||
keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Define build types, which are orthogonal to product flavors.
|
// Define build types, which are orthogonal to product flavors.
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|
||||||
// Signed by release key, allowing for upload to Play Store.
|
// Signed by release key, allowing for upload to Play Store.
|
||||||
release {
|
release {
|
||||||
signingConfig = if (keystoreFile != null) {
|
|
||||||
signingConfigs.getByName("release")
|
|
||||||
} else {
|
|
||||||
signingConfigs.getByName("debug")
|
|
||||||
}
|
|
||||||
|
|
||||||
resValue("string", "app_name_suffixed", "yuzu")
|
resValue("string", "app_name_suffixed", "yuzu")
|
||||||
|
signingConfig = signingConfigs.getByName("debug")
|
||||||
isMinifyEnabled = true
|
isMinifyEnabled = true
|
||||||
isDebuggable = false
|
isDebuggable = false
|
||||||
proguardFiles(
|
proguardFiles(
|
||||||
@ -214,7 +197,7 @@ dependencies {
|
|||||||
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
|
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
|
||||||
implementation("io.coil-kt:coil:2.2.2")
|
implementation("io.coil-kt:coil:2.2.2")
|
||||||
implementation("androidx.core:core-splashscreen:1.0.1")
|
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||||
implementation("androidx.window:window:1.2.0-beta03")
|
implementation("androidx.window:window:1.1.0")
|
||||||
implementation("org.ini4j:ini4j:0.5.4")
|
implementation("org.ini4j:ini4j:0.5.4")
|
||||||
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
|
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
|
||||||
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
||||||
|
@ -247,12 +247,7 @@ object NativeLibrary {
|
|||||||
|
|
||||||
external fun setAppDirectory(directory: String)
|
external fun setAppDirectory(directory: String)
|
||||||
|
|
||||||
/**
|
external fun installFileToNand(filename: String): Int
|
||||||
* Installs a nsp or xci file to nand
|
|
||||||
* @param filename String representation of file uri
|
|
||||||
* @param extension Lowercase string representation of file extension without "."
|
|
||||||
*/
|
|
||||||
external fun installFileToNand(filename: String, extension: String): Int
|
|
||||||
|
|
||||||
external fun initializeGpuDriver(
|
external fun initializeGpuDriver(
|
||||||
hookLibDir: String?,
|
hookLibDir: String?,
|
||||||
@ -312,6 +307,21 @@ object NativeLibrary {
|
|||||||
*/
|
*/
|
||||||
external fun isPaused(): Boolean
|
external fun isPaused(): Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mutes emulation sound
|
||||||
|
*/
|
||||||
|
external fun muteAudio(): Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unmutes emulation sound
|
||||||
|
*/
|
||||||
|
external fun unmuteAudio(): Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if emulation audio is muted.
|
||||||
|
*/
|
||||||
|
external fun isMuted(): Boolean
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the performance stats for the current game
|
* Returns the performance stats for the current game
|
||||||
*/
|
*/
|
||||||
@ -516,11 +526,6 @@ object NativeLibrary {
|
|||||||
*/
|
*/
|
||||||
external fun submitInlineKeyboardInput(key_code: Int)
|
external fun submitInlineKeyboardInput(key_code: Int)
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a generic user directory if it doesn't exist already
|
|
||||||
*/
|
|
||||||
external fun initializeEmptyUserDirectory()
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Button type for use in onTouchEvent
|
* Button type for use in onTouchEvent
|
||||||
*/
|
*/
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.activities
|
package org.yuzu.yuzu_emu.activities
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.PendingIntent
|
import android.app.PendingIntent
|
||||||
import android.app.PictureInPictureParams
|
import android.app.PictureInPictureParams
|
||||||
@ -333,7 +332,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
|
|||||||
pictureInPictureActions.add(pauseRemoteAction)
|
pictureInPictureActions.add(pauseRemoteAction)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BooleanSetting.AUDIO_MUTED.boolean) {
|
if (NativeLibrary.isMuted()) {
|
||||||
val unmuteIcon = Icon.createWithResource(
|
val unmuteIcon = Icon.createWithResource(
|
||||||
this@EmulationActivity,
|
this@EmulationActivity,
|
||||||
R.drawable.ic_pip_unmute
|
R.drawable.ic_pip_unmute
|
||||||
@ -390,15 +389,14 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
|
|||||||
if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
|
if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
|
||||||
}
|
}
|
||||||
if (intent.action == actionUnmute) {
|
if (intent.action == actionUnmute) {
|
||||||
if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
|
if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
|
||||||
} else if (intent.action == actionMute) {
|
} else if (intent.action == actionMute) {
|
||||||
if (!BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(true)
|
if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()
|
||||||
}
|
}
|
||||||
buildPictureInPictureParams()
|
buildPictureInPictureParams()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressLint("UnspecifiedRegisterReceiverFlag")
|
|
||||||
override fun onPictureInPictureModeChanged(
|
override fun onPictureInPictureModeChanged(
|
||||||
isInPictureInPictureMode: Boolean,
|
isInPictureInPictureMode: Boolean,
|
||||||
newConfig: Configuration
|
newConfig: Configuration
|
||||||
@ -411,11 +409,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
|
|||||||
addAction(actionMute)
|
addAction(actionMute)
|
||||||
addAction(actionUnmute)
|
addAction(actionUnmute)
|
||||||
}.also {
|
}.also {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
registerReceiver(pictureInPictureReceiver, it)
|
||||||
registerReceiver(pictureInPictureReceiver, it, RECEIVER_EXPORTED)
|
|
||||||
} else {
|
|
||||||
registerReceiver(pictureInPictureReceiver, it)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@ -423,7 +417,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
|
|||||||
} catch (ignored: Exception) {
|
} catch (ignored: Exception) {
|
||||||
}
|
}
|
||||||
// Always resume audio, since there is no UI button
|
// Always resume audio, since there is no UI button
|
||||||
if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
|
if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,8 +4,7 @@
|
|||||||
package org.yuzu.yuzu_emu.adapters
|
package org.yuzu.yuzu_emu.adapters
|
||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.graphics.Bitmap
|
import android.graphics.drawable.BitmapDrawable
|
||||||
import android.graphics.drawable.LayerDrawable
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.text.TextUtils
|
import android.text.TextUtils
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
@ -16,10 +15,7 @@ import android.widget.Toast
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.pm.ShortcutInfoCompat
|
import androidx.core.content.pm.ShortcutInfoCompat
|
||||||
import androidx.core.content.pm.ShortcutManagerCompat
|
import androidx.core.content.pm.ShortcutManagerCompat
|
||||||
import androidx.core.content.res.ResourcesCompat
|
|
||||||
import androidx.core.graphics.drawable.IconCompat
|
import androidx.core.graphics.drawable.IconCompat
|
||||||
import androidx.core.graphics.drawable.toBitmap
|
|
||||||
import androidx.core.graphics.drawable.toDrawable
|
|
||||||
import androidx.documentfile.provider.DocumentFile
|
import androidx.documentfile.provider.DocumentFile
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.navigation.findNavController
|
import androidx.navigation.findNavController
|
||||||
@ -91,24 +87,11 @@ class GameAdapter(private val activity: AppCompatActivity) :
|
|||||||
action = Intent.ACTION_VIEW
|
action = Intent.ACTION_VIEW
|
||||||
data = Uri.parse(holder.game.path)
|
data = Uri.parse(holder.game.path)
|
||||||
}
|
}
|
||||||
|
|
||||||
val layerDrawable = ResourcesCompat.getDrawable(
|
|
||||||
YuzuApplication.appContext.resources,
|
|
||||||
R.drawable.shortcut,
|
|
||||||
null
|
|
||||||
) as LayerDrawable
|
|
||||||
layerDrawable.setDrawableByLayerId(
|
|
||||||
R.id.shortcut_foreground,
|
|
||||||
GameIconUtils.getGameIcon(holder.game).toDrawable(YuzuApplication.appContext.resources)
|
|
||||||
)
|
|
||||||
val inset = YuzuApplication.appContext.resources
|
|
||||||
.getDimensionPixelSize(R.dimen.icon_inset)
|
|
||||||
layerDrawable.setLayerInset(1, inset, inset, inset, inset)
|
|
||||||
val shortcut = ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)
|
val shortcut = ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)
|
||||||
.setShortLabel(holder.game.title)
|
.setShortLabel(holder.game.title)
|
||||||
.setIcon(
|
.setIcon(
|
||||||
IconCompat.createWithAdaptiveBitmap(
|
IconCompat.createWithBitmap(
|
||||||
layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
|
(holder.binding.imageGameScreen.drawable as BitmapDrawable).bitmap
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.setIntent(openIntent)
|
.setIntent(openIntent)
|
||||||
|
@ -10,12 +10,8 @@ import android.view.ViewGroup
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.content.res.ResourcesCompat
|
import androidx.core.content.res.ResourcesCompat
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.LifecycleOwner
|
import androidx.lifecycle.LifecycleOwner
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
|
import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
|
||||||
import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
|
import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
|
||||||
@ -49,7 +45,6 @@ class HomeSettingAdapter(
|
|||||||
holder.option.onClick.invoke()
|
holder.option.onClick.invoke()
|
||||||
} else {
|
} else {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
activity,
|
|
||||||
titleId = holder.option.disabledTitleId,
|
titleId = holder.option.disabledTitleId,
|
||||||
descriptionId = holder.option.disabledMessageId
|
descriptionId = holder.option.disabledMessageId
|
||||||
).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
|
).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
@ -91,11 +86,7 @@ class HomeSettingAdapter(
|
|||||||
binding.optionIcon.alpha = 0.5f
|
binding.optionIcon.alpha = 0.5f
|
||||||
}
|
}
|
||||||
|
|
||||||
viewLifecycle.lifecycleScope.launch {
|
option.details.observe(viewLifecycle) { updateOptionDetails(it) }
|
||||||
viewLifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
option.details.collect { updateOptionDetails(it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
binding.optionDetail.postDelayed(
|
binding.optionDetail.postDelayed(
|
||||||
{
|
{
|
||||||
binding.optionDetail.ellipsize = TextUtils.TruncateAt.MARQUEE
|
binding.optionDetail.ellipsize = TextUtils.TruncateAt.MARQUEE
|
||||||
|
@ -1,49 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.adapters
|
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
|
||||||
import org.yuzu.yuzu_emu.databinding.CardInstallableBinding
|
|
||||||
import org.yuzu.yuzu_emu.model.Installable
|
|
||||||
|
|
||||||
class InstallableAdapter(private val installables: List<Installable>) :
|
|
||||||
RecyclerView.Adapter<InstallableAdapter.InstallableViewHolder>() {
|
|
||||||
override fun onCreateViewHolder(
|
|
||||||
parent: ViewGroup,
|
|
||||||
viewType: Int
|
|
||||||
): InstallableAdapter.InstallableViewHolder {
|
|
||||||
val binding =
|
|
||||||
CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
|
||||||
return InstallableViewHolder(binding)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getItemCount(): Int = installables.size
|
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: InstallableAdapter.InstallableViewHolder, position: Int) =
|
|
||||||
holder.bind(installables[position])
|
|
||||||
|
|
||||||
inner class InstallableViewHolder(val binding: CardInstallableBinding) :
|
|
||||||
RecyclerView.ViewHolder(binding.root) {
|
|
||||||
lateinit var installable: Installable
|
|
||||||
|
|
||||||
fun bind(installable: Installable) {
|
|
||||||
this.installable = installable
|
|
||||||
|
|
||||||
binding.title.setText(installable.titleId)
|
|
||||||
binding.description.setText(installable.descriptionId)
|
|
||||||
|
|
||||||
if (installable.install != null) {
|
|
||||||
binding.buttonInstall.visibility = View.VISIBLE
|
|
||||||
binding.buttonInstall.setOnClickListener { installable.install.invoke() }
|
|
||||||
}
|
|
||||||
if (installable.export != null) {
|
|
||||||
binding.buttonExport.visibility = View.VISIBLE
|
|
||||||
binding.buttonExport.setOnClickListener { installable.export.invoke() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -10,7 +10,6 @@ enum class BooleanSetting(
|
|||||||
override val category: Settings.Category,
|
override val category: Settings.Category,
|
||||||
override val androidDefault: Boolean? = null
|
override val androidDefault: Boolean? = null
|
||||||
) : AbstractBooleanSetting {
|
) : AbstractBooleanSetting {
|
||||||
AUDIO_MUTED("audio_muted", Settings.Category.Audio),
|
|
||||||
CPU_DEBUG_MODE("cpu_debug_mode", Settings.Category.Cpu),
|
CPU_DEBUG_MODE("cpu_debug_mode", Settings.Category.Cpu),
|
||||||
FASTMEM("cpuopt_fastmem", Settings.Category.Cpu),
|
FASTMEM("cpuopt_fastmem", Settings.Category.Cpu),
|
||||||
FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.Category.Cpu),
|
FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.Category.Cpu),
|
||||||
|
@ -80,17 +80,6 @@ object Settings {
|
|||||||
const val SECTION_THEME = "Theme"
|
const val SECTION_THEME = "Theme"
|
||||||
const val SECTION_DEBUG = "Debug"
|
const val SECTION_DEBUG = "Debug"
|
||||||
|
|
||||||
enum class MenuTag(val titleId: Int) {
|
|
||||||
SECTION_ROOT(R.string.advanced_settings),
|
|
||||||
SECTION_GENERAL(R.string.preferences_general),
|
|
||||||
SECTION_SYSTEM(R.string.preferences_system),
|
|
||||||
SECTION_RENDERER(R.string.preferences_graphics),
|
|
||||||
SECTION_AUDIO(R.string.preferences_audio),
|
|
||||||
SECTION_CPU(R.string.cpu),
|
|
||||||
SECTION_THEME(R.string.preferences_theme),
|
|
||||||
SECTION_DEBUG(R.string.preferences_debug);
|
|
||||||
}
|
|
||||||
|
|
||||||
const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"
|
const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"
|
||||||
|
|
||||||
const val PREF_OVERLAY_VERSION = "OverlayVersion"
|
const val PREF_OVERLAY_VERSION = "OverlayVersion"
|
||||||
|
@ -3,12 +3,10 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.features.settings.model.view
|
package org.yuzu.yuzu_emu.features.settings.model.view
|
||||||
|
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
|
||||||
|
|
||||||
class SubmenuSetting(
|
class SubmenuSetting(
|
||||||
titleId: Int,
|
titleId: Int,
|
||||||
descriptionId: Int,
|
descriptionId: Int,
|
||||||
val menuKey: Settings.MenuTag
|
val menuKey: String
|
||||||
) : SettingsItem(emptySetting, titleId, descriptionId) {
|
) : SettingsItem(emptySetting, titleId, descriptionId) {
|
||||||
override val type = TYPE_SUBMENU
|
override val type = TYPE_SUBMENU
|
||||||
}
|
}
|
||||||
|
@ -13,15 +13,9 @@ import androidx.appcompat.app.AppCompatActivity
|
|||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowCompat
|
import androidx.core.view.WindowCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.navigation.fragment.NavHostFragment
|
import androidx.navigation.fragment.NavHostFragment
|
||||||
import androidx.navigation.navArgs
|
import androidx.navigation.navArgs
|
||||||
import com.google.android.material.color.MaterialColors
|
import com.google.android.material.color.MaterialColors
|
||||||
import kotlinx.coroutines.flow.collectLatest
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.yuzu.yuzu_emu.NativeLibrary
|
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
|
import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
|
||||||
@ -72,39 +66,25 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
lifecycleScope.apply {
|
settingsViewModel.shouldRecreate.observe(this) {
|
||||||
launch {
|
if (it) {
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
settingsViewModel.setShouldRecreate(false)
|
||||||
settingsViewModel.shouldRecreate.collectLatest {
|
recreate()
|
||||||
if (it) {
|
|
||||||
settingsViewModel.setShouldRecreate(false)
|
|
||||||
recreate()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
launch {
|
}
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
settingsViewModel.shouldNavigateBack.observe(this) {
|
||||||
settingsViewModel.shouldNavigateBack.collectLatest {
|
if (it) {
|
||||||
if (it) {
|
settingsViewModel.setShouldNavigateBack(false)
|
||||||
settingsViewModel.setShouldNavigateBack(false)
|
navigateBack()
|
||||||
navigateBack()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
launch {
|
}
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
settingsViewModel.shouldShowResetSettingsDialog.observe(this) {
|
||||||
settingsViewModel.shouldShowResetSettingsDialog.collectLatest {
|
if (it) {
|
||||||
if (it) {
|
settingsViewModel.setShouldShowResetSettingsDialog(false)
|
||||||
settingsViewModel.setShouldShowResetSettingsDialog(false)
|
ResetSettingsDialogFragment().show(
|
||||||
ResetSettingsDialogFragment().show(
|
supportFragmentManager,
|
||||||
supportFragmentManager,
|
ResetSettingsDialogFragment.TAG
|
||||||
ResetSettingsDialogFragment.TAG
|
)
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -169,7 +149,7 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
if (!settingsFile.delete()) {
|
if (!settingsFile.delete()) {
|
||||||
throw IOException("Failed to delete $settingsFile")
|
throw IOException("Failed to delete $settingsFile")
|
||||||
}
|
}
|
||||||
NativeLibrary.reloadSettings()
|
Settings.settingsList.forEach { it.reset() }
|
||||||
|
|
||||||
Toast.makeText(
|
Toast.makeText(
|
||||||
applicationContext,
|
applicationContext,
|
||||||
@ -182,14 +162,12 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
private fun setInsets() {
|
private fun setInsets() {
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(
|
ViewCompat.setOnApplyWindowInsetsListener(
|
||||||
binding.navigationBarShade
|
binding.navigationBarShade
|
||||||
) { _: View, windowInsets: WindowInsetsCompat ->
|
) { view: View, windowInsets: WindowInsetsCompat ->
|
||||||
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
|
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
|
||||||
|
|
||||||
// The only situation where we care to have a nav bar shade is when it's at the bottom
|
val mlpShade = view.layoutParams as MarginLayoutParams
|
||||||
// of the screen where scrolling list elements can go behind it.
|
mlpShade.height = barInsets.bottom
|
||||||
val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams
|
view.layoutParams = mlpShade
|
||||||
mlpNavShade.height = barInsets.bottom
|
|
||||||
binding.navigationBarShade.layoutParams = mlpNavShade
|
|
||||||
|
|
||||||
windowInsets
|
windowInsets
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.features.settings.ui
|
package org.yuzu.yuzu_emu.features.settings.ui
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
@ -14,19 +13,14 @@ import androidx.core.view.WindowInsetsCompat
|
|||||||
import androidx.core.view.updatePadding
|
import androidx.core.view.updatePadding
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.navigation.findNavController
|
import androidx.navigation.findNavController
|
||||||
import androidx.navigation.fragment.navArgs
|
import androidx.navigation.fragment.navArgs
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import com.google.android.material.divider.MaterialDividerItemDecoration
|
import com.google.android.material.divider.MaterialDividerItemDecoration
|
||||||
import com.google.android.material.transition.MaterialSharedAxis
|
import com.google.android.material.transition.MaterialSharedAxis
|
||||||
import kotlinx.coroutines.flow.collectLatest
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.databinding.FragmentSettingsBinding
|
import org.yuzu.yuzu_emu.databinding.FragmentSettingsBinding
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
|
||||||
import org.yuzu.yuzu_emu.model.SettingsViewModel
|
import org.yuzu.yuzu_emu.model.SettingsViewModel
|
||||||
|
|
||||||
class SettingsFragment : Fragment() {
|
class SettingsFragment : Fragment() {
|
||||||
@ -57,17 +51,15 @@ class SettingsFragment : Fragment() {
|
|||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is using the correct scope, lint is just acting up
|
|
||||||
@SuppressLint("UnsafeRepeatOnLifecycleDetector")
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
settingsAdapter = SettingsAdapter(this, requireContext())
|
settingsAdapter = SettingsAdapter(this, requireContext())
|
||||||
presenter = SettingsFragmentPresenter(
|
presenter = SettingsFragmentPresenter(
|
||||||
settingsViewModel,
|
settingsViewModel,
|
||||||
settingsAdapter!!,
|
settingsAdapter!!,
|
||||||
args.menuTag
|
args.menuTag,
|
||||||
|
args.game?.gameId ?: ""
|
||||||
)
|
)
|
||||||
|
|
||||||
binding.toolbarSettingsLayout.title = getString(args.menuTag.titleId)
|
|
||||||
val dividerDecoration = MaterialDividerItemDecoration(
|
val dividerDecoration = MaterialDividerItemDecoration(
|
||||||
requireContext(),
|
requireContext(),
|
||||||
LinearLayoutManager.VERTICAL
|
LinearLayoutManager.VERTICAL
|
||||||
@ -83,31 +75,28 @@ class SettingsFragment : Fragment() {
|
|||||||
settingsViewModel.setShouldNavigateBack(true)
|
settingsViewModel.setShouldNavigateBack(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
viewLifecycleOwner.lifecycleScope.apply {
|
settingsViewModel.toolbarTitle.observe(viewLifecycleOwner) {
|
||||||
launch {
|
if (it.isNotEmpty()) binding.toolbarSettingsLayout.title = it
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
}
|
||||||
settingsViewModel.shouldReloadSettingsList.collectLatest {
|
|
||||||
if (it) {
|
settingsViewModel.shouldReloadSettingsList.observe(viewLifecycleOwner) {
|
||||||
settingsViewModel.setShouldReloadSettingsList(false)
|
if (it) {
|
||||||
presenter.loadSettingsList()
|
settingsViewModel.setShouldReloadSettingsList(false)
|
||||||
}
|
presenter.loadSettingsList()
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
launch {
|
|
||||||
settingsViewModel.isUsingSearch.collectLatest {
|
|
||||||
if (it) {
|
|
||||||
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
|
|
||||||
exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
|
|
||||||
} else {
|
|
||||||
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
|
|
||||||
exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.menuTag == Settings.MenuTag.SECTION_ROOT) {
|
settingsViewModel.isUsingSearch.observe(viewLifecycleOwner) {
|
||||||
|
if (it) {
|
||||||
|
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
|
||||||
|
exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
|
||||||
|
} else {
|
||||||
|
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
|
||||||
|
exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.menuTag == SettingsFile.FILE_NAME_CONFIG) {
|
||||||
binding.toolbarSettings.inflateMenu(R.menu.menu_settings)
|
binding.toolbarSettings.inflateMenu(R.menu.menu_settings)
|
||||||
binding.toolbarSettings.setOnMenuItemClickListener {
|
binding.toolbarSettings.setOnMenuItemClickListener {
|
||||||
when (it.itemId) {
|
when (it.itemId) {
|
||||||
|
@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.features.settings.ui
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
|
import android.text.TextUtils
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
@ -19,13 +20,15 @@ import org.yuzu.yuzu_emu.features.settings.model.LongSetting
|
|||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
|
import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.view.*
|
import org.yuzu.yuzu_emu.features.settings.model.view.*
|
||||||
|
import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
|
||||||
import org.yuzu.yuzu_emu.model.SettingsViewModel
|
import org.yuzu.yuzu_emu.model.SettingsViewModel
|
||||||
import org.yuzu.yuzu_emu.utils.NativeConfig
|
import org.yuzu.yuzu_emu.utils.NativeConfig
|
||||||
|
|
||||||
class SettingsFragmentPresenter(
|
class SettingsFragmentPresenter(
|
||||||
private val settingsViewModel: SettingsViewModel,
|
private val settingsViewModel: SettingsViewModel,
|
||||||
private val adapter: SettingsAdapter,
|
private val adapter: SettingsAdapter,
|
||||||
private var menuTag: Settings.MenuTag
|
private var menuTag: String,
|
||||||
|
private var gameId: String
|
||||||
) {
|
) {
|
||||||
private var settingsList = ArrayList<SettingsItem>()
|
private var settingsList = ArrayList<SettingsItem>()
|
||||||
|
|
||||||
@ -50,15 +53,24 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun loadSettingsList() {
|
fun loadSettingsList() {
|
||||||
|
if (!TextUtils.isEmpty(gameId)) {
|
||||||
|
settingsViewModel.setToolbarTitle(
|
||||||
|
context.getString(
|
||||||
|
R.string.advanced_settings_game,
|
||||||
|
gameId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
val sl = ArrayList<SettingsItem>()
|
val sl = ArrayList<SettingsItem>()
|
||||||
when (menuTag) {
|
when (menuTag) {
|
||||||
Settings.MenuTag.SECTION_ROOT -> addConfigSettings(sl)
|
SettingsFile.FILE_NAME_CONFIG -> addConfigSettings(sl)
|
||||||
Settings.MenuTag.SECTION_GENERAL -> addGeneralSettings(sl)
|
Settings.SECTION_GENERAL -> addGeneralSettings(sl)
|
||||||
Settings.MenuTag.SECTION_SYSTEM -> addSystemSettings(sl)
|
Settings.SECTION_SYSTEM -> addSystemSettings(sl)
|
||||||
Settings.MenuTag.SECTION_RENDERER -> addGraphicsSettings(sl)
|
Settings.SECTION_RENDERER -> addGraphicsSettings(sl)
|
||||||
Settings.MenuTag.SECTION_AUDIO -> addAudioSettings(sl)
|
Settings.SECTION_AUDIO -> addAudioSettings(sl)
|
||||||
Settings.MenuTag.SECTION_THEME -> addThemeSettings(sl)
|
Settings.SECTION_THEME -> addThemeSettings(sl)
|
||||||
Settings.MenuTag.SECTION_DEBUG -> addDebugSettings(sl)
|
Settings.SECTION_DEBUG -> addDebugSettings(sl)
|
||||||
else -> {
|
else -> {
|
||||||
val context = YuzuApplication.appContext
|
val context = YuzuApplication.appContext
|
||||||
Toast.makeText(
|
Toast.makeText(
|
||||||
@ -74,12 +86,13 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addConfigSettings(sl: ArrayList<SettingsItem>) {
|
private fun addConfigSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.advanced_settings))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(SubmenuSetting(R.string.preferences_general, 0, Settings.MenuTag.SECTION_GENERAL))
|
add(SubmenuSetting(R.string.preferences_general, 0, Settings.SECTION_GENERAL))
|
||||||
add(SubmenuSetting(R.string.preferences_system, 0, Settings.MenuTag.SECTION_SYSTEM))
|
add(SubmenuSetting(R.string.preferences_system, 0, Settings.SECTION_SYSTEM))
|
||||||
add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.MenuTag.SECTION_RENDERER))
|
add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.SECTION_RENDERER))
|
||||||
add(SubmenuSetting(R.string.preferences_audio, 0, Settings.MenuTag.SECTION_AUDIO))
|
add(SubmenuSetting(R.string.preferences_audio, 0, Settings.SECTION_AUDIO))
|
||||||
add(SubmenuSetting(R.string.preferences_debug, 0, Settings.MenuTag.SECTION_DEBUG))
|
add(SubmenuSetting(R.string.preferences_debug, 0, Settings.SECTION_DEBUG))
|
||||||
add(
|
add(
|
||||||
RunnableSetting(R.string.reset_to_default, 0, false) {
|
RunnableSetting(R.string.reset_to_default, 0, false) {
|
||||||
settingsViewModel.setShouldShowResetSettingsDialog(true)
|
settingsViewModel.setShouldShowResetSettingsDialog(true)
|
||||||
@ -89,6 +102,7 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addGeneralSettings(sl: ArrayList<SettingsItem>) {
|
private fun addGeneralSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_general))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
|
add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
|
||||||
add(ShortSetting.RENDERER_SPEED_LIMIT.key)
|
add(ShortSetting.RENDERER_SPEED_LIMIT.key)
|
||||||
@ -98,6 +112,7 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addSystemSettings(sl: ArrayList<SettingsItem>) {
|
private fun addSystemSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_system))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(BooleanSetting.USE_DOCKED_MODE.key)
|
add(BooleanSetting.USE_DOCKED_MODE.key)
|
||||||
add(IntSetting.REGION_INDEX.key)
|
add(IntSetting.REGION_INDEX.key)
|
||||||
@ -108,6 +123,7 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
|
private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_graphics))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(IntSetting.RENDERER_ACCURACY.key)
|
add(IntSetting.RENDERER_ACCURACY.key)
|
||||||
add(IntSetting.RENDERER_RESOLUTION.key)
|
add(IntSetting.RENDERER_RESOLUTION.key)
|
||||||
@ -124,6 +140,7 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addAudioSettings(sl: ArrayList<SettingsItem>) {
|
private fun addAudioSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_audio))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(IntSetting.AUDIO_OUTPUT_ENGINE.key)
|
add(IntSetting.AUDIO_OUTPUT_ENGINE.key)
|
||||||
add(ByteSetting.AUDIO_VOLUME.key)
|
add(ByteSetting.AUDIO_VOLUME.key)
|
||||||
@ -131,6 +148,7 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addThemeSettings(sl: ArrayList<SettingsItem>) {
|
private fun addThemeSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_theme))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
val theme: AbstractIntSetting = object : AbstractIntSetting {
|
val theme: AbstractIntSetting = object : AbstractIntSetting {
|
||||||
override val int: Int
|
override val int: Int
|
||||||
@ -243,6 +261,7 @@ class SettingsFragmentPresenter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addDebugSettings(sl: ArrayList<SettingsItem>) {
|
private fun addDebugSettings(sl: ArrayList<SettingsItem>) {
|
||||||
|
settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_debug))
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(HeaderSetting(R.string.gpu))
|
add(HeaderSetting(R.string.gpu))
|
||||||
add(IntSetting.RENDERER_BACKEND.key)
|
add(IntSetting.RENDERER_BACKEND.key)
|
||||||
|
@ -15,9 +15,9 @@ import android.net.Uri
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
|
import android.util.Rational
|
||||||
import android.view.*
|
import android.view.*
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import android.widget.Toast
|
|
||||||
import androidx.activity.OnBackPressedCallback
|
import androidx.activity.OnBackPressedCallback
|
||||||
import androidx.appcompat.widget.PopupMenu
|
import androidx.appcompat.widget.PopupMenu
|
||||||
import androidx.core.content.res.ResourcesCompat
|
import androidx.core.content.res.ResourcesCompat
|
||||||
@ -39,7 +39,6 @@ import androidx.window.layout.WindowLayoutInfo
|
|||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import com.google.android.material.slider.Slider
|
import com.google.android.material.slider.Slider
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.collectLatest
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.yuzu.yuzu_emu.HomeNavigationDirections
|
import org.yuzu.yuzu_emu.HomeNavigationDirections
|
||||||
import org.yuzu.yuzu_emu.NativeLibrary
|
import org.yuzu.yuzu_emu.NativeLibrary
|
||||||
@ -50,11 +49,11 @@ import org.yuzu.yuzu_emu.databinding.DialogOverlayAdjustBinding
|
|||||||
import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
|
import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.IntSetting
|
import org.yuzu.yuzu_emu.features.settings.model.IntSetting
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
||||||
|
import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
|
||||||
import org.yuzu.yuzu_emu.model.Game
|
import org.yuzu.yuzu_emu.model.Game
|
||||||
import org.yuzu.yuzu_emu.model.EmulationViewModel
|
import org.yuzu.yuzu_emu.model.EmulationViewModel
|
||||||
import org.yuzu.yuzu_emu.overlay.InputOverlay
|
import org.yuzu.yuzu_emu.overlay.InputOverlay
|
||||||
import org.yuzu.yuzu_emu.utils.*
|
import org.yuzu.yuzu_emu.utils.*
|
||||||
import java.lang.NullPointerException
|
|
||||||
|
|
||||||
class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
||||||
private lateinit var preferences: SharedPreferences
|
private lateinit var preferences: SharedPreferences
|
||||||
@ -106,21 +105,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
game = if (args.game != null) {
|
||||||
try {
|
args.game!!
|
||||||
game = if (args.game != null) {
|
} else {
|
||||||
args.game!!
|
intentGame ?: error("[EmulationFragment] No bootable game present!")
|
||||||
} else {
|
|
||||||
intentGame!!
|
|
||||||
}
|
|
||||||
} catch (e: NullPointerException) {
|
|
||||||
Toast.makeText(
|
|
||||||
requireContext(),
|
|
||||||
R.string.no_game_present,
|
|
||||||
Toast.LENGTH_SHORT
|
|
||||||
).show()
|
|
||||||
requireActivity().finish()
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// So this fragment doesn't restart on configuration changes; i.e. rotation.
|
// So this fragment doesn't restart on configuration changes; i.e. rotation.
|
||||||
@ -141,14 +129,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is using the correct scope, lint is just acting up
|
|
||||||
@SuppressLint("UnsafeRepeatOnLifecycleDetector")
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
if (requireActivity().isFinishing) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
binding.surfaceEmulation.holder.addCallback(this)
|
binding.surfaceEmulation.holder.addCallback(this)
|
||||||
binding.showFpsText.setTextColor(Color.YELLOW)
|
binding.showFpsText.setTextColor(Color.YELLOW)
|
||||||
binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
|
binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
|
||||||
@ -182,7 +163,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
R.id.menu_settings -> {
|
R.id.menu_settings -> {
|
||||||
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
||||||
null,
|
null,
|
||||||
Settings.MenuTag.SECTION_ROOT
|
SettingsFile.FILE_NAME_CONFIG
|
||||||
)
|
)
|
||||||
binding.root.findNavController().navigate(action)
|
binding.root.findNavController().navigate(action)
|
||||||
true
|
true
|
||||||
@ -224,103 +205,85 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
|
||||||
|
lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
|
||||||
|
WindowInfoTracker.getOrCreate(requireContext())
|
||||||
|
.windowLayoutInfo(requireActivity())
|
||||||
|
.collect { updateFoldableLayout(requireActivity() as EmulationActivity, it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
GameIconUtils.loadGameIcon(game, binding.loadingImage)
|
GameIconUtils.loadGameIcon(game, binding.loadingImage)
|
||||||
binding.loadingTitle.text = game.title
|
binding.loadingTitle.text = game.title
|
||||||
binding.loadingTitle.isSelected = true
|
binding.loadingTitle.isSelected = true
|
||||||
binding.loadingText.isSelected = true
|
binding.loadingText.isSelected = true
|
||||||
|
|
||||||
viewLifecycleOwner.lifecycleScope.apply {
|
emulationViewModel.shaderProgress.observe(viewLifecycleOwner) {
|
||||||
launch {
|
if (it > 0 && it != emulationViewModel.totalShaders.value!!) {
|
||||||
repeatOnLifecycle(Lifecycle.State.STARTED) {
|
binding.loadingProgressIndicator.isIndeterminate = false
|
||||||
WindowInfoTracker.getOrCreate(requireContext())
|
|
||||||
.windowLayoutInfo(requireActivity())
|
|
||||||
.collect {
|
|
||||||
updateFoldableLayout(requireActivity() as EmulationActivity, it)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
emulationViewModel.shaderProgress.collectLatest {
|
|
||||||
if (it > 0 && it != emulationViewModel.totalShaders.value) {
|
|
||||||
binding.loadingProgressIndicator.isIndeterminate = false
|
|
||||||
|
|
||||||
if (it < binding.loadingProgressIndicator.max) {
|
if (it < binding.loadingProgressIndicator.max) {
|
||||||
binding.loadingProgressIndicator.progress = it
|
binding.loadingProgressIndicator.progress = it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (it == emulationViewModel.totalShaders.value) {
|
if (it == emulationViewModel.totalShaders.value!!) {
|
||||||
binding.loadingText.setText(R.string.loading)
|
binding.loadingText.setText(R.string.loading)
|
||||||
binding.loadingProgressIndicator.isIndeterminate = true
|
binding.loadingProgressIndicator.isIndeterminate = true
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
launch {
|
}
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
emulationViewModel.totalShaders.observe(viewLifecycleOwner) {
|
||||||
emulationViewModel.totalShaders.collectLatest {
|
binding.loadingProgressIndicator.max = it
|
||||||
binding.loadingProgressIndicator.max = it
|
}
|
||||||
}
|
emulationViewModel.shaderMessage.observe(viewLifecycleOwner) {
|
||||||
}
|
if (it.isNotEmpty()) {
|
||||||
|
binding.loadingText.text = it
|
||||||
}
|
}
|
||||||
launch {
|
}
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
emulationViewModel.shaderMessage.collectLatest {
|
|
||||||
if (it.isNotEmpty()) {
|
|
||||||
binding.loadingText.text = it
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
emulationViewModel.emulationStarted.collectLatest {
|
|
||||||
if (it) {
|
|
||||||
binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
|
|
||||||
ViewUtils.showView(binding.surfaceInputOverlay)
|
|
||||||
ViewUtils.hideView(binding.loadingIndicator)
|
|
||||||
|
|
||||||
// Setup overlay
|
emulationViewModel.emulationStarted.observe(viewLifecycleOwner) { started ->
|
||||||
updateShowFpsOverlay()
|
if (started) {
|
||||||
}
|
binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
|
||||||
}
|
ViewUtils.showView(binding.surfaceInputOverlay)
|
||||||
}
|
ViewUtils.hideView(binding.loadingIndicator)
|
||||||
|
|
||||||
|
// Setup overlay
|
||||||
|
updateShowFpsOverlay()
|
||||||
}
|
}
|
||||||
launch {
|
}
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
emulationViewModel.isEmulationStopping.collectLatest {
|
emulationViewModel.isEmulationStopping.observe(viewLifecycleOwner) {
|
||||||
if (it) {
|
if (it) {
|
||||||
binding.loadingText.setText(R.string.shutting_down)
|
binding.loadingText.setText(R.string.shutting_down)
|
||||||
ViewUtils.showView(binding.loadingIndicator)
|
ViewUtils.showView(binding.loadingIndicator)
|
||||||
ViewUtils.hideView(binding.inputContainer)
|
ViewUtils.hideView(binding.inputContainer)
|
||||||
ViewUtils.hideView(binding.showFpsText)
|
ViewUtils.hideView(binding.showFpsText)
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onConfigurationChanged(newConfig: Configuration) {
|
override fun onConfigurationChanged(newConfig: Configuration) {
|
||||||
super.onConfigurationChanged(newConfig)
|
super.onConfigurationChanged(newConfig)
|
||||||
if (_binding == null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
updateScreenLayout()
|
|
||||||
if (emulationActivity?.isInPictureInPictureMode == true) {
|
if (emulationActivity?.isInPictureInPictureMode == true) {
|
||||||
if (binding.drawerLayout.isOpen) {
|
if (binding.drawerLayout.isOpen) {
|
||||||
binding.drawerLayout.close()
|
binding.drawerLayout.close()
|
||||||
}
|
}
|
||||||
if (EmulationMenuSettings.showOverlay) {
|
if (EmulationMenuSettings.showOverlay) {
|
||||||
binding.surfaceInputOverlay.visibility = View.INVISIBLE
|
binding.surfaceInputOverlay.post {
|
||||||
|
binding.surfaceInputOverlay.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
|
if (EmulationMenuSettings.showOverlay &&
|
||||||
binding.surfaceInputOverlay.visibility = View.VISIBLE
|
emulationViewModel.emulationStarted.value == true
|
||||||
|
) {
|
||||||
|
binding.surfaceInputOverlay.post {
|
||||||
|
binding.surfaceInputOverlay.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.surfaceInputOverlay.visibility = View.INVISIBLE
|
binding.surfaceInputOverlay.post {
|
||||||
|
binding.surfaceInputOverlay.visibility = View.INVISIBLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!isInFoldableLayout) {
|
if (!isInFoldableLayout) {
|
||||||
if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
|
if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
|
||||||
@ -344,7 +307,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
|
if (emulationState.isRunning) {
|
||||||
emulationState.pause()
|
emulationState.pause()
|
||||||
}
|
}
|
||||||
super.onPause()
|
super.onPause()
|
||||||
@ -410,7 +373,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updateScreenLayout() {
|
private fun updateScreenLayout() {
|
||||||
binding.surfaceEmulation.setAspectRatio(null)
|
binding.surfaceEmulation.setAspectRatio(
|
||||||
|
when (IntSetting.RENDERER_ASPECT_RATIO.int) {
|
||||||
|
0 -> Rational(16, 9)
|
||||||
|
1 -> Rational(4, 3)
|
||||||
|
2 -> Rational(21, 9)
|
||||||
|
3 -> Rational(16, 10)
|
||||||
|
4 -> null // Stretch
|
||||||
|
else -> Rational(16, 9)
|
||||||
|
}
|
||||||
|
)
|
||||||
emulationActivity?.buildPictureInPictureParams()
|
emulationActivity?.buildPictureInPictureParams()
|
||||||
updateOrientation()
|
updateOrientation()
|
||||||
}
|
}
|
||||||
@ -700,6 +672,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
private class EmulationState(private val gamePath: String) {
|
private class EmulationState(private val gamePath: String) {
|
||||||
private var state: State
|
private var state: State
|
||||||
private var surface: Surface? = null
|
private var surface: Surface? = null
|
||||||
|
private var runWhenSurfaceIsValid = false
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// Starting state is stopped.
|
// Starting state is stopped.
|
||||||
@ -757,6 +730,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
// If the surface is set, run now. Otherwise, wait for it to get set.
|
// If the surface is set, run now. Otherwise, wait for it to get set.
|
||||||
if (surface != null) {
|
if (surface != null) {
|
||||||
runWithValidSurface()
|
runWithValidSurface()
|
||||||
|
} else {
|
||||||
|
runWhenSurfaceIsValid = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -764,7 +739,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
@Synchronized
|
@Synchronized
|
||||||
fun newSurface(surface: Surface?) {
|
fun newSurface(surface: Surface?) {
|
||||||
this.surface = surface
|
this.surface = surface
|
||||||
if (this.surface != null) {
|
if (runWhenSurfaceIsValid) {
|
||||||
runWithValidSurface()
|
runWithValidSurface()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -792,9 +767,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun runWithValidSurface() {
|
private fun runWithValidSurface() {
|
||||||
NativeLibrary.surfaceChanged(surface)
|
runWhenSurfaceIsValid = false
|
||||||
when (state) {
|
when (state) {
|
||||||
State.STOPPED -> {
|
State.STOPPED -> {
|
||||||
|
NativeLibrary.surfaceChanged(surface)
|
||||||
val emulationThread = Thread({
|
val emulationThread = Thread({
|
||||||
Log.debug("[EmulationFragment] Starting emulation thread.")
|
Log.debug("[EmulationFragment] Starting emulation thread.")
|
||||||
NativeLibrary.run(gamePath)
|
NativeLibrary.run(gamePath)
|
||||||
@ -804,6 +780,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
|
|
||||||
State.PAUSED -> {
|
State.PAUSED -> {
|
||||||
Log.debug("[EmulationFragment] Resuming emulation.")
|
Log.debug("[EmulationFragment] Resuming emulation.")
|
||||||
|
NativeLibrary.surfaceChanged(surface)
|
||||||
NativeLibrary.unpauseEmulation()
|
NativeLibrary.unpauseEmulation()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +37,7 @@ import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
|
|||||||
import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
|
import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
|
||||||
import org.yuzu.yuzu_emu.features.DocumentProvider
|
import org.yuzu.yuzu_emu.features.DocumentProvider
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
||||||
|
import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
|
||||||
import org.yuzu.yuzu_emu.model.HomeSetting
|
import org.yuzu.yuzu_emu.model.HomeSetting
|
||||||
import org.yuzu.yuzu_emu.model.HomeViewModel
|
import org.yuzu.yuzu_emu.model.HomeViewModel
|
||||||
import org.yuzu.yuzu_emu.ui.main.MainActivity
|
import org.yuzu.yuzu_emu.ui.main.MainActivity
|
||||||
@ -77,7 +78,7 @@ class HomeSettingsFragment : Fragment() {
|
|||||||
{
|
{
|
||||||
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
||||||
null,
|
null,
|
||||||
Settings.MenuTag.SECTION_ROOT
|
SettingsFile.FILE_NAME_CONFIG
|
||||||
)
|
)
|
||||||
binding.root.findNavController().navigate(action)
|
binding.root.findNavController().navigate(action)
|
||||||
}
|
}
|
||||||
@ -99,7 +100,7 @@ class HomeSettingsFragment : Fragment() {
|
|||||||
{
|
{
|
||||||
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
||||||
null,
|
null,
|
||||||
Settings.MenuTag.SECTION_THEME
|
Settings.SECTION_THEME
|
||||||
)
|
)
|
||||||
binding.root.findNavController().navigate(action)
|
binding.root.findNavController().navigate(action)
|
||||||
}
|
}
|
||||||
@ -118,13 +119,18 @@ class HomeSettingsFragment : Fragment() {
|
|||||||
)
|
)
|
||||||
add(
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.manage_yuzu_data,
|
R.string.install_amiibo_keys,
|
||||||
R.string.manage_yuzu_data_description,
|
R.string.install_amiibo_keys_description,
|
||||||
R.drawable.ic_install,
|
R.drawable.ic_nfc,
|
||||||
{
|
{ mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
|
||||||
binding.root.findNavController()
|
)
|
||||||
.navigate(R.id.action_homeSettingsFragment_to_installableFragment)
|
)
|
||||||
}
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.install_game_content,
|
||||||
|
R.string.install_game_content_description,
|
||||||
|
R.drawable.ic_system_update_alt,
|
||||||
|
{ mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
add(
|
add(
|
||||||
@ -143,6 +149,35 @@ class HomeSettingsFragment : Fragment() {
|
|||||||
homeViewModel.gamesDir
|
homeViewModel.gamesDir
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.manage_save_data,
|
||||||
|
R.string.import_export_saves_description,
|
||||||
|
R.drawable.ic_save,
|
||||||
|
{
|
||||||
|
ImportExportSavesFragment().show(
|
||||||
|
parentFragmentManager,
|
||||||
|
ImportExportSavesFragment.TAG
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.install_prod_keys,
|
||||||
|
R.string.install_prod_keys_description,
|
||||||
|
R.drawable.ic_unlock,
|
||||||
|
{ mainActivity.getProdKey.launch(arrayOf("*/*")) }
|
||||||
|
)
|
||||||
|
)
|
||||||
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.install_firmware,
|
||||||
|
R.string.install_firmware_description,
|
||||||
|
R.drawable.ic_firmware,
|
||||||
|
{ mainActivity.getFirmware.launch(arrayOf("application/zip")) }
|
||||||
|
)
|
||||||
|
)
|
||||||
add(
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.share_log,
|
R.string.share_log,
|
||||||
|
@ -0,0 +1,213 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
package org.yuzu.yuzu_emu.fragments
|
||||||
|
|
||||||
|
import android.app.Dialog
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.provider.DocumentsContract
|
||||||
|
import android.widget.Toast
|
||||||
|
import androidx.activity.result.ActivityResultLauncher
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import androidx.documentfile.provider.DocumentFile
|
||||||
|
import androidx.fragment.app.DialogFragment
|
||||||
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
|
import java.io.BufferedOutputStream
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileOutputStream
|
||||||
|
import java.io.FilenameFilter
|
||||||
|
import java.time.LocalDateTime
|
||||||
|
import java.time.format.DateTimeFormatter
|
||||||
|
import java.util.zip.ZipEntry
|
||||||
|
import java.util.zip.ZipOutputStream
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import org.yuzu.yuzu_emu.R
|
||||||
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
|
import org.yuzu.yuzu_emu.features.DocumentProvider
|
||||||
|
import org.yuzu.yuzu_emu.getPublicFilesDir
|
||||||
|
import org.yuzu.yuzu_emu.utils.FileUtil
|
||||||
|
|
||||||
|
class ImportExportSavesFragment : DialogFragment() {
|
||||||
|
private val context = YuzuApplication.appContext
|
||||||
|
private val savesFolder =
|
||||||
|
"${context.getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
|
||||||
|
|
||||||
|
// Get first subfolder in saves folder (should be the user folder)
|
||||||
|
private val savesFolderRoot = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
|
||||||
|
private var lastZipCreated: File? = null
|
||||||
|
|
||||||
|
private lateinit var startForResultExportSave: ActivityResultLauncher<Intent>
|
||||||
|
private lateinit var documentPicker: ActivityResultLauncher<Array<String>>
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
val activity = requireActivity() as AppCompatActivity
|
||||||
|
|
||||||
|
val activityResultRegistry = requireActivity().activityResultRegistry
|
||||||
|
startForResultExportSave = activityResultRegistry.register(
|
||||||
|
"startForResultExportSaveKey",
|
||||||
|
ActivityResultContracts.StartActivityForResult()
|
||||||
|
) {
|
||||||
|
File(context.getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
|
||||||
|
}
|
||||||
|
documentPicker = activityResultRegistry.register(
|
||||||
|
"documentPickerKey",
|
||||||
|
ActivityResultContracts.OpenDocument()
|
||||||
|
) {
|
||||||
|
it?.let { uri -> importSave(uri, activity) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
|
return if (savesFolderRoot == "") {
|
||||||
|
MaterialAlertDialogBuilder(requireContext())
|
||||||
|
.setTitle(R.string.manage_save_data)
|
||||||
|
.setMessage(R.string.import_export_saves_no_profile)
|
||||||
|
.setPositiveButton(android.R.string.ok, null)
|
||||||
|
.show()
|
||||||
|
} else {
|
||||||
|
MaterialAlertDialogBuilder(requireContext())
|
||||||
|
.setTitle(R.string.manage_save_data)
|
||||||
|
.setMessage(R.string.manage_save_data_description)
|
||||||
|
.setNegativeButton(R.string.export_saves) { _, _ ->
|
||||||
|
exportSave()
|
||||||
|
}
|
||||||
|
.setPositiveButton(R.string.import_saves) { _, _ ->
|
||||||
|
documentPicker.launch(arrayOf("application/zip"))
|
||||||
|
}
|
||||||
|
.setNeutralButton(android.R.string.cancel, null)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Zips the save files located in the given folder path and creates a new zip file with the current date and time.
|
||||||
|
* @return true if the zip file is successfully created, false otherwise.
|
||||||
|
*/
|
||||||
|
private fun zipSave(): Boolean {
|
||||||
|
try {
|
||||||
|
val tempFolder = File(requireContext().getPublicFilesDir().canonicalPath, "temp")
|
||||||
|
tempFolder.mkdirs()
|
||||||
|
val saveFolder = File(savesFolderRoot)
|
||||||
|
val outputZipFile = File(
|
||||||
|
tempFolder,
|
||||||
|
"yuzu saves - ${
|
||||||
|
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
|
||||||
|
}.zip"
|
||||||
|
)
|
||||||
|
outputZipFile.createNewFile()
|
||||||
|
ZipOutputStream(BufferedOutputStream(FileOutputStream(outputZipFile))).use { zos ->
|
||||||
|
saveFolder.walkTopDown().forEach { file ->
|
||||||
|
val zipFileName =
|
||||||
|
file.absolutePath.removePrefix(savesFolderRoot).removePrefix("/")
|
||||||
|
if (zipFileName == "") {
|
||||||
|
return@forEach
|
||||||
|
}
|
||||||
|
val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
|
||||||
|
zos.putNextEntry(entry)
|
||||||
|
if (file.isFile) {
|
||||||
|
file.inputStream().use { fis -> fis.copyTo(zos) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastZipCreated = outputZipFile
|
||||||
|
} catch (e: Exception) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
|
||||||
|
*/
|
||||||
|
private fun exportSave() {
|
||||||
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
val wasZipCreated = zipSave()
|
||||||
|
val lastZipFile = lastZipCreated
|
||||||
|
if (!wasZipCreated || lastZipFile == null) {
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
Toast.makeText(context, "Failed to export save", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
return@launch
|
||||||
|
}
|
||||||
|
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
val file = DocumentFile.fromSingleUri(
|
||||||
|
context,
|
||||||
|
DocumentsContract.buildDocumentUri(
|
||||||
|
DocumentProvider.AUTHORITY,
|
||||||
|
"${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
|
||||||
|
)
|
||||||
|
)!!
|
||||||
|
val intent = Intent(Intent.ACTION_SEND)
|
||||||
|
.setDataAndType(file.uri, "application/zip")
|
||||||
|
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||||
|
.putExtra(Intent.EXTRA_STREAM, file.uri)
|
||||||
|
startForResultExportSave.launch(Intent.createChooser(intent, "Share save file"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Imports the save files contained in the zip file, and replaces any existing ones with the new save file.
|
||||||
|
* @param zipUri The Uri of the zip file containing the save file(s) to import.
|
||||||
|
*/
|
||||||
|
private fun importSave(zipUri: Uri, activity: AppCompatActivity) {
|
||||||
|
val inputZip = context.contentResolver.openInputStream(zipUri)
|
||||||
|
// A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
|
||||||
|
var validZip = false
|
||||||
|
val savesFolder = File(savesFolderRoot)
|
||||||
|
val cacheSaveDir = File("${context.cacheDir.path}/saves/")
|
||||||
|
cacheSaveDir.mkdir()
|
||||||
|
|
||||||
|
if (inputZip == null) {
|
||||||
|
Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
|
||||||
|
.show()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val filterTitleId =
|
||||||
|
FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
|
||||||
|
|
||||||
|
try {
|
||||||
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
FileUtil.unzip(inputZip, cacheSaveDir)
|
||||||
|
cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
|
||||||
|
File(savesFolder, savePath).deleteRecursively()
|
||||||
|
File(cacheSaveDir, savePath).copyRecursively(File(savesFolder, savePath), true)
|
||||||
|
validZip = true
|
||||||
|
}
|
||||||
|
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
if (!validZip) {
|
||||||
|
MessageDialogFragment.newInstance(
|
||||||
|
titleId = R.string.save_file_invalid_zip_structure,
|
||||||
|
descriptionId = R.string.save_file_invalid_zip_structure_description
|
||||||
|
).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
|
return@withContext
|
||||||
|
}
|
||||||
|
Toast.makeText(
|
||||||
|
context,
|
||||||
|
context.getString(R.string.save_file_imported_success),
|
||||||
|
Toast.LENGTH_LONG
|
||||||
|
).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheSaveDir.deleteRecursively()
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val TAG = "ImportExportSavesFragment"
|
||||||
|
}
|
||||||
|
}
|
@ -5,126 +5,63 @@ package org.yuzu.yuzu_emu.fragments
|
|||||||
|
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.appcompat.app.AlertDialog
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.yuzu.yuzu_emu.R
|
|
||||||
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
||||||
import org.yuzu.yuzu_emu.model.TaskViewModel
|
import org.yuzu.yuzu_emu.model.TaskViewModel
|
||||||
|
|
||||||
class IndeterminateProgressDialogFragment : DialogFragment() {
|
class IndeterminateProgressDialogFragment : DialogFragment() {
|
||||||
private val taskViewModel: TaskViewModel by activityViewModels()
|
private val taskViewModel: TaskViewModel by activityViewModels()
|
||||||
|
|
||||||
private lateinit var binding: DialogProgressBarBinding
|
|
||||||
|
|
||||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
val titleId = requireArguments().getInt(TITLE)
|
val titleId = requireArguments().getInt(TITLE)
|
||||||
val cancellable = requireArguments().getBoolean(CANCELLABLE)
|
|
||||||
|
|
||||||
binding = DialogProgressBarBinding.inflate(layoutInflater)
|
val progressBinding = DialogProgressBarBinding.inflate(layoutInflater)
|
||||||
binding.progressBar.isIndeterminate = true
|
progressBinding.progressBar.isIndeterminate = true
|
||||||
val dialog = MaterialAlertDialogBuilder(requireContext())
|
val dialog = MaterialAlertDialogBuilder(requireContext())
|
||||||
.setTitle(titleId)
|
.setTitle(titleId)
|
||||||
.setView(binding.root)
|
.setView(progressBinding.root)
|
||||||
|
.create()
|
||||||
|
dialog.setCanceledOnTouchOutside(false)
|
||||||
|
|
||||||
if (cancellable) {
|
taskViewModel.isComplete.observe(this) { complete ->
|
||||||
dialog.setNegativeButton(android.R.string.cancel, null)
|
if (complete) {
|
||||||
|
dialog.dismiss()
|
||||||
|
when (val result = taskViewModel.result.value) {
|
||||||
|
is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG).show()
|
||||||
|
is MessageDialogFragment -> result.show(
|
||||||
|
requireActivity().supportFragmentManager,
|
||||||
|
MessageDialogFragment.TAG
|
||||||
|
)
|
||||||
|
}
|
||||||
|
taskViewModel.clear()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val alertDialog = dialog.create()
|
if (taskViewModel.isRunning.value == false) {
|
||||||
alertDialog.setCanceledOnTouchOutside(false)
|
|
||||||
|
|
||||||
if (!taskViewModel.isRunning.value) {
|
|
||||||
taskViewModel.runTask()
|
taskViewModel.runTask()
|
||||||
}
|
}
|
||||||
return alertDialog
|
return dialog
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCreateView(
|
|
||||||
inflater: LayoutInflater,
|
|
||||||
container: ViewGroup?,
|
|
||||||
savedInstanceState: Bundle?
|
|
||||||
): View {
|
|
||||||
return binding.root
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
viewLifecycleOwner.lifecycleScope.apply {
|
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
taskViewModel.isComplete.collect {
|
|
||||||
if (it) {
|
|
||||||
dismiss()
|
|
||||||
when (val result = taskViewModel.result.value) {
|
|
||||||
is String -> Toast.makeText(
|
|
||||||
requireContext(),
|
|
||||||
result,
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
|
|
||||||
is MessageDialogFragment -> result.show(
|
|
||||||
requireActivity().supportFragmentManager,
|
|
||||||
MessageDialogFragment.TAG
|
|
||||||
)
|
|
||||||
}
|
|
||||||
taskViewModel.clear()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
taskViewModel.cancelled.collect {
|
|
||||||
if (it) {
|
|
||||||
dialog?.setTitle(R.string.cancelling)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// By default, the ProgressDialog will immediately dismiss itself upon a button being pressed.
|
|
||||||
// Setting the OnClickListener again after the dialog is shown overrides this behavior.
|
|
||||||
override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
val alertDialog = dialog as AlertDialog
|
|
||||||
val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE)
|
|
||||||
negativeButton.setOnClickListener {
|
|
||||||
alertDialog.setTitle(getString(R.string.cancelling))
|
|
||||||
taskViewModel.setCancelled(true)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val TAG = "IndeterminateProgressDialogFragment"
|
const val TAG = "IndeterminateProgressDialogFragment"
|
||||||
|
|
||||||
private const val TITLE = "Title"
|
private const val TITLE = "Title"
|
||||||
private const val CANCELLABLE = "Cancellable"
|
|
||||||
|
|
||||||
fun newInstance(
|
fun newInstance(
|
||||||
activity: AppCompatActivity,
|
activity: AppCompatActivity,
|
||||||
titleId: Int,
|
titleId: Int,
|
||||||
cancellable: Boolean = false,
|
|
||||||
task: () -> Any
|
task: () -> Any
|
||||||
): IndeterminateProgressDialogFragment {
|
): IndeterminateProgressDialogFragment {
|
||||||
val dialog = IndeterminateProgressDialogFragment()
|
val dialog = IndeterminateProgressDialogFragment()
|
||||||
val args = Bundle()
|
val args = Bundle()
|
||||||
ViewModelProvider(activity)[TaskViewModel::class.java].task = task
|
ViewModelProvider(activity)[TaskViewModel::class.java].task = task
|
||||||
args.putInt(TITLE, titleId)
|
args.putInt(TITLE, titleId)
|
||||||
args.putBoolean(CANCELLABLE, cancellable)
|
|
||||||
dialog.arguments = args
|
dialog.arguments = args
|
||||||
return dialog
|
return dialog
|
||||||
}
|
}
|
||||||
|
@ -1,138 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.fragments
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.core.view.ViewCompat
|
|
||||||
import androidx.core.view.WindowInsetsCompat
|
|
||||||
import androidx.core.view.updatePadding
|
|
||||||
import androidx.fragment.app.Fragment
|
|
||||||
import androidx.fragment.app.activityViewModels
|
|
||||||
import androidx.navigation.findNavController
|
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
|
||||||
import com.google.android.material.transition.MaterialSharedAxis
|
|
||||||
import org.yuzu.yuzu_emu.R
|
|
||||||
import org.yuzu.yuzu_emu.adapters.InstallableAdapter
|
|
||||||
import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
|
|
||||||
import org.yuzu.yuzu_emu.model.HomeViewModel
|
|
||||||
import org.yuzu.yuzu_emu.model.Installable
|
|
||||||
import org.yuzu.yuzu_emu.ui.main.MainActivity
|
|
||||||
|
|
||||||
class InstallableFragment : Fragment() {
|
|
||||||
private var _binding: FragmentInstallablesBinding? = null
|
|
||||||
private val binding get() = _binding!!
|
|
||||||
|
|
||||||
private val homeViewModel: HomeViewModel by activityViewModels()
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
|
|
||||||
returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
|
|
||||||
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCreateView(
|
|
||||||
inflater: LayoutInflater,
|
|
||||||
container: ViewGroup?,
|
|
||||||
savedInstanceState: Bundle?
|
|
||||||
): View {
|
|
||||||
_binding = FragmentInstallablesBinding.inflate(layoutInflater)
|
|
||||||
return binding.root
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
|
|
||||||
val mainActivity = requireActivity() as MainActivity
|
|
||||||
|
|
||||||
homeViewModel.setNavigationVisibility(visible = false, animated = true)
|
|
||||||
homeViewModel.setStatusBarShadeVisibility(visible = false)
|
|
||||||
|
|
||||||
binding.toolbarInstallables.setNavigationOnClickListener {
|
|
||||||
binding.root.findNavController().popBackStack()
|
|
||||||
}
|
|
||||||
|
|
||||||
val installables = listOf(
|
|
||||||
Installable(
|
|
||||||
R.string.user_data,
|
|
||||||
R.string.user_data_description,
|
|
||||||
install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
|
|
||||||
export = { mainActivity.exportUserData.launch("export.zip") }
|
|
||||||
),
|
|
||||||
Installable(
|
|
||||||
R.string.install_game_content,
|
|
||||||
R.string.install_game_content_description,
|
|
||||||
install = { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
|
|
||||||
),
|
|
||||||
Installable(
|
|
||||||
R.string.install_firmware,
|
|
||||||
R.string.install_firmware_description,
|
|
||||||
install = { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
|
|
||||||
),
|
|
||||||
if (mainActivity.savesFolderRoot != "") {
|
|
||||||
Installable(
|
|
||||||
R.string.manage_save_data,
|
|
||||||
R.string.import_export_saves_description,
|
|
||||||
install = { mainActivity.importSaves.launch(arrayOf("application/zip")) },
|
|
||||||
export = { mainActivity.exportSave() }
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
Installable(
|
|
||||||
R.string.manage_save_data,
|
|
||||||
R.string.import_export_saves_description,
|
|
||||||
install = { mainActivity.importSaves.launch(arrayOf("application/zip")) }
|
|
||||||
)
|
|
||||||
},
|
|
||||||
Installable(
|
|
||||||
R.string.install_prod_keys,
|
|
||||||
R.string.install_prod_keys_description,
|
|
||||||
install = { mainActivity.getProdKey.launch(arrayOf("*/*")) }
|
|
||||||
),
|
|
||||||
Installable(
|
|
||||||
R.string.install_amiibo_keys,
|
|
||||||
R.string.install_amiibo_keys_description,
|
|
||||||
install = { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
binding.listInstallables.apply {
|
|
||||||
layoutManager = GridLayoutManager(
|
|
||||||
requireContext(),
|
|
||||||
resources.getInteger(R.integer.grid_columns)
|
|
||||||
)
|
|
||||||
adapter = InstallableAdapter(installables)
|
|
||||||
}
|
|
||||||
|
|
||||||
setInsets()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setInsets() =
|
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(
|
|
||||||
binding.root
|
|
||||||
) { _: View, windowInsets: WindowInsetsCompat ->
|
|
||||||
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
|
|
||||||
val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
|
|
||||||
|
|
||||||
val leftInsets = barInsets.left + cutoutInsets.left
|
|
||||||
val rightInsets = barInsets.right + cutoutInsets.right
|
|
||||||
|
|
||||||
val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams
|
|
||||||
mlpAppBar.leftMargin = leftInsets
|
|
||||||
mlpAppBar.rightMargin = rightInsets
|
|
||||||
binding.toolbarInstallables.layoutParams = mlpAppBar
|
|
||||||
|
|
||||||
val mlpScrollAbout =
|
|
||||||
binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams
|
|
||||||
mlpScrollAbout.leftMargin = leftInsets
|
|
||||||
mlpScrollAbout.rightMargin = rightInsets
|
|
||||||
binding.listInstallables.layoutParams = mlpScrollAbout
|
|
||||||
|
|
||||||
binding.listInstallables.updatePadding(bottom = barInsets.bottom)
|
|
||||||
|
|
||||||
windowInsets
|
|
||||||
}
|
|
||||||
}
|
|
@ -4,21 +4,14 @@
|
|||||||
package org.yuzu.yuzu_emu.fragments
|
package org.yuzu.yuzu_emu.fragments
|
||||||
|
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.content.DialogInterface
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.fragment.app.FragmentActivity
|
|
||||||
import androidx.fragment.app.activityViewModels
|
|
||||||
import androidx.lifecycle.ViewModelProvider
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.model.MessageDialogViewModel
|
|
||||||
|
|
||||||
class MessageDialogFragment : DialogFragment() {
|
class MessageDialogFragment : DialogFragment() {
|
||||||
private val messageDialogViewModel: MessageDialogViewModel by activityViewModels()
|
|
||||||
|
|
||||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
val titleId = requireArguments().getInt(TITLE_ID)
|
val titleId = requireArguments().getInt(TITLE_ID)
|
||||||
val titleString = requireArguments().getString(TITLE_STRING)!!
|
val titleString = requireArguments().getString(TITLE_STRING)!!
|
||||||
@ -44,12 +37,6 @@ class MessageDialogFragment : DialogFragment() {
|
|||||||
return dialog.show()
|
return dialog.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDismiss(dialog: DialogInterface) {
|
|
||||||
super.onDismiss(dialog)
|
|
||||||
messageDialogViewModel.dismissAction.invoke()
|
|
||||||
messageDialogViewModel.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun openLink(link: String) {
|
private fun openLink(link: String) {
|
||||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
|
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
@ -65,13 +52,11 @@ class MessageDialogFragment : DialogFragment() {
|
|||||||
private const val HELP_LINK = "Link"
|
private const val HELP_LINK = "Link"
|
||||||
|
|
||||||
fun newInstance(
|
fun newInstance(
|
||||||
activity: FragmentActivity,
|
|
||||||
titleId: Int = 0,
|
titleId: Int = 0,
|
||||||
titleString: String = "",
|
titleString: String = "",
|
||||||
descriptionId: Int = 0,
|
descriptionId: Int = 0,
|
||||||
descriptionString: String = "",
|
descriptionString: String = "",
|
||||||
helpLinkId: Int = 0,
|
helpLinkId: Int = 0
|
||||||
dismissAction: () -> Unit = {}
|
|
||||||
): MessageDialogFragment {
|
): MessageDialogFragment {
|
||||||
val dialog = MessageDialogFragment()
|
val dialog = MessageDialogFragment()
|
||||||
val bundle = Bundle()
|
val bundle = Bundle()
|
||||||
@ -82,8 +67,6 @@ class MessageDialogFragment : DialogFragment() {
|
|||||||
putString(DESCRIPTION_STRING, descriptionString)
|
putString(DESCRIPTION_STRING, descriptionString)
|
||||||
putInt(HELP_LINK, helpLinkId)
|
putInt(HELP_LINK, helpLinkId)
|
||||||
}
|
}
|
||||||
ViewModelProvider(activity)[MessageDialogViewModel::class.java].dismissAction =
|
|
||||||
dismissAction
|
|
||||||
dialog.arguments = bundle
|
dialog.arguments = bundle
|
||||||
return dialog
|
return dialog
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.fragments
|
package org.yuzu.yuzu_emu.fragments
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
@ -18,13 +17,9 @@ import androidx.core.view.updatePadding
|
|||||||
import androidx.core.widget.doOnTextChanged
|
import androidx.core.widget.doOnTextChanged
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import info.debatty.java.stringsimilarity.Jaccard
|
import info.debatty.java.stringsimilarity.Jaccard
|
||||||
import info.debatty.java.stringsimilarity.JaroWinkler
|
import info.debatty.java.stringsimilarity.JaroWinkler
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.YuzuApplication
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
@ -57,8 +52,6 @@ class SearchFragment : Fragment() {
|
|||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is using the correct scope, lint is just acting up
|
|
||||||
@SuppressLint("UnsafeRepeatOnLifecycleDetector")
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
homeViewModel.setNavigationVisibility(visible = true, animated = false)
|
homeViewModel.setNavigationVisibility(visible = true, animated = false)
|
||||||
preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
|
preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
|
||||||
@ -86,32 +79,21 @@ class SearchFragment : Fragment() {
|
|||||||
filterAndSearch()
|
filterAndSearch()
|
||||||
}
|
}
|
||||||
|
|
||||||
viewLifecycleOwner.lifecycleScope.apply {
|
gamesViewModel.apply {
|
||||||
launch {
|
searchFocused.observe(viewLifecycleOwner) { searchFocused ->
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
if (searchFocused) {
|
||||||
gamesViewModel.searchFocused.collect {
|
focusSearch()
|
||||||
if (it) {
|
gamesViewModel.setSearchFocused(false)
|
||||||
focusSearch()
|
|
||||||
gamesViewModel.setSearchFocused(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
games.observe(viewLifecycleOwner) { filterAndSearch() }
|
||||||
gamesViewModel.games.collect { filterAndSearch() }
|
searchedGames.observe(viewLifecycleOwner) {
|
||||||
}
|
(binding.gridGamesSearch.adapter as GameAdapter).submitList(it)
|
||||||
}
|
if (it.isEmpty()) {
|
||||||
launch {
|
binding.noResultsView.visibility = View.VISIBLE
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
} else {
|
||||||
gamesViewModel.searchedGames.collect {
|
binding.noResultsView.visibility = View.GONE
|
||||||
(binding.gridGamesSearch.adapter as GameAdapter).submitList(it)
|
|
||||||
if (it.isEmpty()) {
|
|
||||||
binding.noResultsView.visibility = View.VISIBLE
|
|
||||||
} else {
|
|
||||||
binding.noResultsView.visibility = View.GONE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -127,7 +109,7 @@ class SearchFragment : Fragment() {
|
|||||||
private inner class ScoredGame(val score: Double, val item: Game)
|
private inner class ScoredGame(val score: Double, val item: Game)
|
||||||
|
|
||||||
private fun filterAndSearch() {
|
private fun filterAndSearch() {
|
||||||
val baseList = gamesViewModel.games.value
|
val baseList = gamesViewModel.games.value!!
|
||||||
val filteredList: List<Game> = when (binding.chipGroup.checkedChipId) {
|
val filteredList: List<Game> = when (binding.chipGroup.checkedChipId) {
|
||||||
R.id.chip_recently_played -> {
|
R.id.chip_recently_played -> {
|
||||||
baseList.filter {
|
baseList.filter {
|
||||||
|
@ -15,14 +15,10 @@ import androidx.core.view.updatePadding
|
|||||||
import androidx.core.widget.doOnTextChanged
|
import androidx.core.widget.doOnTextChanged
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import com.google.android.material.divider.MaterialDividerItemDecoration
|
import com.google.android.material.divider.MaterialDividerItemDecoration
|
||||||
import com.google.android.material.transition.MaterialSharedAxis
|
import com.google.android.material.transition.MaterialSharedAxis
|
||||||
import info.debatty.java.stringsimilarity.Cosine
|
import info.debatty.java.stringsimilarity.Cosine
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.databinding.FragmentSettingsSearchBinding
|
import org.yuzu.yuzu_emu.databinding.FragmentSettingsSearchBinding
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
|
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
|
||||||
@ -83,14 +79,10 @@ class SettingsSearchFragment : Fragment() {
|
|||||||
search()
|
search()
|
||||||
binding.settingsList.smoothScrollToPosition(0)
|
binding.settingsList.smoothScrollToPosition(0)
|
||||||
}
|
}
|
||||||
viewLifecycleOwner.lifecycleScope.launch {
|
settingsViewModel.shouldReloadSettingsList.observe(viewLifecycleOwner) {
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
if (it) {
|
||||||
settingsViewModel.shouldReloadSettingsList.collect {
|
settingsViewModel.setShouldReloadSettingsList(false)
|
||||||
if (it) {
|
search()
|
||||||
settingsViewModel.setShouldReloadSettingsList(false)
|
|
||||||
search()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,14 +22,10 @@ import androidx.core.view.isVisible
|
|||||||
import androidx.core.view.updatePadding
|
import androidx.core.view.updatePadding
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.navigation.findNavController
|
import androidx.navigation.findNavController
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
|
import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
|
||||||
import com.google.android.material.transition.MaterialFadeThrough
|
import com.google.android.material.transition.MaterialFadeThrough
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.YuzuApplication
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
@ -210,14 +206,10 @@ class SetupFragment : Fragment() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
viewLifecycleOwner.lifecycleScope.launch {
|
homeViewModel.shouldPageForward.observe(viewLifecycleOwner) {
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
if (it) {
|
||||||
homeViewModel.shouldPageForward.collect {
|
pageForward()
|
||||||
if (it) {
|
homeViewModel.setShouldPageForward(false)
|
||||||
pageForward()
|
|
||||||
homeViewModel.setShouldPageForward(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -295,10 +287,8 @@ class SetupFragment : Fragment() {
|
|||||||
|
|
||||||
override fun onSaveInstanceState(outState: Bundle) {
|
override fun onSaveInstanceState(outState: Bundle) {
|
||||||
super.onSaveInstanceState(outState)
|
super.onSaveInstanceState(outState)
|
||||||
if (_binding != null) {
|
outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
|
||||||
outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
|
outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
|
||||||
outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
|
|
||||||
}
|
|
||||||
outState.putBooleanArray(KEY_HAS_BEEN_WARNED, hasBeenWarned)
|
outState.putBooleanArray(KEY_HAS_BEEN_WARNED, hasBeenWarned)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -355,15 +345,11 @@ class SetupFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun pageForward() {
|
fun pageForward() {
|
||||||
if (_binding != null) {
|
binding.viewPager2.currentItem = binding.viewPager2.currentItem + 1
|
||||||
binding.viewPager2.currentItem += 1
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun pageBackward() {
|
fun pageBackward() {
|
||||||
if (_binding != null) {
|
binding.viewPager2.currentItem = binding.viewPager2.currentItem - 1
|
||||||
binding.viewPager2.currentItem -= 1
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setPageWarned(page: Int) {
|
fun setPageWarned(page: Int) {
|
||||||
|
@ -3,28 +3,28 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
package org.yuzu.yuzu_emu.model
|
||||||
|
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
|
|
||||||
class EmulationViewModel : ViewModel() {
|
class EmulationViewModel : ViewModel() {
|
||||||
val emulationStarted: StateFlow<Boolean> get() = _emulationStarted
|
private val _emulationStarted = MutableLiveData(false)
|
||||||
private val _emulationStarted = MutableStateFlow(false)
|
val emulationStarted: LiveData<Boolean> get() = _emulationStarted
|
||||||
|
|
||||||
val isEmulationStopping: StateFlow<Boolean> get() = _isEmulationStopping
|
private val _isEmulationStopping = MutableLiveData(false)
|
||||||
private val _isEmulationStopping = MutableStateFlow(false)
|
val isEmulationStopping: LiveData<Boolean> get() = _isEmulationStopping
|
||||||
|
|
||||||
val shaderProgress: StateFlow<Int> get() = _shaderProgress
|
private val _shaderProgress = MutableLiveData(0)
|
||||||
private val _shaderProgress = MutableStateFlow(0)
|
val shaderProgress: LiveData<Int> get() = _shaderProgress
|
||||||
|
|
||||||
val totalShaders: StateFlow<Int> get() = _totalShaders
|
private val _totalShaders = MutableLiveData(0)
|
||||||
private val _totalShaders = MutableStateFlow(0)
|
val totalShaders: LiveData<Int> get() = _totalShaders
|
||||||
|
|
||||||
val shaderMessage: StateFlow<String> get() = _shaderMessage
|
private val _shaderMessage = MutableLiveData("")
|
||||||
private val _shaderMessage = MutableStateFlow("")
|
val shaderMessage: LiveData<String> get() = _shaderMessage
|
||||||
|
|
||||||
fun setEmulationStarted(started: Boolean) {
|
fun setEmulationStarted(started: Boolean) {
|
||||||
_emulationStarted.value = started
|
_emulationStarted.postValue(started)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setIsEmulationStopping(value: Boolean) {
|
fun setIsEmulationStopping(value: Boolean) {
|
||||||
@ -50,18 +50,10 @@ class EmulationViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun clear() {
|
fun clear() {
|
||||||
setEmulationStarted(false)
|
_emulationStarted.value = false
|
||||||
setIsEmulationStopping(false)
|
_isEmulationStopping.value = false
|
||||||
setShaderProgress(0)
|
_shaderProgress.value = 0
|
||||||
setTotalShaders(0)
|
_totalShaders.value = 0
|
||||||
setShaderMessage("")
|
_shaderMessage.value = ""
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
const val KEY_EMULATION_STARTED = "EmulationStarted"
|
|
||||||
const val KEY_IS_EMULATION_STOPPING = "IsEmulationStarting"
|
|
||||||
const val KEY_SHADER_PROGRESS = "ShaderProgress"
|
|
||||||
const val KEY_TOTAL_SHADERS = "TotalShaders"
|
|
||||||
const val KEY_SHADER_MESSAGE = "ShaderMessage"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,13 +5,13 @@ package org.yuzu.yuzu_emu.model
|
|||||||
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.documentfile.provider.DocumentFile
|
import androidx.documentfile.provider.DocumentFile
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import kotlinx.serialization.ExperimentalSerializationApi
|
import kotlinx.serialization.ExperimentalSerializationApi
|
||||||
@ -24,23 +24,23 @@ import org.yuzu.yuzu_emu.utils.GameHelper
|
|||||||
|
|
||||||
@OptIn(ExperimentalSerializationApi::class)
|
@OptIn(ExperimentalSerializationApi::class)
|
||||||
class GamesViewModel : ViewModel() {
|
class GamesViewModel : ViewModel() {
|
||||||
val games: StateFlow<List<Game>> get() = _games
|
private val _games = MutableLiveData<List<Game>>(emptyList())
|
||||||
private val _games = MutableStateFlow(emptyList<Game>())
|
val games: LiveData<List<Game>> get() = _games
|
||||||
|
|
||||||
val searchedGames: StateFlow<List<Game>> get() = _searchedGames
|
private val _searchedGames = MutableLiveData<List<Game>>(emptyList())
|
||||||
private val _searchedGames = MutableStateFlow(emptyList<Game>())
|
val searchedGames: LiveData<List<Game>> get() = _searchedGames
|
||||||
|
|
||||||
val isReloading: StateFlow<Boolean> get() = _isReloading
|
private val _isReloading = MutableLiveData(false)
|
||||||
private val _isReloading = MutableStateFlow(false)
|
val isReloading: LiveData<Boolean> get() = _isReloading
|
||||||
|
|
||||||
val shouldSwapData: StateFlow<Boolean> get() = _shouldSwapData
|
private val _shouldSwapData = MutableLiveData(false)
|
||||||
private val _shouldSwapData = MutableStateFlow(false)
|
val shouldSwapData: LiveData<Boolean> get() = _shouldSwapData
|
||||||
|
|
||||||
val shouldScrollToTop: StateFlow<Boolean> get() = _shouldScrollToTop
|
private val _shouldScrollToTop = MutableLiveData(false)
|
||||||
private val _shouldScrollToTop = MutableStateFlow(false)
|
val shouldScrollToTop: LiveData<Boolean> get() = _shouldScrollToTop
|
||||||
|
|
||||||
val searchFocused: StateFlow<Boolean> get() = _searchFocused
|
private val _searchFocused = MutableLiveData(false)
|
||||||
private val _searchFocused = MutableStateFlow(false)
|
val searchFocused: LiveData<Boolean> get() = _searchFocused
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// Ensure keys are loaded so that ROM metadata can be decrypted.
|
// Ensure keys are loaded so that ROM metadata can be decrypted.
|
||||||
@ -79,36 +79,36 @@ class GamesViewModel : ViewModel() {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
_games.value = sortedList
|
_games.postValue(sortedList)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setSearchedGames(games: List<Game>) {
|
fun setSearchedGames(games: List<Game>) {
|
||||||
_searchedGames.value = games
|
_searchedGames.postValue(games)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setShouldSwapData(shouldSwap: Boolean) {
|
fun setShouldSwapData(shouldSwap: Boolean) {
|
||||||
_shouldSwapData.value = shouldSwap
|
_shouldSwapData.postValue(shouldSwap)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setShouldScrollToTop(shouldScroll: Boolean) {
|
fun setShouldScrollToTop(shouldScroll: Boolean) {
|
||||||
_shouldScrollToTop.value = shouldScroll
|
_shouldScrollToTop.postValue(shouldScroll)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setSearchFocused(searchFocused: Boolean) {
|
fun setSearchFocused(searchFocused: Boolean) {
|
||||||
_searchFocused.value = searchFocused
|
_searchFocused.postValue(searchFocused)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun reloadGames(directoryChanged: Boolean) {
|
fun reloadGames(directoryChanged: Boolean) {
|
||||||
if (isReloading.value) {
|
if (isReloading.value == true) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_isReloading.value = true
|
_isReloading.postValue(true)
|
||||||
|
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
withContext(Dispatchers.IO) {
|
withContext(Dispatchers.IO) {
|
||||||
NativeLibrary.resetRomMetadata()
|
NativeLibrary.resetRomMetadata()
|
||||||
setGames(GameHelper.getGames())
|
setGames(GameHelper.getGames())
|
||||||
_isReloading.value = false
|
_isReloading.postValue(false)
|
||||||
|
|
||||||
if (directoryChanged) {
|
if (directoryChanged) {
|
||||||
setShouldSwapData(true)
|
setShouldSwapData(true)
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
package org.yuzu.yuzu_emu.model
|
||||||
|
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import androidx.lifecycle.LiveData
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import androidx.lifecycle.MutableLiveData
|
||||||
|
|
||||||
data class HomeSetting(
|
data class HomeSetting(
|
||||||
val titleId: Int,
|
val titleId: Int,
|
||||||
@ -14,5 +14,5 @@ data class HomeSetting(
|
|||||||
val isEnabled: () -> Boolean = { true },
|
val isEnabled: () -> Boolean = { true },
|
||||||
val disabledTitleId: Int = 0,
|
val disabledTitleId: Int = 0,
|
||||||
val disabledMessageId: Int = 0,
|
val disabledMessageId: Int = 0,
|
||||||
val details: StateFlow<String> = MutableStateFlow("")
|
val details: LiveData<String> = MutableLiveData("")
|
||||||
)
|
)
|
||||||
|
@ -5,43 +5,47 @@ package org.yuzu.yuzu_emu.model
|
|||||||
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import org.yuzu.yuzu_emu.YuzuApplication
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
import org.yuzu.yuzu_emu.utils.GameHelper
|
import org.yuzu.yuzu_emu.utils.GameHelper
|
||||||
|
|
||||||
class HomeViewModel : ViewModel() {
|
class HomeViewModel : ViewModel() {
|
||||||
val navigationVisible: StateFlow<Pair<Boolean, Boolean>> get() = _navigationVisible
|
private val _navigationVisible = MutableLiveData<Pair<Boolean, Boolean>>()
|
||||||
private val _navigationVisible = MutableStateFlow(Pair(false, false))
|
val navigationVisible: LiveData<Pair<Boolean, Boolean>> get() = _navigationVisible
|
||||||
|
|
||||||
val statusBarShadeVisible: StateFlow<Boolean> get() = _statusBarShadeVisible
|
private val _statusBarShadeVisible = MutableLiveData(true)
|
||||||
private val _statusBarShadeVisible = MutableStateFlow(true)
|
val statusBarShadeVisible: LiveData<Boolean> get() = _statusBarShadeVisible
|
||||||
|
|
||||||
val shouldPageForward: StateFlow<Boolean> get() = _shouldPageForward
|
private val _shouldPageForward = MutableLiveData(false)
|
||||||
private val _shouldPageForward = MutableStateFlow(false)
|
val shouldPageForward: LiveData<Boolean> get() = _shouldPageForward
|
||||||
|
|
||||||
val gamesDir: StateFlow<String> get() = _gamesDir
|
private val _gamesDir = MutableLiveData(
|
||||||
private val _gamesDir = MutableStateFlow(
|
|
||||||
Uri.parse(
|
Uri.parse(
|
||||||
PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
|
PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
|
||||||
.getString(GameHelper.KEY_GAME_PATH, "")
|
.getString(GameHelper.KEY_GAME_PATH, "")
|
||||||
).path ?: ""
|
).path ?: ""
|
||||||
)
|
)
|
||||||
|
val gamesDir: LiveData<String> get() = _gamesDir
|
||||||
|
|
||||||
var navigatedToSetup = false
|
var navigatedToSetup = false
|
||||||
|
|
||||||
|
init {
|
||||||
|
_navigationVisible.value = Pair(false, false)
|
||||||
|
}
|
||||||
|
|
||||||
fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
|
fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
|
||||||
if (navigationVisible.value.first == visible) {
|
if (_navigationVisible.value?.first == visible) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_navigationVisible.value = Pair(visible, animated)
|
_navigationVisible.value = Pair(visible, animated)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setStatusBarShadeVisibility(visible: Boolean) {
|
fun setStatusBarShadeVisibility(visible: Boolean) {
|
||||||
if (statusBarShadeVisible.value == visible) {
|
if (_statusBarShadeVisible.value == visible) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_statusBarShadeVisible.value = visible
|
_statusBarShadeVisible.value = visible
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
|
||||||
|
|
||||||
import androidx.annotation.StringRes
|
|
||||||
|
|
||||||
data class Installable(
|
|
||||||
@StringRes val titleId: Int,
|
|
||||||
@StringRes val descriptionId: Int,
|
|
||||||
val install: (() -> Unit)? = null,
|
|
||||||
val export: (() -> Unit)? = null
|
|
||||||
)
|
|
@ -1,14 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
|
||||||
|
|
||||||
import androidx.lifecycle.ViewModel
|
|
||||||
|
|
||||||
class MessageDialogViewModel : ViewModel() {
|
|
||||||
var dismissAction: () -> Unit = {}
|
|
||||||
|
|
||||||
fun clear() {
|
|
||||||
dismissAction = {}
|
|
||||||
}
|
|
||||||
}
|
|
@ -3,43 +3,48 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
package org.yuzu.yuzu_emu.model
|
||||||
|
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
|
import androidx.lifecycle.SavedStateHandle
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.YuzuApplication
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
|
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
|
||||||
|
|
||||||
class SettingsViewModel : ViewModel() {
|
class SettingsViewModel(private val savedStateHandle: SavedStateHandle) : ViewModel() {
|
||||||
var game: Game? = null
|
var game: Game? = null
|
||||||
|
|
||||||
var shouldSave = false
|
var shouldSave = false
|
||||||
|
|
||||||
var clickedItem: SettingsItem? = null
|
var clickedItem: SettingsItem? = null
|
||||||
|
|
||||||
val shouldRecreate: StateFlow<Boolean> get() = _shouldRecreate
|
private val _toolbarTitle = MutableLiveData("")
|
||||||
private val _shouldRecreate = MutableStateFlow(false)
|
val toolbarTitle: LiveData<String> get() = _toolbarTitle
|
||||||
|
|
||||||
val shouldNavigateBack: StateFlow<Boolean> get() = _shouldNavigateBack
|
private val _shouldRecreate = MutableLiveData(false)
|
||||||
private val _shouldNavigateBack = MutableStateFlow(false)
|
val shouldRecreate: LiveData<Boolean> get() = _shouldRecreate
|
||||||
|
|
||||||
val shouldShowResetSettingsDialog: StateFlow<Boolean> get() = _shouldShowResetSettingsDialog
|
private val _shouldNavigateBack = MutableLiveData(false)
|
||||||
private val _shouldShowResetSettingsDialog = MutableStateFlow(false)
|
val shouldNavigateBack: LiveData<Boolean> get() = _shouldNavigateBack
|
||||||
|
|
||||||
val shouldReloadSettingsList: StateFlow<Boolean> get() = _shouldReloadSettingsList
|
private val _shouldShowResetSettingsDialog = MutableLiveData(false)
|
||||||
private val _shouldReloadSettingsList = MutableStateFlow(false)
|
val shouldShowResetSettingsDialog: LiveData<Boolean> get() = _shouldShowResetSettingsDialog
|
||||||
|
|
||||||
val isUsingSearch: StateFlow<Boolean> get() = _isUsingSearch
|
private val _shouldReloadSettingsList = MutableLiveData(false)
|
||||||
private val _isUsingSearch = MutableStateFlow(false)
|
val shouldReloadSettingsList: LiveData<Boolean> get() = _shouldReloadSettingsList
|
||||||
|
|
||||||
val sliderProgress: StateFlow<Int> get() = _sliderProgress
|
private val _isUsingSearch = MutableLiveData(false)
|
||||||
private val _sliderProgress = MutableStateFlow(-1)
|
val isUsingSearch: LiveData<Boolean> get() = _isUsingSearch
|
||||||
|
|
||||||
val sliderTextValue: StateFlow<String> get() = _sliderTextValue
|
val sliderProgress = savedStateHandle.getStateFlow(KEY_SLIDER_PROGRESS, -1)
|
||||||
private val _sliderTextValue = MutableStateFlow("")
|
|
||||||
|
|
||||||
val adapterItemChanged: StateFlow<Int> get() = _adapterItemChanged
|
val sliderTextValue = savedStateHandle.getStateFlow(KEY_SLIDER_TEXT_VALUE, "")
|
||||||
private val _adapterItemChanged = MutableStateFlow(-1)
|
|
||||||
|
val adapterItemChanged = savedStateHandle.getStateFlow(KEY_ADAPTER_ITEM_CHANGED, -1)
|
||||||
|
|
||||||
|
fun setToolbarTitle(value: String) {
|
||||||
|
_toolbarTitle.value = value
|
||||||
|
}
|
||||||
|
|
||||||
fun setShouldRecreate(value: Boolean) {
|
fun setShouldRecreate(value: Boolean) {
|
||||||
_shouldRecreate.value = value
|
_shouldRecreate.value = value
|
||||||
@ -62,8 +67,8 @@ class SettingsViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun setSliderTextValue(value: Float, units: String) {
|
fun setSliderTextValue(value: Float, units: String) {
|
||||||
_sliderProgress.value = value.toInt()
|
savedStateHandle[KEY_SLIDER_PROGRESS] = value
|
||||||
_sliderTextValue.value = String.format(
|
savedStateHandle[KEY_SLIDER_TEXT_VALUE] = String.format(
|
||||||
YuzuApplication.appContext.getString(R.string.value_with_units),
|
YuzuApplication.appContext.getString(R.string.value_with_units),
|
||||||
value.toInt().toString(),
|
value.toInt().toString(),
|
||||||
units
|
units
|
||||||
@ -71,15 +76,21 @@ class SettingsViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun setSliderProgress(value: Float) {
|
fun setSliderProgress(value: Float) {
|
||||||
_sliderProgress.value = value.toInt()
|
savedStateHandle[KEY_SLIDER_PROGRESS] = value
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setAdapterItemChanged(value: Int) {
|
fun setAdapterItemChanged(value: Int) {
|
||||||
_adapterItemChanged.value = value
|
savedStateHandle[KEY_ADAPTER_ITEM_CHANGED] = value
|
||||||
}
|
}
|
||||||
|
|
||||||
fun clear() {
|
fun clear() {
|
||||||
game = null
|
game = null
|
||||||
shouldSave = false
|
shouldSave = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val KEY_SLIDER_TEXT_VALUE = "SliderTextValue"
|
||||||
|
const val KEY_SLIDER_PROGRESS = "SliderProgress"
|
||||||
|
const val KEY_ADAPTER_ITEM_CHANGED = "AdapterItemChanged"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,56 +3,45 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
package org.yuzu.yuzu_emu.model
|
||||||
|
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class TaskViewModel : ViewModel() {
|
class TaskViewModel : ViewModel() {
|
||||||
val result: StateFlow<Any> get() = _result
|
private val _result = MutableLiveData<Any>()
|
||||||
private val _result = MutableStateFlow(Any())
|
val result: LiveData<Any> = _result
|
||||||
|
|
||||||
val isComplete: StateFlow<Boolean> get() = _isComplete
|
private val _isComplete = MutableLiveData<Boolean>()
|
||||||
private val _isComplete = MutableStateFlow(false)
|
val isComplete: LiveData<Boolean> = _isComplete
|
||||||
|
|
||||||
val isRunning: StateFlow<Boolean> get() = _isRunning
|
private val _isRunning = MutableLiveData<Boolean>()
|
||||||
private val _isRunning = MutableStateFlow(false)
|
val isRunning: LiveData<Boolean> = _isRunning
|
||||||
|
|
||||||
val cancelled: StateFlow<Boolean> get() = _cancelled
|
|
||||||
private val _cancelled = MutableStateFlow(false)
|
|
||||||
|
|
||||||
lateinit var task: () -> Any
|
lateinit var task: () -> Any
|
||||||
|
|
||||||
|
init {
|
||||||
|
clear()
|
||||||
|
}
|
||||||
|
|
||||||
fun clear() {
|
fun clear() {
|
||||||
_result.value = Any()
|
_result.value = Any()
|
||||||
_isComplete.value = false
|
_isComplete.value = false
|
||||||
_isRunning.value = false
|
_isRunning.value = false
|
||||||
_cancelled.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setCancelled(value: Boolean) {
|
|
||||||
_cancelled.value = value
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun runTask() {
|
fun runTask() {
|
||||||
if (isRunning.value) {
|
if (_isRunning.value == true) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_isRunning.value = true
|
_isRunning.value = true
|
||||||
|
|
||||||
viewModelScope.launch(Dispatchers.IO) {
|
viewModelScope.launch(Dispatchers.IO) {
|
||||||
val res = task()
|
val res = task()
|
||||||
_result.value = res
|
_result.postValue(res)
|
||||||
_isComplete.value = true
|
_isComplete.postValue(true)
|
||||||
_isRunning.value = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class TaskState {
|
|
||||||
Completed,
|
|
||||||
Failed,
|
|
||||||
Cancelled
|
|
||||||
}
|
|
||||||
|
@ -352,7 +352,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addOverlayControls(layout: String) {
|
private fun addOverlayControls(layout: String) {
|
||||||
val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
|
val windowSize = getSafeScreenSize(context)
|
||||||
if (preferences.getBoolean(Settings.PREF_BUTTON_A, true)) {
|
if (preferences.getBoolean(Settings.PREF_BUTTON_A, true)) {
|
||||||
overlayButtons.add(
|
overlayButtons.add(
|
||||||
initializeOverlayButton(
|
initializeOverlayButton(
|
||||||
@ -593,7 +593,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun saveControlPosition(prefId: String, x: Int, y: Int, layout: String) {
|
private fun saveControlPosition(prefId: String, x: Int, y: Int, layout: String) {
|
||||||
val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
|
val windowSize = getSafeScreenSize(context)
|
||||||
val min = windowSize.first
|
val min = windowSize.first
|
||||||
val max = windowSize.second
|
val max = windowSize.second
|
||||||
PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
|
PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
|
||||||
@ -968,17 +968,14 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
|
|||||||
* @return A pair of points, the first being the top left corner of the safe area,
|
* @return A pair of points, the first being the top left corner of the safe area,
|
||||||
* the second being the bottom right corner of the safe area
|
* the second being the bottom right corner of the safe area
|
||||||
*/
|
*/
|
||||||
private fun getSafeScreenSize(
|
private fun getSafeScreenSize(context: Context): Pair<Point, Point> {
|
||||||
context: Context,
|
|
||||||
screenSize: Pair<Int, Int>
|
|
||||||
): Pair<Point, Point> {
|
|
||||||
// Get screen size
|
// Get screen size
|
||||||
val windowMetrics = WindowMetricsCalculator.getOrCreate()
|
val windowMetrics = WindowMetricsCalculator.getOrCreate()
|
||||||
.computeCurrentWindowMetrics(context as Activity)
|
.computeCurrentWindowMetrics(context as Activity)
|
||||||
var maxX = screenSize.first.toFloat()
|
var maxY = windowMetrics.bounds.height().toFloat()
|
||||||
var maxY = screenSize.second.toFloat()
|
var maxX = windowMetrics.bounds.width().toFloat()
|
||||||
var minX = 0
|
|
||||||
var minY = 0
|
var minY = 0
|
||||||
|
var minX = 0
|
||||||
|
|
||||||
// If we have API access, calculate the safe area to draw the overlay
|
// If we have API access, calculate the safe area to draw the overlay
|
||||||
var cutoutLeft = 0
|
var cutoutLeft = 0
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.ui
|
package org.yuzu.yuzu_emu.ui
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
@ -15,12 +14,8 @@ import androidx.core.view.WindowInsetsCompat
|
|||||||
import androidx.core.view.updatePadding
|
import androidx.core.view.updatePadding
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import com.google.android.material.color.MaterialColors
|
import com.google.android.material.color.MaterialColors
|
||||||
import com.google.android.material.transition.MaterialFadeThrough
|
import com.google.android.material.transition.MaterialFadeThrough
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.adapters.GameAdapter
|
import org.yuzu.yuzu_emu.adapters.GameAdapter
|
||||||
import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
|
import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
|
||||||
@ -49,8 +44,6 @@ class GamesFragment : Fragment() {
|
|||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is using the correct scope, lint is just acting up
|
|
||||||
@SuppressLint("UnsafeRepeatOnLifecycleDetector")
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
homeViewModel.setNavigationVisibility(visible = true, animated = false)
|
homeViewModel.setNavigationVisibility(visible = true, animated = false)
|
||||||
|
|
||||||
@ -87,48 +80,37 @@ class GamesFragment : Fragment() {
|
|||||||
if (_binding == null) {
|
if (_binding == null) {
|
||||||
return@post
|
return@post
|
||||||
}
|
}
|
||||||
binding.swipeRefresh.isRefreshing = gamesViewModel.isReloading.value
|
binding.swipeRefresh.isRefreshing = gamesViewModel.isReloading.value!!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
viewLifecycleOwner.lifecycleScope.apply {
|
gamesViewModel.apply {
|
||||||
launch {
|
// Watch for when we get updates to any of our games lists
|
||||||
repeatOnLifecycle(Lifecycle.State.RESUMED) {
|
isReloading.observe(viewLifecycleOwner) { isReloading ->
|
||||||
gamesViewModel.isReloading.collect { binding.swipeRefresh.isRefreshing = it }
|
binding.swipeRefresh.isRefreshing = isReloading
|
||||||
|
}
|
||||||
|
games.observe(viewLifecycleOwner) {
|
||||||
|
(binding.gridGames.adapter as GameAdapter).submitList(it)
|
||||||
|
if (it.isEmpty()) {
|
||||||
|
binding.noticeText.visibility = View.VISIBLE
|
||||||
|
} else {
|
||||||
|
binding.noticeText.visibility = View.GONE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
launch {
|
shouldSwapData.observe(viewLifecycleOwner) { shouldSwapData ->
|
||||||
repeatOnLifecycle(Lifecycle.State.RESUMED) {
|
if (shouldSwapData) {
|
||||||
gamesViewModel.games.collect {
|
(binding.gridGames.adapter as GameAdapter).submitList(
|
||||||
(binding.gridGames.adapter as GameAdapter).submitList(it)
|
gamesViewModel.games.value!!
|
||||||
if (it.isEmpty()) {
|
)
|
||||||
binding.noticeText.visibility = View.VISIBLE
|
gamesViewModel.setShouldSwapData(false)
|
||||||
} else {
|
|
||||||
binding.noticeText.visibility = View.GONE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.RESUMED) {
|
// Check if the user reselected the games menu item and then scroll to top of the list
|
||||||
gamesViewModel.shouldSwapData.collect {
|
shouldScrollToTop.observe(viewLifecycleOwner) { shouldScroll ->
|
||||||
if (it) {
|
if (shouldScroll) {
|
||||||
(binding.gridGames.adapter as GameAdapter).submitList(
|
scrollToTop()
|
||||||
gamesViewModel.games.value
|
gamesViewModel.setShouldScrollToTop(false)
|
||||||
)
|
|
||||||
gamesViewModel.setShouldSwapData(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.RESUMED) {
|
|
||||||
gamesViewModel.shouldScrollToTop.collect {
|
|
||||||
if (it) {
|
|
||||||
scrollToTop()
|
|
||||||
gamesViewModel.setShouldScrollToTop(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,6 @@ package org.yuzu.yuzu_emu.ui.main
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.provider.DocumentsContract
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup.MarginLayoutParams
|
import android.view.ViewGroup.MarginLayoutParams
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
@ -20,10 +19,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
|||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowCompat
|
import androidx.core.view.WindowCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.documentfile.provider.DocumentFile
|
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
import androidx.navigation.fragment.NavHostFragment
|
import androidx.navigation.fragment.NavHostFragment
|
||||||
import androidx.navigation.ui.setupWithNavController
|
import androidx.navigation.ui.setupWithNavController
|
||||||
@ -31,7 +27,6 @@ import androidx.preference.PreferenceManager
|
|||||||
import com.google.android.material.color.MaterialColors
|
import com.google.android.material.color.MaterialColors
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import com.google.android.material.navigation.NavigationBarView
|
import com.google.android.material.navigation.NavigationBarView
|
||||||
import kotlinx.coroutines.CoroutineScope
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FilenameFilter
|
import java.io.FilenameFilter
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
@ -44,40 +39,22 @@ import org.yuzu.yuzu_emu.R
|
|||||||
import org.yuzu.yuzu_emu.activities.EmulationActivity
|
import org.yuzu.yuzu_emu.activities.EmulationActivity
|
||||||
import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
|
import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
|
||||||
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
||||||
import org.yuzu.yuzu_emu.features.DocumentProvider
|
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
||||||
|
import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
|
||||||
import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
|
import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
|
||||||
import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
|
import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
|
||||||
import org.yuzu.yuzu_emu.getPublicFilesDir
|
|
||||||
import org.yuzu.yuzu_emu.model.GamesViewModel
|
import org.yuzu.yuzu_emu.model.GamesViewModel
|
||||||
import org.yuzu.yuzu_emu.model.HomeViewModel
|
import org.yuzu.yuzu_emu.model.HomeViewModel
|
||||||
import org.yuzu.yuzu_emu.model.TaskState
|
|
||||||
import org.yuzu.yuzu_emu.model.TaskViewModel
|
|
||||||
import org.yuzu.yuzu_emu.utils.*
|
import org.yuzu.yuzu_emu.utils.*
|
||||||
import java.io.BufferedInputStream
|
|
||||||
import java.io.BufferedOutputStream
|
|
||||||
import java.io.FileOutputStream
|
|
||||||
import java.time.LocalDateTime
|
|
||||||
import java.time.format.DateTimeFormatter
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity(), ThemeProvider {
|
class MainActivity : AppCompatActivity(), ThemeProvider {
|
||||||
private lateinit var binding: ActivityMainBinding
|
private lateinit var binding: ActivityMainBinding
|
||||||
|
|
||||||
private val homeViewModel: HomeViewModel by viewModels()
|
private val homeViewModel: HomeViewModel by viewModels()
|
||||||
private val gamesViewModel: GamesViewModel by viewModels()
|
private val gamesViewModel: GamesViewModel by viewModels()
|
||||||
private val taskViewModel: TaskViewModel by viewModels()
|
|
||||||
|
|
||||||
override var themeId: Int = 0
|
override var themeId: Int = 0
|
||||||
|
|
||||||
private val savesFolder
|
|
||||||
get() = "${getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
|
|
||||||
|
|
||||||
// Get first subfolder in saves folder (should be the user folder)
|
|
||||||
val savesFolderRoot get() = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
|
|
||||||
private var lastZipCreated: File? = null
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
val splashScreen = installSplashScreen()
|
val splashScreen = installSplashScreen()
|
||||||
splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
|
splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
|
||||||
@ -130,7 +107,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
R.id.homeSettingsFragment -> {
|
R.id.homeSettingsFragment -> {
|
||||||
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
|
||||||
null,
|
null,
|
||||||
Settings.MenuTag.SECTION_ROOT
|
SettingsFile.FILE_NAME_CONFIG
|
||||||
)
|
)
|
||||||
navHostFragment.navController.navigate(action)
|
navHostFragment.navController.navigate(action)
|
||||||
}
|
}
|
||||||
@ -138,22 +115,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Prevents navigation from being drawn for a short time on recreation if set to hidden
|
// Prevents navigation from being drawn for a short time on recreation if set to hidden
|
||||||
if (!homeViewModel.navigationVisible.value.first) {
|
if (!homeViewModel.navigationVisible.value?.first!!) {
|
||||||
binding.navigationView.visibility = View.INVISIBLE
|
binding.navigationView.visibility = View.INVISIBLE
|
||||||
binding.statusBarShade.visibility = View.INVISIBLE
|
binding.statusBarShade.visibility = View.INVISIBLE
|
||||||
}
|
}
|
||||||
|
|
||||||
lifecycleScope.apply {
|
homeViewModel.navigationVisible.observe(this) {
|
||||||
launch {
|
showNavigation(it.first, it.second)
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
}
|
||||||
homeViewModel.navigationVisible.collect { showNavigation(it.first, it.second) }
|
homeViewModel.statusBarShadeVisible.observe(this) { visible ->
|
||||||
}
|
showStatusBarShade(visible)
|
||||||
}
|
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
homeViewModel.statusBarShadeVisible.collect { showStatusBarShade(it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dismiss previous notifications (should not happen unless a crash occurred)
|
// Dismiss previous notifications (should not happen unless a crash occurred)
|
||||||
@ -329,7 +300,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
fun processKey(result: Uri): Boolean {
|
fun processKey(result: Uri): Boolean {
|
||||||
if (FileUtil.getExtension(result) != "keys") {
|
if (FileUtil.getExtension(result) != "keys") {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.reading_keys_failure,
|
titleId = R.string.reading_keys_failure,
|
||||||
descriptionId = R.string.install_prod_keys_failure_extension_description
|
descriptionId = R.string.install_prod_keys_failure_extension_description
|
||||||
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
@ -359,7 +329,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.invalid_keys_error,
|
titleId = R.string.invalid_keys_error,
|
||||||
descriptionId = R.string.install_keys_failure_description,
|
descriptionId = R.string.install_keys_failure_description,
|
||||||
helpLinkId = R.string.dumping_keys_quickstart_link
|
helpLinkId = R.string.dumping_keys_quickstart_link
|
||||||
@ -395,12 +364,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
val task: () -> Any = {
|
val task: () -> Any = {
|
||||||
var messageToShow: Any
|
var messageToShow: Any
|
||||||
try {
|
try {
|
||||||
FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
|
FileUtil.unzip(inputZip, cacheFirmwareDir)
|
||||||
val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
|
val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
|
||||||
val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
|
val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
|
||||||
messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
|
messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.firmware_installed_failure,
|
titleId = R.string.firmware_installed_failure,
|
||||||
descriptionId = R.string.firmware_installed_failure_description
|
descriptionId = R.string.firmware_installed_failure_description
|
||||||
)
|
)
|
||||||
@ -420,7 +388,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
IndeterminateProgressDialogFragment.newInstance(
|
IndeterminateProgressDialogFragment.newInstance(
|
||||||
this,
|
this,
|
||||||
R.string.firmware_installing,
|
R.string.firmware_installing,
|
||||||
task = task
|
task
|
||||||
).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -432,7 +400,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
|
|
||||||
if (FileUtil.getExtension(result) != "bin") {
|
if (FileUtil.getExtension(result) != "bin") {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.reading_keys_failure,
|
titleId = R.string.reading_keys_failure,
|
||||||
descriptionId = R.string.install_amiibo_keys_failure_extension_description
|
descriptionId = R.string.install_amiibo_keys_failure_extension_description
|
||||||
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
@ -460,7 +427,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
).show()
|
).show()
|
||||||
} else {
|
} else {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.invalid_keys_error,
|
titleId = R.string.invalid_keys_error,
|
||||||
descriptionId = R.string.install_keys_failure_description,
|
descriptionId = R.string.install_keys_failure_description,
|
||||||
helpLinkId = R.string.dumping_keys_quickstart_link
|
helpLinkId = R.string.dumping_keys_quickstart_link
|
||||||
@ -528,7 +494,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
if (documents.isNotEmpty()) {
|
if (documents.isNotEmpty()) {
|
||||||
IndeterminateProgressDialogFragment.newInstance(
|
IndeterminateProgressDialogFragment.newInstance(
|
||||||
this@MainActivity,
|
this@MainActivity,
|
||||||
R.string.installing_game_content
|
R.string.install_game_content
|
||||||
) {
|
) {
|
||||||
var installSuccess = 0
|
var installSuccess = 0
|
||||||
var installOverwrite = 0
|
var installOverwrite = 0
|
||||||
@ -536,12 +502,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
var errorExtension = 0
|
var errorExtension = 0
|
||||||
var errorOther = 0
|
var errorOther = 0
|
||||||
documents.forEach {
|
documents.forEach {
|
||||||
when (
|
when (NativeLibrary.installFileToNand(it.toString())) {
|
||||||
NativeLibrary.installFileToNand(
|
|
||||||
it.toString(),
|
|
||||||
FileUtil.getExtension(it)
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
NativeLibrary.InstallFileToNandResult.Success -> {
|
NativeLibrary.InstallFileToNandResult.Success -> {
|
||||||
installSuccess += 1
|
installSuccess += 1
|
||||||
}
|
}
|
||||||
@ -615,14 +576,12 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
installResult.append(separator)
|
installResult.append(separator)
|
||||||
}
|
}
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
return@newInstance MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.install_game_content_failure,
|
titleId = R.string.install_game_content_failure,
|
||||||
descriptionString = installResult.toString().trim(),
|
descriptionString = installResult.toString().trim(),
|
||||||
helpLinkId = R.string.install_game_content_help_link
|
helpLinkId = R.string.install_game_content_help_link
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
return@newInstance MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.install_game_content_success,
|
titleId = R.string.install_game_content_success,
|
||||||
descriptionString = installResult.toString().trim()
|
descriptionString = installResult.toString().trim()
|
||||||
)
|
)
|
||||||
@ -630,228 +589,4 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val exportUserData = registerForActivityResult(
|
|
||||||
ActivityResultContracts.CreateDocument("application/zip")
|
|
||||||
) { result ->
|
|
||||||
if (result == null) {
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
IndeterminateProgressDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
R.string.exporting_user_data,
|
|
||||||
true
|
|
||||||
) {
|
|
||||||
val zipResult = FileUtil.zipFromInternalStorage(
|
|
||||||
File(DirectoryInitialization.userDirectory!!),
|
|
||||||
DirectoryInitialization.userDirectory!!,
|
|
||||||
BufferedOutputStream(contentResolver.openOutputStream(result)),
|
|
||||||
taskViewModel.cancelled
|
|
||||||
)
|
|
||||||
return@newInstance when (zipResult) {
|
|
||||||
TaskState.Completed -> getString(R.string.user_data_export_success)
|
|
||||||
TaskState.Failed -> R.string.export_failed
|
|
||||||
TaskState.Cancelled -> R.string.user_data_export_cancelled
|
|
||||||
}
|
|
||||||
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
|
||||||
}
|
|
||||||
|
|
||||||
val importUserData =
|
|
||||||
registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
|
|
||||||
if (result == null) {
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
IndeterminateProgressDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
R.string.importing_user_data
|
|
||||||
) {
|
|
||||||
val checkStream =
|
|
||||||
ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
|
|
||||||
var isYuzuBackup = false
|
|
||||||
checkStream.use { stream ->
|
|
||||||
var ze: ZipEntry? = null
|
|
||||||
while (stream.nextEntry?.also { ze = it } != null) {
|
|
||||||
val itemName = ze!!.name.trim()
|
|
||||||
if (itemName == "/config/config.ini" || itemName == "config/config.ini") {
|
|
||||||
isYuzuBackup = true
|
|
||||||
return@use
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isYuzuBackup) {
|
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
titleId = R.string.invalid_yuzu_backup,
|
|
||||||
descriptionId = R.string.user_data_import_failed_description
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear existing user data
|
|
||||||
File(DirectoryInitialization.userDirectory!!).deleteRecursively()
|
|
||||||
|
|
||||||
// Copy archive to internal storage
|
|
||||||
try {
|
|
||||||
FileUtil.unzipToInternalStorage(
|
|
||||||
BufferedInputStream(contentResolver.openInputStream(result)),
|
|
||||||
File(DirectoryInitialization.userDirectory!!)
|
|
||||||
)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
titleId = R.string.import_failed,
|
|
||||||
descriptionId = R.string.user_data_import_failed_description
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reinitialize relevant data
|
|
||||||
NativeLibrary.initializeEmulation()
|
|
||||||
gamesViewModel.reloadGames(false)
|
|
||||||
|
|
||||||
return@newInstance getString(R.string.user_data_import_success)
|
|
||||||
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Zips the save files located in the given folder path and creates a new zip file with the current date and time.
|
|
||||||
* @return true if the zip file is successfully created, false otherwise.
|
|
||||||
*/
|
|
||||||
private fun zipSave(): Boolean {
|
|
||||||
try {
|
|
||||||
val tempFolder = File(getPublicFilesDir().canonicalPath, "temp")
|
|
||||||
tempFolder.mkdirs()
|
|
||||||
val saveFolder = File(savesFolderRoot)
|
|
||||||
val outputZipFile = File(
|
|
||||||
tempFolder,
|
|
||||||
"yuzu saves - ${
|
|
||||||
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
|
|
||||||
}.zip"
|
|
||||||
)
|
|
||||||
outputZipFile.createNewFile()
|
|
||||||
val result = FileUtil.zipFromInternalStorage(
|
|
||||||
saveFolder,
|
|
||||||
savesFolderRoot,
|
|
||||||
BufferedOutputStream(FileOutputStream(outputZipFile))
|
|
||||||
)
|
|
||||||
if (result == TaskState.Failed) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
lastZipCreated = outputZipFile
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
|
|
||||||
*/
|
|
||||||
fun exportSave() {
|
|
||||||
CoroutineScope(Dispatchers.IO).launch {
|
|
||||||
val wasZipCreated = zipSave()
|
|
||||||
val lastZipFile = lastZipCreated
|
|
||||||
if (!wasZipCreated || lastZipFile == null) {
|
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
Toast.makeText(
|
|
||||||
this@MainActivity,
|
|
||||||
getString(R.string.export_save_failed),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
return@launch
|
|
||||||
}
|
|
||||||
|
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
val file = DocumentFile.fromSingleUri(
|
|
||||||
this@MainActivity,
|
|
||||||
DocumentsContract.buildDocumentUri(
|
|
||||||
DocumentProvider.AUTHORITY,
|
|
||||||
"${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
|
|
||||||
)
|
|
||||||
)!!
|
|
||||||
val intent = Intent(Intent.ACTION_SEND)
|
|
||||||
.setDataAndType(file.uri, "application/zip")
|
|
||||||
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
|
||||||
.putExtra(Intent.EXTRA_STREAM, file.uri)
|
|
||||||
startForResultExportSave.launch(
|
|
||||||
Intent.createChooser(
|
|
||||||
intent,
|
|
||||||
getString(R.string.share_save_file)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val startForResultExportSave =
|
|
||||||
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
|
|
||||||
File(getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
|
|
||||||
}
|
|
||||||
|
|
||||||
val importSaves =
|
|
||||||
registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
|
|
||||||
if (result == null) {
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
NativeLibrary.initializeEmptyUserDirectory()
|
|
||||||
|
|
||||||
val inputZip = contentResolver.openInputStream(result)
|
|
||||||
// A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
|
|
||||||
var validZip = false
|
|
||||||
val savesFolder = File(savesFolderRoot)
|
|
||||||
val cacheSaveDir = File("${applicationContext.cacheDir.path}/saves/")
|
|
||||||
cacheSaveDir.mkdir()
|
|
||||||
|
|
||||||
if (inputZip == null) {
|
|
||||||
Toast.makeText(
|
|
||||||
applicationContext,
|
|
||||||
getString(R.string.fatal_error),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
val filterTitleId =
|
|
||||||
FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
|
|
||||||
|
|
||||||
try {
|
|
||||||
CoroutineScope(Dispatchers.IO).launch {
|
|
||||||
FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
|
|
||||||
cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
|
|
||||||
File(savesFolder, savePath).deleteRecursively()
|
|
||||||
File(cacheSaveDir, savePath).copyRecursively(
|
|
||||||
File(savesFolder, savePath),
|
|
||||||
true
|
|
||||||
)
|
|
||||||
validZip = true
|
|
||||||
}
|
|
||||||
|
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
if (!validZip) {
|
|
||||||
MessageDialogFragment.newInstance(
|
|
||||||
this@MainActivity,
|
|
||||||
titleId = R.string.save_file_invalid_zip_structure,
|
|
||||||
descriptionId = R.string.save_file_invalid_zip_structure_description
|
|
||||||
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
|
||||||
return@withContext
|
|
||||||
}
|
|
||||||
Toast.makeText(
|
|
||||||
applicationContext,
|
|
||||||
getString(R.string.save_file_imported_success),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
|
|
||||||
cacheSaveDir.deleteRecursively()
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
Toast.makeText(
|
|
||||||
applicationContext,
|
|
||||||
getString(R.string.fatal_error),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,6 @@ import android.database.Cursor
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.DocumentsContract
|
import android.provider.DocumentsContract
|
||||||
import androidx.documentfile.provider.DocumentFile
|
import androidx.documentfile.provider.DocumentFile
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import java.io.BufferedInputStream
|
import java.io.BufferedInputStream
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
@ -19,9 +18,6 @@ import java.util.zip.ZipEntry
|
|||||||
import java.util.zip.ZipInputStream
|
import java.util.zip.ZipInputStream
|
||||||
import org.yuzu.yuzu_emu.YuzuApplication
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
import org.yuzu.yuzu_emu.model.MinimalDocumentFile
|
import org.yuzu.yuzu_emu.model.MinimalDocumentFile
|
||||||
import org.yuzu.yuzu_emu.model.TaskState
|
|
||||||
import java.io.BufferedOutputStream
|
|
||||||
import java.util.zip.ZipOutputStream
|
|
||||||
|
|
||||||
object FileUtil {
|
object FileUtil {
|
||||||
const val PATH_TREE = "tree"
|
const val PATH_TREE = "tree"
|
||||||
@ -286,65 +282,30 @@ object FileUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Extracts the given zip file into the given directory.
|
* Extracts the given zip file into the given directory.
|
||||||
|
* @exception IOException if the file was being created outside of the target directory
|
||||||
*/
|
*/
|
||||||
@Throws(SecurityException::class)
|
@Throws(SecurityException::class)
|
||||||
fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
|
fun unzip(zipStream: InputStream, destDir: File): Boolean {
|
||||||
ZipInputStream(zipStream).use { zis ->
|
ZipInputStream(BufferedInputStream(zipStream)).use { zis ->
|
||||||
var entry: ZipEntry? = zis.nextEntry
|
var entry: ZipEntry? = zis.nextEntry
|
||||||
while (entry != null) {
|
while (entry != null) {
|
||||||
val newFile = File(destDir, entry.name)
|
val entryName = entry.name
|
||||||
val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile
|
val entryFile = File(destDir, entryName)
|
||||||
|
if (!entryFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
|
||||||
if (!newFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
|
throw SecurityException("Entry is outside of the target dir: " + entryFile.name)
|
||||||
throw SecurityException("Zip file attempted path traversal! ${entry.name}")
|
|
||||||
}
|
}
|
||||||
|
if (entry.isDirectory) {
|
||||||
if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
|
entryFile.mkdirs()
|
||||||
throw IOException("Failed to create directory $destinationDirectory")
|
} else {
|
||||||
}
|
entryFile.parentFile?.mkdirs()
|
||||||
|
entryFile.createNewFile()
|
||||||
if (!entry.isDirectory) {
|
entryFile.outputStream().use { fos -> zis.copyTo(fos) }
|
||||||
newFile.outputStream().use { fos -> zis.copyTo(fos) }
|
|
||||||
}
|
}
|
||||||
entry = zis.nextEntry
|
entry = zis.nextEntry
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
return true
|
||||||
* Creates a zip file from a directory within internal storage
|
|
||||||
* @param inputFile File representation of the item that will be zipped
|
|
||||||
* @param rootDir Directory containing the inputFile
|
|
||||||
* @param outputStream Stream where the zip file will be output
|
|
||||||
*/
|
|
||||||
fun zipFromInternalStorage(
|
|
||||||
inputFile: File,
|
|
||||||
rootDir: String,
|
|
||||||
outputStream: BufferedOutputStream,
|
|
||||||
cancelled: StateFlow<Boolean>? = null
|
|
||||||
): TaskState {
|
|
||||||
try {
|
|
||||||
ZipOutputStream(outputStream).use { zos ->
|
|
||||||
inputFile.walkTopDown().forEach { file ->
|
|
||||||
if (cancelled?.value == true) {
|
|
||||||
return TaskState.Cancelled
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!file.isDirectory) {
|
|
||||||
val entryName =
|
|
||||||
file.absolutePath.removePrefix(rootDir).removePrefix("/")
|
|
||||||
val entry = ZipEntry(entryName)
|
|
||||||
zos.putNextEntry(entry)
|
|
||||||
if (file.isFile) {
|
|
||||||
file.inputStream().use { fis -> fis.copyTo(zos) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return TaskState.Failed
|
|
||||||
}
|
|
||||||
return TaskState.Completed
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isRootTreeUri(uri: Uri): Boolean {
|
fun isRootTreeUri(uri: Uri): Boolean {
|
||||||
|
@ -6,11 +6,9 @@ package org.yuzu.yuzu_emu.utils
|
|||||||
import android.graphics.Bitmap
|
import android.graphics.Bitmap
|
||||||
import android.graphics.BitmapFactory
|
import android.graphics.BitmapFactory
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import androidx.core.graphics.drawable.toBitmap
|
|
||||||
import androidx.core.graphics.drawable.toDrawable
|
import androidx.core.graphics.drawable.toDrawable
|
||||||
import coil.ImageLoader
|
import coil.ImageLoader
|
||||||
import coil.decode.DataSource
|
import coil.decode.DataSource
|
||||||
import coil.executeBlocking
|
|
||||||
import coil.fetch.DrawableResult
|
import coil.fetch.DrawableResult
|
||||||
import coil.fetch.FetchResult
|
import coil.fetch.FetchResult
|
||||||
import coil.fetch.Fetcher
|
import coil.fetch.Fetcher
|
||||||
@ -76,13 +74,4 @@ object GameIconUtils {
|
|||||||
.build()
|
.build()
|
||||||
imageLoader.enqueue(request)
|
imageLoader.enqueue(request)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getGameIcon(game: Game): Bitmap {
|
|
||||||
val request = ImageRequest.Builder(YuzuApplication.appContext)
|
|
||||||
.data(game)
|
|
||||||
.error(R.drawable.default_icon)
|
|
||||||
.build()
|
|
||||||
return imageLoader.executeBlocking(request)
|
|
||||||
.drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -282,7 +282,7 @@ void Config::ReadValues() {
|
|||||||
std::stringstream ss(title_list);
|
std::stringstream ss(title_list);
|
||||||
std::string line;
|
std::string line;
|
||||||
while (std::getline(ss, line, '|')) {
|
while (std::getline(ss, line, '|')) {
|
||||||
const auto title_id = std::strtoul(line.c_str(), nullptr, 16);
|
const auto title_id = std::stoul(line, nullptr, 16);
|
||||||
const auto disabled_list = config->Get("AddOns", "disabled_" + line, "");
|
const auto disabled_list = config->Get("AddOns", "disabled_" + line, "");
|
||||||
|
|
||||||
std::stringstream inner_ss(disabled_list);
|
std::stringstream inner_ss(disabled_list);
|
||||||
|
@ -11,12 +11,6 @@
|
|||||||
#include "jni/emu_window/emu_window.h"
|
#include "jni/emu_window/emu_window.h"
|
||||||
|
|
||||||
void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
|
void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
|
||||||
m_window_width = ANativeWindow_getWidth(surface);
|
|
||||||
m_window_height = ANativeWindow_getHeight(surface);
|
|
||||||
|
|
||||||
// Ensures that we emulate with the correct aspect ratio.
|
|
||||||
UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
|
|
||||||
|
|
||||||
window_info.render_surface = reinterpret_cast<void*>(surface);
|
window_info.render_surface = reinterpret_cast<void*>(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,8 +62,14 @@ EmuWindow_Android::EmuWindow_Android(InputCommon::InputSubsystem* input_subsyste
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
OnSurfaceChanged(surface);
|
m_window_width = ANativeWindow_getWidth(surface);
|
||||||
|
m_window_height = ANativeWindow_getHeight(surface);
|
||||||
|
|
||||||
|
// Ensures that we emulate with the correct aspect ratio.
|
||||||
|
UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
|
||||||
|
|
||||||
window_info.type = Core::Frontend::WindowSystemType::Android;
|
window_info.type = Core::Frontend::WindowSystemType::Android;
|
||||||
|
window_info.render_surface = reinterpret_cast<void*>(surface);
|
||||||
|
|
||||||
m_input_subsystem->Initialize();
|
m_input_subsystem->Initialize();
|
||||||
}
|
}
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
|
|
||||||
#include <android/api-level.h>
|
#include <android/api-level.h>
|
||||||
#include <android/native_window_jni.h>
|
#include <android/native_window_jni.h>
|
||||||
#include <common/fs/fs.h>
|
|
||||||
#include <core/file_sys/savedata_factory.h>
|
|
||||||
#include <core/loader/nro.h>
|
#include <core/loader/nro.h>
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
|
|
||||||
@ -104,7 +102,7 @@ public:
|
|||||||
m_native_window = native_window;
|
m_native_window = native_window;
|
||||||
}
|
}
|
||||||
|
|
||||||
int InstallFileToNand(std::string filename, std::string file_extension) {
|
int InstallFileToNand(std::string filename) {
|
||||||
jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
|
jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
|
||||||
std::size_t block_size) {
|
std::size_t block_size) {
|
||||||
if (src == nullptr || dest == nullptr) {
|
if (src == nullptr || dest == nullptr) {
|
||||||
@ -136,11 +134,15 @@ public:
|
|||||||
m_system.GetFileSystemController().CreateFactories(*m_vfs);
|
m_system.GetFileSystemController().CreateFactories(*m_vfs);
|
||||||
|
|
||||||
[[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
|
[[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
|
||||||
if (file_extension == "nsp") {
|
if (filename.ends_with("nsp")) {
|
||||||
nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
||||||
if (nsp->IsExtractedType()) {
|
if (nsp->IsExtractedType()) {
|
||||||
return InstallError;
|
return InstallError;
|
||||||
}
|
}
|
||||||
|
} else if (filename.ends_with("xci")) {
|
||||||
|
jconst xci =
|
||||||
|
std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
||||||
|
nsp = xci->GetSecurePartitionNSP();
|
||||||
} else {
|
} else {
|
||||||
return ErrorFilenameExtension;
|
return ErrorFilenameExtension;
|
||||||
}
|
}
|
||||||
@ -260,6 +262,9 @@ public:
|
|||||||
Core::SystemResultStatus InitializeEmulation(const std::string& filepath) {
|
Core::SystemResultStatus InitializeEmulation(const std::string& filepath) {
|
||||||
std::scoped_lock lock(m_mutex);
|
std::scoped_lock lock(m_mutex);
|
||||||
|
|
||||||
|
// Loads the configuration.
|
||||||
|
Config{};
|
||||||
|
|
||||||
// Create the render window.
|
// Create the render window.
|
||||||
m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window,
|
m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window,
|
||||||
m_vulkan_library);
|
m_vulkan_library);
|
||||||
@ -325,13 +330,12 @@ public:
|
|||||||
m_system.ShutdownMainProcess();
|
m_system.ShutdownMainProcess();
|
||||||
m_detached_tasks.WaitForAllTasks();
|
m_detached_tasks.WaitForAllTasks();
|
||||||
m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
|
m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
|
||||||
m_window.reset();
|
|
||||||
OnEmulationStopped(Core::SystemResultStatus::Success);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tear down the render window.
|
// Tear down the render window.
|
||||||
m_window.reset();
|
m_window.reset();
|
||||||
|
|
||||||
|
OnEmulationStopped(m_load_result);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PauseEmulation() {
|
void PauseEmulation() {
|
||||||
@ -605,10 +609,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject
|
|||||||
}
|
}
|
||||||
|
|
||||||
int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
|
int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
|
||||||
jstring j_file,
|
[[maybe_unused]] jstring j_file) {
|
||||||
jstring j_file_extension) {
|
return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file));
|
||||||
return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file),
|
|
||||||
GetJString(env, j_file_extension));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
|
void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
|
||||||
@ -670,6 +672,18 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass claz
|
|||||||
return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());
|
return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Java_org_yuzu_yuzu_1emu_NativeLibrary_muteAduio(JNIEnv* env, jclass clazz) {
|
||||||
|
Settings::values.audio_muted = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Java_org_yuzu_yuzu_1emu_NativeLibrary_unmuteAudio(JNIEnv* env, jclass clazz) {
|
||||||
|
Settings::values.audio_muted = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isMuted(JNIEnv* env, jclass clazz) {
|
||||||
|
return static_cast<jboolean>(Settings::values.audio_muted.GetValue());
|
||||||
|
}
|
||||||
|
|
||||||
jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env, jclass clazz) {
|
jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env, jclass clazz) {
|
||||||
return EmulationSession::GetInstance().IsHandheldOnly();
|
return EmulationSession::GetInstance().IsHandheldOnly();
|
||||||
}
|
}
|
||||||
@ -879,24 +893,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* env
|
|||||||
EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code);
|
EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env,
|
|
||||||
jobject instance) {
|
|
||||||
const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir);
|
|
||||||
auto vfs_nand_dir = EmulationSession::GetInstance().System().GetFilesystem()->OpenDirectory(
|
|
||||||
Common::FS::PathToUTF8String(nand_dir), FileSys::Mode::Read);
|
|
||||||
|
|
||||||
Service::Account::ProfileManager manager;
|
|
||||||
const auto user_id = manager.GetUser(static_cast<std::size_t>(0));
|
|
||||||
ASSERT(user_id);
|
|
||||||
|
|
||||||
const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
|
|
||||||
EmulationSession::GetInstance().System(), vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser,
|
|
||||||
FileSys::SaveDataType::SaveData, 1, user_id->AsU128(), 0);
|
|
||||||
|
|
||||||
const auto full_path = Common::FS::ConcatPathSafe(nand_dir, user_save_data_path);
|
|
||||||
if (!Common::FS::CreateParentDirs(full_path)) {
|
|
||||||
LOG_WARNING(Frontend, "Failed to create full path of the default user's save directory");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="?attr/colorControlNormal"
|
|
||||||
android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z" />
|
|
||||||
</vector>
|
|
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="?attr/colorControlNormal"
|
|
||||||
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
|
|
||||||
</vector>
|
|
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
|
|
||||||
<item>
|
|
||||||
<color android:color="@android:color/white" />
|
|
||||||
</item>
|
|
||||||
<item android:id="@+id/shortcut_foreground">
|
|
||||||
<bitmap android:src="@drawable/default_icon" />
|
|
||||||
</item>
|
|
||||||
|
|
||||||
</layer-list>
|
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/navigation_bar_shade"
|
android:id="@+id/navigation_bar_shade"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1px"
|
android:layout_height="1px"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
|
@ -1,71 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
style="?attr/materialCardViewOutlinedStyle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="16dp"
|
|
||||||
android:layout_marginVertical="12dp">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_gravity="center">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="16dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/title"
|
|
||||||
style="@style/TextAppearance.Material3.TitleMedium"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/user_data"
|
|
||||||
android:textAlignment="viewStart" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/description"
|
|
||||||
style="@style/TextAppearance.Material3.BodyMedium"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="6dp"
|
|
||||||
android:text="@string/user_data_description"
|
|
||||||
android:textAlignment="viewStart" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/button_export"
|
|
||||||
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:contentDescription="@string/export"
|
|
||||||
android:tooltipText="@string/export"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:icon="@drawable/ic_export"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/button_install"
|
|
||||||
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:contentDescription="@string/string_import"
|
|
||||||
android:tooltipText="@string/string_import"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:icon="@drawable/ic_import"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</com.google.android.material.card.MaterialCardView>
|
|
@ -1,8 +1,24 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<com.google.android.material.progressindicator.LinearProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:id="@+id/progress_bar"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:padding="24dp"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
app:trackCornerRadius="4dp" />
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<com.google.android.material.progressindicator.LinearProgressIndicator
|
||||||
|
android:id="@+id/progress_bar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="24dp"
|
||||||
|
app:trackCornerRadius="4dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/progress_text"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="24dp"
|
||||||
|
android:layout_marginRight="24dp"
|
||||||
|
android:layout_marginBottom="24dp"
|
||||||
|
android:gravity="end" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
@ -32,8 +32,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:focusable="false"
|
android:focusable="false">
|
||||||
android:clickable="false">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/loading_layout"
|
android:id="@+id/loading_layout"
|
||||||
@ -156,7 +155,7 @@
|
|||||||
android:id="@+id/in_game_menu"
|
android:id="@+id/in_game_menu"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="start"
|
android:layout_gravity="start|bottom"
|
||||||
app:headerLayout="@layout/header_in_game"
|
app:headerLayout="@layout/header_in_game"
|
||||||
app:menu="@menu/menu_in_game"
|
app:menu="@menu/menu_in_game"
|
||||||
tools:visibility="gone" />
|
tools:visibility="gone" />
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:id="@+id/coordinator_licenses"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="?attr/colorSurface">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
|
||||||
android:id="@+id/appbar_installables"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fitsSystemWindows="true">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
|
||||||
android:id="@+id/toolbar_installables"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?attr/actionBarSize"
|
|
||||||
app:title="@string/manage_yuzu_data"
|
|
||||||
app:navigationIcon="@drawable/ic_back" />
|
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/list_installables"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -27,7 +27,7 @@
|
|||||||
app:nullable="true" />
|
app:nullable="true" />
|
||||||
<argument
|
<argument
|
||||||
android:name="menuTag"
|
android:name="menuTag"
|
||||||
app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
|
app:argType="string" />
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<action
|
<action
|
||||||
|
@ -19,9 +19,6 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
|
android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
|
||||||
app:destination="@id/earlyAccessFragment" />
|
app:destination="@id/earlyAccessFragment" />
|
||||||
<action
|
|
||||||
android:id="@+id/action_homeSettingsFragment_to_installableFragment"
|
|
||||||
app:destination="@id/installableFragment" />
|
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
@ -85,15 +82,11 @@
|
|||||||
app:nullable="true" />
|
app:nullable="true" />
|
||||||
<argument
|
<argument
|
||||||
android:name="menuTag"
|
android:name="menuTag"
|
||||||
app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
|
app:argType="string" />
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_settingsActivity"
|
android:id="@+id/action_global_settingsActivity"
|
||||||
app:destination="@id/settingsActivity" />
|
app:destination="@id/settingsActivity" />
|
||||||
<fragment
|
|
||||||
android:id="@+id/installableFragment"
|
|
||||||
android:name="org.yuzu.yuzu_emu.fragments.InstallableFragment"
|
|
||||||
android:label="InstallableFragment" />
|
|
||||||
|
|
||||||
</navigation>
|
</navigation>
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
android:label="SettingsFragment">
|
android:label="SettingsFragment">
|
||||||
<argument
|
<argument
|
||||||
android:name="menuTag"
|
android:name="menuTag"
|
||||||
app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
|
app:argType="string" />
|
||||||
<argument
|
<argument
|
||||||
android:name="game"
|
android:name="game"
|
||||||
app:argType="org.yuzu.yuzu_emu.model.Game"
|
app:argType="org.yuzu.yuzu_emu.model.Game"
|
||||||
|
@ -79,6 +79,7 @@
|
|||||||
<string name="manage_save_data">Speicherdaten verwalten</string>
|
<string name="manage_save_data">Speicherdaten verwalten</string>
|
||||||
<string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
|
<string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
|
||||||
<string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
|
<string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
|
||||||
|
<string name="import_export_saves_no_profile">Keine Speicherdaten gefunden. Bitte starte ein Spiel und versuche es erneut.</string>
|
||||||
<string name="save_file_imported_success">Erfolgreich importiert</string>
|
<string name="save_file_imported_success">Erfolgreich importiert</string>
|
||||||
<string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
|
<string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
|
<string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Administrar datos de guardado</string>
|
<string name="manage_save_data">Administrar datos de guardado</string>
|
||||||
<string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
|
<string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
|
||||||
<string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
|
<string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
|
||||||
|
<string name="import_export_saves_no_profile">No se han encontrado datos de guardado. Por favor, ejecute un juego y vuelva a intentarlo.</string>
|
||||||
<string name="save_file_imported_success">Importado correctamente</string>
|
<string name="save_file_imported_success">Importado correctamente</string>
|
||||||
<string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
|
<string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
|
<string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gérer les données de sauvegarde</string>
|
<string name="manage_save_data">Gérer les données de sauvegarde</string>
|
||||||
<string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
|
<string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
|
||||||
<string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
|
<string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
|
||||||
|
<string name="import_export_saves_no_profile">Aucune données de sauvegarde trouvées. Veuillez lancer un jeu et réessayer.</string>
|
||||||
<string name="save_file_imported_success">Importé avec succès</string>
|
<string name="save_file_imported_success">Importé avec succès</string>
|
||||||
<string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
|
<string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>
|
<string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gestisci i salvataggi</string>
|
<string name="manage_save_data">Gestisci i salvataggi</string>
|
||||||
<string name="manage_save_data_description">Salvataggio non trovato. Seleziona un\'opzione di seguito.</string>
|
<string name="manage_save_data_description">Salvataggio non trovato. Seleziona un\'opzione di seguito.</string>
|
||||||
<string name="import_export_saves_description">Importa o esporta i salvataggi</string>
|
<string name="import_export_saves_description">Importa o esporta i salvataggi</string>
|
||||||
|
<string name="import_export_saves_no_profile">Nessun salvataggio trovato. Avvia un gioco e riprova.</string>
|
||||||
<string name="save_file_imported_success">Importato con successo</string>
|
<string name="save_file_imported_success">Importato con successo</string>
|
||||||
<string name="save_file_invalid_zip_structure">La struttura della cartella dei salvataggi è invalida</string>
|
<string name="save_file_invalid_zip_structure">La struttura della cartella dei salvataggi è invalida</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">La prima sotto cartella <b>deve</b> chiamarsi come l\'ID del titolo del gioco.</string>
|
<string name="save_file_invalid_zip_structure_description">La prima sotto cartella <b>deve</b> chiamarsi come l\'ID del titolo del gioco.</string>
|
||||||
|
@ -80,6 +80,7 @@
|
|||||||
<string name="manage_save_data">セーブデータを管理</string>
|
<string name="manage_save_data">セーブデータを管理</string>
|
||||||
<string name="manage_save_data_description">セーブデータが見つかりました。以下のオプションから選択してください。</string>
|
<string name="manage_save_data_description">セーブデータが見つかりました。以下のオプションから選択してください。</string>
|
||||||
<string name="import_export_saves_description">セーブファイルをインポート/エクスポート</string>
|
<string name="import_export_saves_description">セーブファイルをインポート/エクスポート</string>
|
||||||
|
<string name="import_export_saves_no_profile">セーブデータがありません。ゲームを起動してから再度お試しください。</string>
|
||||||
<string name="save_file_imported_success">インポートが完了しました</string>
|
<string name="save_file_imported_success">インポートが完了しました</string>
|
||||||
<string name="save_file_invalid_zip_structure">セーブデータのディレクトリ構造が無効です</string>
|
<string name="save_file_invalid_zip_structure">セーブデータのディレクトリ構造が無効です</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">最初のサブフォルダ名は、ゲームのタイトルIDである必要があります。</string>
|
<string name="save_file_invalid_zip_structure_description">最初のサブフォルダ名は、ゲームのタイトルIDである必要があります。</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">저장 데이터 관리</string>
|
<string name="manage_save_data">저장 데이터 관리</string>
|
||||||
<string name="manage_save_data_description">데이터를 저장했습니다. 아래에서 옵션을 선택하세요.</string>
|
<string name="manage_save_data_description">데이터를 저장했습니다. 아래에서 옵션을 선택하세요.</string>
|
||||||
<string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string>
|
<string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string>
|
||||||
|
<string name="import_export_saves_no_profile">저장 데이터를 찾을 수 없습니다. 게임을 실행한 후 다시 시도하세요.</string>
|
||||||
<string name="save_file_imported_success">가져오기 성공</string>
|
<string name="save_file_imported_success">가져오기 성공</string>
|
||||||
<string name="save_file_invalid_zip_structure">저장 디렉터리 구조가 잘못됨</string>
|
<string name="save_file_invalid_zip_structure">저장 디렉터리 구조가 잘못됨</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string>
|
<string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Administrere lagringsdata</string>
|
<string name="manage_save_data">Administrere lagringsdata</string>
|
||||||
<string name="manage_save_data_description">Lagringsdata funnet. Velg et alternativ nedenfor.</string>
|
<string name="manage_save_data_description">Lagringsdata funnet. Velg et alternativ nedenfor.</string>
|
||||||
<string name="import_export_saves_description">Importer eller eksporter lagringsfiler</string>
|
<string name="import_export_saves_description">Importer eller eksporter lagringsfiler</string>
|
||||||
|
<string name="import_export_saves_no_profile">Ingen lagringsdata funnet. Start et nytt spill og prøv på nytt.</string>
|
||||||
<string name="save_file_imported_success">Vellykket import</string>
|
<string name="save_file_imported_success">Vellykket import</string>
|
||||||
<string name="save_file_invalid_zip_structure">Ugyldig struktur for lagringskatalog</string>
|
<string name="save_file_invalid_zip_structure">Ugyldig struktur for lagringskatalog</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Det første undermappenavnet må være spillets tittel-ID.</string>
|
<string name="save_file_invalid_zip_structure_description">Det første undermappenavnet må være spillets tittel-ID.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Zarządzaj plikami zapisów gier</string>
|
<string name="manage_save_data">Zarządzaj plikami zapisów gier</string>
|
||||||
<string name="manage_save_data_description">Znaleziono pliki zapisów gier. Wybierz opcję poniżej.</string>
|
<string name="manage_save_data_description">Znaleziono pliki zapisów gier. Wybierz opcję poniżej.</string>
|
||||||
<string name="import_export_saves_description">Importuj lub wyeksportuj pliki zapisów</string>
|
<string name="import_export_saves_description">Importuj lub wyeksportuj pliki zapisów</string>
|
||||||
|
<string name="import_export_saves_no_profile">Nie znaleziono plików zapisów. Uruchom grę i spróbuj ponownie.</string>
|
||||||
<string name="save_file_imported_success">Zaimportowano pomyślnie</string>
|
<string name="save_file_imported_success">Zaimportowano pomyślnie</string>
|
||||||
<string name="save_file_invalid_zip_structure">Niepoprawna struktura folderów</string>
|
<string name="save_file_invalid_zip_structure">Niepoprawna struktura folderów</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Pierwszy podkatalog musi zawierać w nazwie numer ID tytułu gry.</string>
|
<string name="save_file_invalid_zip_structure_description">Pierwszy podkatalog musi zawierać w nazwie numer ID tytułu gry.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gerir dados guardados</string>
|
<string name="manage_save_data">Gerir dados guardados</string>
|
||||||
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
||||||
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
||||||
|
<string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
|
||||||
<string name="save_file_imported_success">Importado com sucesso</string>
|
<string name="save_file_imported_success">Importado com sucesso</string>
|
||||||
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gerir dados guardados</string>
|
<string name="manage_save_data">Gerir dados guardados</string>
|
||||||
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
||||||
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
||||||
|
<string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
|
||||||
<string name="save_file_imported_success">Importado com sucesso</string>
|
<string name="save_file_imported_success">Importado com sucesso</string>
|
||||||
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Управление данными сохранений</string>
|
<string name="manage_save_data">Управление данными сохранений</string>
|
||||||
<string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string>
|
<string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string>
|
||||||
<string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string>
|
<string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string>
|
||||||
|
<string name="import_export_saves_no_profile">Данные сохранений не найдены. Пожалуйста, запустите игру и повторите попытку.</string>
|
||||||
<string name="save_file_imported_success">Успешно импортировано</string>
|
<string name="save_file_imported_success">Успешно импортировано</string>
|
||||||
<string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string>
|
<string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string>
|
<string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Керування даними збережень</string>
|
<string name="manage_save_data">Керування даними збережень</string>
|
||||||
<string name="manage_save_data_description">Знайдено дані збережень. Будь ласка, виберіть варіант нижче.</string>
|
<string name="manage_save_data_description">Знайдено дані збережень. Будь ласка, виберіть варіант нижче.</string>
|
||||||
<string name="import_export_saves_description">Імпорт або експорт файлів збереження</string>
|
<string name="import_export_saves_description">Імпорт або експорт файлів збереження</string>
|
||||||
|
<string name="import_export_saves_no_profile">Дані збережень не знайдено. Будь ласка, запустіть гру та повторіть спробу.</string>
|
||||||
<string name="save_file_imported_success">Успішно імпортовано</string>
|
<string name="save_file_imported_success">Успішно імпортовано</string>
|
||||||
<string name="save_file_invalid_zip_structure">Неприпустима структура папки збереження</string>
|
<string name="save_file_invalid_zip_structure">Неприпустима структура папки збереження</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Назва першої вкладеної папки має бути ідентифікатором гри.</string>
|
<string name="save_file_invalid_zip_structure_description">Назва першої вкладеної папки має бути ідентифікатором гри.</string>
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
|
|
||||||
<integer name="grid_columns">2</integer>
|
|
||||||
|
|
||||||
</resources>
|
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">管理存档数据</string>
|
<string name="manage_save_data">管理存档数据</string>
|
||||||
<string name="manage_save_data_description">已找到存档数据,请选择下方的选项。</string>
|
<string name="manage_save_data_description">已找到存档数据,请选择下方的选项。</string>
|
||||||
<string name="import_export_saves_description">导入或导出存档</string>
|
<string name="import_export_saves_description">导入或导出存档</string>
|
||||||
|
<string name="import_export_saves_no_profile">找不到存档数据,请启动游戏并重试。</string>
|
||||||
<string name="save_file_imported_success">已成功导入存档</string>
|
<string name="save_file_imported_success">已成功导入存档</string>
|
||||||
<string name="save_file_invalid_zip_structure">无效的存档目录</string>
|
<string name="save_file_invalid_zip_structure">无效的存档目录</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string>
|
<string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">管理儲存資料</string>
|
<string name="manage_save_data">管理儲存資料</string>
|
||||||
<string name="manage_save_data_description">已找到儲存資料,請選取下方的選項。</string>
|
<string name="manage_save_data_description">已找到儲存資料,請選取下方的選項。</string>
|
||||||
<string name="import_export_saves_description">匯入或匯出儲存檔案</string>
|
<string name="import_export_saves_description">匯入或匯出儲存檔案</string>
|
||||||
|
<string name="import_export_saves_no_profile">找不到儲存資料,請啟動遊戲並重試。</string>
|
||||||
<string name="save_file_imported_success">已成功匯入</string>
|
<string name="save_file_imported_success">已成功匯入</string>
|
||||||
<string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string>
|
<string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string>
|
<string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string>
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
<dimen name="spacing_refresh_end">72dp</dimen>
|
<dimen name="spacing_refresh_end">72dp</dimen>
|
||||||
<dimen name="menu_width">256dp</dimen>
|
<dimen name="menu_width">256dp</dimen>
|
||||||
<dimen name="card_width">165dp</dimen>
|
<dimen name="card_width">165dp</dimen>
|
||||||
<dimen name="icon_inset">24dp</dimen>
|
|
||||||
|
|
||||||
<dimen name="dialog_margin">20dp</dimen>
|
<dimen name="dialog_margin">20dp</dimen>
|
||||||
<dimen name="elevated_app_bar">3dp</dimen>
|
<dimen name="elevated_app_bar">3dp</dimen>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<integer name="grid_columns">1</integer>
|
<integer name="game_title_lines">2</integer>
|
||||||
|
|
||||||
<!-- Default SWITCH landscape layout -->
|
<!-- Default SWITCH landscape layout -->
|
||||||
<integer name="SWITCH_BUTTON_A_X">760</integer>
|
<integer name="SWITCH_BUTTON_A_X">760</integer>
|
||||||
|
@ -90,6 +90,7 @@
|
|||||||
<string name="manage_save_data">Manage save data</string>
|
<string name="manage_save_data">Manage save data</string>
|
||||||
<string name="manage_save_data_description">Save data found. Please select an option below.</string>
|
<string name="manage_save_data_description">Save data found. Please select an option below.</string>
|
||||||
<string name="import_export_saves_description">Import or export save files</string>
|
<string name="import_export_saves_description">Import or export save files</string>
|
||||||
|
<string name="import_export_saves_no_profile">No save data found. Please launch a game and retry.</string>
|
||||||
<string name="save_file_imported_success">Imported successfully</string>
|
<string name="save_file_imported_success">Imported successfully</string>
|
||||||
<string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
|
<string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
|
<string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
|
||||||
@ -100,13 +101,12 @@
|
|||||||
<string name="firmware_installing">Installing firmware</string>
|
<string name="firmware_installing">Installing firmware</string>
|
||||||
<string name="firmware_installed_success">Firmware installed successfully</string>
|
<string name="firmware_installed_success">Firmware installed successfully</string>
|
||||||
<string name="firmware_installed_failure">Firmware installation failed</string>
|
<string name="firmware_installed_failure">Firmware installation failed</string>
|
||||||
<string name="firmware_installed_failure_description">Make sure the firmware nca files are at the root of the zip and try again.</string>
|
<string name="firmware_installed_failure_description">Verify that the ZIP contains valid firmware and try again.</string>
|
||||||
<string name="share_log">Share debug logs</string>
|
<string name="share_log">Share debug logs</string>
|
||||||
<string name="share_log_description">Share yuzu\'s log file to debug issues</string>
|
<string name="share_log_description">Share yuzu\'s log file to debug issues</string>
|
||||||
<string name="share_log_missing">No log file found</string>
|
<string name="share_log_missing">No log file found</string>
|
||||||
<string name="install_game_content">Install game content</string>
|
<string name="install_game_content">Install game content</string>
|
||||||
<string name="install_game_content_description">Install game updates or DLC</string>
|
<string name="install_game_content_description">Install game updates or DLC</string>
|
||||||
<string name="installing_game_content">Installing content…</string>
|
|
||||||
<string name="install_game_content_failure">Error installing file(s) to NAND</string>
|
<string name="install_game_content_failure">Error installing file(s) to NAND</string>
|
||||||
<string name="install_game_content_failure_description">Please ensure content(s) are valid and that the prod.keys file is installed.</string>
|
<string name="install_game_content_failure_description">Please ensure content(s) are valid and that the prod.keys file is installed.</string>
|
||||||
<string name="install_game_content_failure_base">Installation of base games isn\'t permitted in order to avoid possible conflicts.</string>
|
<string name="install_game_content_failure_base">Installation of base games isn\'t permitted in order to avoid possible conflicts.</string>
|
||||||
@ -118,10 +118,6 @@
|
|||||||
<string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
|
<string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
|
||||||
<string name="custom_driver_not_supported">Custom drivers not supported</string>
|
<string name="custom_driver_not_supported">Custom drivers not supported</string>
|
||||||
<string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
|
<string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
|
||||||
<string name="manage_yuzu_data">Manage yuzu data</string>
|
|
||||||
<string name="manage_yuzu_data_description">Import/export firmware, keys, user data, and more!</string>
|
|
||||||
<string name="share_save_file">Share save file</string>
|
|
||||||
<string name="export_save_failed">Failed to export save</string>
|
|
||||||
|
|
||||||
<!-- About screen strings -->
|
<!-- About screen strings -->
|
||||||
<string name="gaia_is_not_real">Gaia isn\'t real</string>
|
<string name="gaia_is_not_real">Gaia isn\'t real</string>
|
||||||
@ -132,16 +128,6 @@
|
|||||||
<string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
|
<string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
|
||||||
<string name="licenses_description">Projects that make yuzu for Android possible</string>
|
<string name="licenses_description">Projects that make yuzu for Android possible</string>
|
||||||
<string name="build">Build</string>
|
<string name="build">Build</string>
|
||||||
<string name="user_data">User data</string>
|
|
||||||
<string name="user_data_description">Import/export all app data.\n\nWhen importing user data, all existing user data will be deleted!</string>
|
|
||||||
<string name="exporting_user_data">Exporting user data…</string>
|
|
||||||
<string name="importing_user_data">Importing user data…</string>
|
|
||||||
<string name="import_user_data">Import user data</string>
|
|
||||||
<string name="invalid_yuzu_backup">Invalid yuzu backup</string>
|
|
||||||
<string name="user_data_export_success">User data exported successfully</string>
|
|
||||||
<string name="user_data_import_success">User data imported successfully</string>
|
|
||||||
<string name="user_data_export_cancelled">Export cancelled</string>
|
|
||||||
<string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string>
|
|
||||||
<string name="support_link">https://discord.gg/u77vRWY</string>
|
<string name="support_link">https://discord.gg/u77vRWY</string>
|
||||||
<string name="website_link">https://yuzu-emu.org/</string>
|
<string name="website_link">https://yuzu-emu.org/</string>
|
||||||
<string name="github_link">https://github.com/yuzu-emu</string>
|
<string name="github_link">https://github.com/yuzu-emu</string>
|
||||||
@ -229,11 +215,6 @@
|
|||||||
<string name="auto">Auto</string>
|
<string name="auto">Auto</string>
|
||||||
<string name="submit">Submit</string>
|
<string name="submit">Submit</string>
|
||||||
<string name="string_null">Null</string>
|
<string name="string_null">Null</string>
|
||||||
<string name="string_import">Import</string>
|
|
||||||
<string name="export">Export</string>
|
|
||||||
<string name="export_failed">Export failed</string>
|
|
||||||
<string name="import_failed">Import failed</string>
|
|
||||||
<string name="cancelling">Cancelling</string>
|
|
||||||
|
|
||||||
<!-- GPU driver installation -->
|
<!-- GPU driver installation -->
|
||||||
<string name="select_gpu_driver">Select GPU driver</string>
|
<string name="select_gpu_driver">Select GPU driver</string>
|
||||||
@ -300,7 +281,6 @@
|
|||||||
<string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>
|
<string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>
|
||||||
<string name="device_memory_inadequate">Device RAM: %1$s\nRecommended: %2$s</string>
|
<string name="device_memory_inadequate">Device RAM: %1$s\nRecommended: %2$s</string>
|
||||||
<string name="memory_formatted">%1$s %2$s</string>
|
<string name="memory_formatted">%1$s %2$s</string>
|
||||||
<string name="no_game_present">No bootable game present!</string>
|
|
||||||
|
|
||||||
<!-- Region Names -->
|
<!-- Region Names -->
|
||||||
<string name="region_japan">Japan</string>
|
<string name="region_japan">Japan</string>
|
||||||
|
@ -10,13 +10,6 @@ add_library(audio_core STATIC
|
|||||||
adsp/apps/audio_renderer/command_buffer.h
|
adsp/apps/audio_renderer/command_buffer.h
|
||||||
adsp/apps/audio_renderer/command_list_processor.cpp
|
adsp/apps/audio_renderer/command_list_processor.cpp
|
||||||
adsp/apps/audio_renderer/command_list_processor.h
|
adsp/apps/audio_renderer/command_list_processor.h
|
||||||
adsp/apps/opus/opus_decoder.cpp
|
|
||||||
adsp/apps/opus/opus_decoder.h
|
|
||||||
adsp/apps/opus/opus_decode_object.cpp
|
|
||||||
adsp/apps/opus/opus_decode_object.h
|
|
||||||
adsp/apps/opus/opus_multistream_decode_object.cpp
|
|
||||||
adsp/apps/opus/opus_multistream_decode_object.h
|
|
||||||
adsp/apps/opus/shared_memory.h
|
|
||||||
audio_core.cpp
|
audio_core.cpp
|
||||||
audio_core.h
|
audio_core.h
|
||||||
audio_event.h
|
audio_event.h
|
||||||
@ -42,13 +35,6 @@ add_library(audio_core STATIC
|
|||||||
in/audio_in.h
|
in/audio_in.h
|
||||||
in/audio_in_system.cpp
|
in/audio_in_system.cpp
|
||||||
in/audio_in_system.h
|
in/audio_in_system.h
|
||||||
opus/hardware_opus.cpp
|
|
||||||
opus/hardware_opus.h
|
|
||||||
opus/decoder_manager.cpp
|
|
||||||
opus/decoder_manager.h
|
|
||||||
opus/decoder.cpp
|
|
||||||
opus/decoder.h
|
|
||||||
opus/parameters.h
|
|
||||||
out/audio_out.cpp
|
out/audio_out.cpp
|
||||||
out/audio_out.h
|
out/audio_out.h
|
||||||
out/audio_out_system.cpp
|
out/audio_out_system.cpp
|
||||||
@ -228,7 +214,7 @@ else()
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(audio_core PUBLIC common core Opus::opus)
|
target_link_libraries(audio_core PUBLIC common core)
|
||||||
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
||||||
target_link_libraries(audio_core PRIVATE dynarmic::dynarmic)
|
target_link_libraries(audio_core PRIVATE dynarmic::dynarmic)
|
||||||
endif()
|
endif()
|
||||||
|
@ -7,21 +7,12 @@
|
|||||||
namespace AudioCore::ADSP {
|
namespace AudioCore::ADSP {
|
||||||
|
|
||||||
ADSP::ADSP(Core::System& system, Sink::Sink& sink) {
|
ADSP::ADSP(Core::System& system, Sink::Sink& sink) {
|
||||||
audio_renderer = std::make_unique<AudioRenderer::AudioRenderer>(system, sink);
|
audio_renderer =
|
||||||
opus_decoder = std::make_unique<OpusDecoder::OpusDecoder>(system);
|
std::make_unique<AudioRenderer::AudioRenderer>(system, system.ApplicationMemory(), sink);
|
||||||
opus_decoder->Send(Direction::DSP, OpusDecoder::Message::Start);
|
|
||||||
if (opus_decoder->Receive(Direction::Host) != OpusDecoder::Message::StartOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDeocder failed to initialize.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AudioRenderer::AudioRenderer& ADSP::AudioRenderer() {
|
AudioRenderer::AudioRenderer& ADSP::AudioRenderer() {
|
||||||
return *audio_renderer.get();
|
return *audio_renderer.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
OpusDecoder::OpusDecoder& ADSP::OpusDecoder() {
|
|
||||||
return *opus_decoder.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP
|
} // namespace AudioCore::ADSP
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/audio_renderer/audio_renderer.h"
|
#include "audio_core/adsp/apps/audio_renderer/audio_renderer.h"
|
||||||
#include "audio_core/adsp/apps/opus/opus_decoder.h"
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
@ -41,12 +40,10 @@ public:
|
|||||||
~ADSP() = default;
|
~ADSP() = default;
|
||||||
|
|
||||||
AudioRenderer::AudioRenderer& AudioRenderer();
|
AudioRenderer::AudioRenderer& AudioRenderer();
|
||||||
OpusDecoder::OpusDecoder& OpusDecoder();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/// AudioRenderer app
|
/// AudioRenderer app
|
||||||
std::unique_ptr<AudioRenderer::AudioRenderer> audio_renderer{};
|
std::unique_ptr<AudioRenderer::AudioRenderer> audio_renderer{};
|
||||||
std::unique_ptr<OpusDecoder::OpusDecoder> opus_decoder{};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace ADSP
|
} // namespace ADSP
|
||||||
|
@ -14,12 +14,13 @@
|
|||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
|
|
||||||
MICROPROFILE_DEFINE(Audio_Renderer, "Audio", "DSP_AudioRenderer", MP_RGB(60, 19, 97));
|
MICROPROFILE_DEFINE(Audio_Renderer, "Audio", "DSP", MP_RGB(60, 19, 97));
|
||||||
|
|
||||||
namespace AudioCore::ADSP::AudioRenderer {
|
namespace AudioCore::ADSP::AudioRenderer {
|
||||||
|
|
||||||
AudioRenderer::AudioRenderer(Core::System& system_, Sink::Sink& sink_)
|
AudioRenderer::AudioRenderer(Core::System& system_, Core::Memory::Memory& memory_,
|
||||||
: system{system_}, sink{sink_} {}
|
Sink::Sink& sink_)
|
||||||
|
: system{system_}, memory{memory_}, sink{sink_} {}
|
||||||
|
|
||||||
AudioRenderer::~AudioRenderer() {
|
AudioRenderer::~AudioRenderer() {
|
||||||
Stop();
|
Stop();
|
||||||
@ -32,8 +33,8 @@ void AudioRenderer::Start() {
|
|||||||
|
|
||||||
main_thread = std::jthread([this](std::stop_token stop_token) { Main(stop_token); });
|
main_thread = std::jthread([this](std::stop_token stop_token) { Main(stop_token); });
|
||||||
|
|
||||||
mailbox.Send(Direction::DSP, Message::InitializeOK);
|
mailbox.Send(Direction::DSP, {Message::InitializeOK, {}});
|
||||||
if (mailbox.Receive(Direction::Host) != Message::InitializeOK) {
|
if (mailbox.Receive(Direction::Host).msg != Message::InitializeOK) {
|
||||||
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
||||||
"message response from ADSP!");
|
"message response from ADSP!");
|
||||||
return;
|
return;
|
||||||
@ -46,8 +47,8 @@ void AudioRenderer::Stop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mailbox.Send(Direction::DSP, Message::Shutdown);
|
mailbox.Send(Direction::DSP, {Message::Shutdown, {}});
|
||||||
if (mailbox.Receive(Direction::Host) != Message::Shutdown) {
|
if (mailbox.Receive(Direction::Host).msg != Message::Shutdown) {
|
||||||
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
||||||
"message response from ADSP!");
|
"message response from ADSP!");
|
||||||
}
|
}
|
||||||
@ -66,25 +67,25 @@ void AudioRenderer::Stop() {
|
|||||||
|
|
||||||
void AudioRenderer::Signal() {
|
void AudioRenderer::Signal() {
|
||||||
signalled_tick = system.CoreTiming().GetGlobalTimeNs().count();
|
signalled_tick = system.CoreTiming().GetGlobalTimeNs().count();
|
||||||
Send(Direction::DSP, Message::Render);
|
Send(Direction::DSP, {Message::Render, {}});
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::Wait() {
|
void AudioRenderer::Wait() {
|
||||||
auto msg = Receive(Direction::Host);
|
auto received = Receive(Direction::Host);
|
||||||
if (msg != Message::RenderResponse) {
|
if (received.msg != Message::RenderResponse) {
|
||||||
LOG_ERROR(Service_Audio,
|
LOG_ERROR(Service_Audio,
|
||||||
"Did not receive the expected render response from the AudioRenderer! Expected "
|
"Did not receive the expected render response from the AudioRenderer! Expected "
|
||||||
"{}, got {}",
|
"{}, got {}",
|
||||||
Message::RenderResponse, msg);
|
Message::RenderResponse, received.msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::Send(Direction dir, u32 message) {
|
void AudioRenderer::Send(Direction dir, MailboxMessage message) {
|
||||||
mailbox.Send(dir, std::move(message));
|
mailbox.Send(dir, std::move(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 AudioRenderer::Receive(Direction dir) {
|
MailboxMessage AudioRenderer::Receive(Direction dir, bool block) {
|
||||||
return mailbox.Receive(dir);
|
return mailbox.Receive(dir, block);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
void AudioRenderer::SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
||||||
@ -119,7 +120,7 @@ void AudioRenderer::CreateSinkStreams() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::Main(std::stop_token stop_token) {
|
void AudioRenderer::Main(std::stop_token stop_token) {
|
||||||
static constexpr char name[]{"DSP_AudioRenderer_Main"};
|
static constexpr char name[]{"AudioRenderer"};
|
||||||
MicroProfileOnThreadCreate(name);
|
MicroProfileOnThreadCreate(name);
|
||||||
Common::SetCurrentThreadName(name);
|
Common::SetCurrentThreadName(name);
|
||||||
Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
|
Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
|
||||||
@ -127,28 +128,28 @@ void AudioRenderer::Main(std::stop_token stop_token) {
|
|||||||
// TODO: Create buffer map/unmap thread + mailbox
|
// TODO: Create buffer map/unmap thread + mailbox
|
||||||
// TODO: Create gMix devices, initialize them here
|
// TODO: Create gMix devices, initialize them here
|
||||||
|
|
||||||
if (mailbox.Receive(Direction::DSP) != Message::InitializeOK) {
|
if (mailbox.Receive(Direction::DSP).msg != Message::InitializeOK) {
|
||||||
LOG_ERROR(Service_Audio,
|
LOG_ERROR(Service_Audio,
|
||||||
"ADSP Audio Renderer -- Failed to receive initialize message from host!");
|
"ADSP Audio Renderer -- Failed to receive initialize message from host!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mailbox.Send(Direction::Host, Message::InitializeOK);
|
mailbox.Send(Direction::Host, {Message::InitializeOK, {}});
|
||||||
|
|
||||||
// 0.12 seconds (2,304,000 / 19,200,000)
|
// 0.12 seconds (2,304,000 / 19,200,000)
|
||||||
constexpr u64 max_process_time{2'304'000ULL};
|
constexpr u64 max_process_time{2'304'000ULL};
|
||||||
|
|
||||||
while (!stop_token.stop_requested()) {
|
while (!stop_token.stop_requested()) {
|
||||||
auto msg{mailbox.Receive(Direction::DSP)};
|
auto received{mailbox.Receive(Direction::DSP)};
|
||||||
switch (msg) {
|
switch (received.msg) {
|
||||||
case Message::Shutdown:
|
case Message::Shutdown:
|
||||||
mailbox.Send(Direction::Host, Message::Shutdown);
|
mailbox.Send(Direction::Host, {Message::Shutdown, {}});
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case Message::Render: {
|
case Message::Render: {
|
||||||
if (system.IsShuttingDown()) [[unlikely]] {
|
if (system.IsShuttingDown()) [[unlikely]] {
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(5));
|
std::this_thread::sleep_for(std::chrono::milliseconds(5));
|
||||||
mailbox.Send(Direction::Host, Message::RenderResponse);
|
mailbox.Send(Direction::Host, {Message::RenderResponse, {}});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
std::array<bool, MaxRendererSessions> buffers_reset{};
|
std::array<bool, MaxRendererSessions> buffers_reset{};
|
||||||
@ -204,12 +205,13 @@ void AudioRenderer::Main(std::stop_token stop_token) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mailbox.Send(Direction::Host, Message::RenderResponse);
|
mailbox.Send(Direction::Host, {Message::RenderResponse, {}});
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
LOG_WARNING(Service_Audio,
|
LOG_WARNING(Service_Audio,
|
||||||
"ADSP AudioRenderer received an invalid message, msg={:02X}!", msg);
|
"ADSP AudioRenderer received an invalid message, msg={:02X}!",
|
||||||
|
received.msg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,13 @@
|
|||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class System;
|
class System;
|
||||||
|
namespace Timing {
|
||||||
|
struct EventType;
|
||||||
|
}
|
||||||
|
namespace Memory {
|
||||||
|
class Memory;
|
||||||
|
}
|
||||||
|
class System;
|
||||||
} // namespace Core
|
} // namespace Core
|
||||||
|
|
||||||
namespace AudioCore {
|
namespace AudioCore {
|
||||||
@ -27,19 +34,19 @@ class Sink;
|
|||||||
namespace ADSP::AudioRenderer {
|
namespace ADSP::AudioRenderer {
|
||||||
|
|
||||||
enum Message : u32 {
|
enum Message : u32 {
|
||||||
Invalid = 0,
|
Invalid = 0x00,
|
||||||
MapUnmap_Map = 1,
|
MapUnmap_Map = 0x01,
|
||||||
MapUnmap_MapResponse = 2,
|
MapUnmap_MapResponse = 0x02,
|
||||||
MapUnmap_Unmap = 3,
|
MapUnmap_Unmap = 0x03,
|
||||||
MapUnmap_UnmapResponse = 4,
|
MapUnmap_UnmapResponse = 0x04,
|
||||||
MapUnmap_InvalidateCache = 5,
|
MapUnmap_InvalidateCache = 0x05,
|
||||||
MapUnmap_InvalidateCacheResponse = 6,
|
MapUnmap_InvalidateCacheResponse = 0x06,
|
||||||
MapUnmap_Shutdown = 7,
|
MapUnmap_Shutdown = 0x07,
|
||||||
MapUnmap_ShutdownResponse = 8,
|
MapUnmap_ShutdownResponse = 0x08,
|
||||||
InitializeOK = 22,
|
InitializeOK = 0x16,
|
||||||
RenderResponse = 32,
|
RenderResponse = 0x20,
|
||||||
Render = 42,
|
Render = 0x2A,
|
||||||
Shutdown = 52,
|
Shutdown = 0x34,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,7 +54,7 @@ enum Message : u32 {
|
|||||||
*/
|
*/
|
||||||
class AudioRenderer {
|
class AudioRenderer {
|
||||||
public:
|
public:
|
||||||
explicit AudioRenderer(Core::System& system, Sink::Sink& sink);
|
explicit AudioRenderer(Core::System& system, Core::Memory::Memory& memory, Sink::Sink& sink);
|
||||||
~AudioRenderer();
|
~AudioRenderer();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,8 +72,8 @@ public:
|
|||||||
void Signal();
|
void Signal();
|
||||||
void Wait();
|
void Wait();
|
||||||
|
|
||||||
void Send(Direction dir, u32 message);
|
void Send(Direction dir, MailboxMessage message);
|
||||||
u32 Receive(Direction dir);
|
MailboxMessage Receive(Direction dir, bool block = true);
|
||||||
|
|
||||||
void SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
void SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
||||||
u64 applet_resource_user_id, bool reset) noexcept;
|
u64 applet_resource_user_id, bool reset) noexcept;
|
||||||
@ -87,7 +94,9 @@ private:
|
|||||||
|
|
||||||
/// Core system
|
/// Core system
|
||||||
Core::System& system;
|
Core::System& system;
|
||||||
/// The output sink the AudioRenderer will send samples to
|
/// Memory
|
||||||
|
Core::Memory::Memory& memory;
|
||||||
|
/// The output sink the AudioRenderer will use
|
||||||
Sink::Sink& sink;
|
Sink::Sink& sink;
|
||||||
/// The active mailbox
|
/// The active mailbox
|
||||||
Mailbox mailbox;
|
Mailbox mailbox;
|
||||||
@ -95,13 +104,11 @@ private:
|
|||||||
std::jthread main_thread{};
|
std::jthread main_thread{};
|
||||||
/// The current state
|
/// The current state
|
||||||
std::atomic<bool> running{};
|
std::atomic<bool> running{};
|
||||||
/// Shared memory of input command buffers, set by host, read by DSP
|
|
||||||
std::array<CommandBuffer, MaxRendererSessions> command_buffers{};
|
std::array<CommandBuffer, MaxRendererSessions> command_buffers{};
|
||||||
/// The command lists to process
|
/// The command lists to process
|
||||||
std::array<CommandListProcessor, MaxRendererSessions> command_list_processors{};
|
std::array<CommandListProcessor, MaxRendererSessions> command_list_processors{};
|
||||||
/// The streams which will receive the processed samples
|
/// The streams which will receive the processed samples
|
||||||
std::array<Sink::SinkStream*, MaxRendererSessions> streams{};
|
std::array<Sink::SinkStream*, MaxRendererSessions> streams{};
|
||||||
/// CPU Tick when the DSP was signalled to process, uses time rather than tick
|
|
||||||
u64 signalled_tick{0};
|
u64 signalled_tick{0};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,107 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decode_object.h"
|
|
||||||
#include "common/assert.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
namespace {
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
u32 OpusDecodeObject::GetWorkBufferSize(u32 channel_count) {
|
|
||||||
if (!IsValidChannelCount(channel_count)) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return static_cast<u32>(sizeof(OpusDecodeObject)) + opus_decoder_get_size(channel_count);
|
|
||||||
}
|
|
||||||
|
|
||||||
OpusDecodeObject& OpusDecodeObject::Initialize(u64 buffer, u64 buffer2) {
|
|
||||||
auto* new_decoder = reinterpret_cast<OpusDecodeObject*>(buffer);
|
|
||||||
auto* comparison = reinterpret_cast<OpusDecodeObject*>(buffer2);
|
|
||||||
|
|
||||||
if (new_decoder->magic == DecodeObjectMagic) {
|
|
||||||
if (!new_decoder->initialized ||
|
|
||||||
(new_decoder->initialized && new_decoder->self == comparison)) {
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
new_decoder->initialized = false;
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
return *new_decoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::InitializeDecoder(u32 sample_rate, u32 channel_count) {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unfortunately libopus does not expose the OpusDecoder struct publicly, so we can't include
|
|
||||||
// it in this class. Nintendo does not allocate memory, which is why we have a workbuffer
|
|
||||||
// provided.
|
|
||||||
// We could use _create and have libopus allocate it for us, but then we have to separately
|
|
||||||
// track which decoder is being used between this and multistream in order to call the correct
|
|
||||||
// destroy from the host side.
|
|
||||||
// This is a bit cringe, but is safe as these objects are only ever initialized inside the given
|
|
||||||
// workbuffer, and GetWorkBufferSize will guarantee there's enough space to follow.
|
|
||||||
decoder = (LibOpusDecoder*)(this + 1);
|
|
||||||
s32 ret = opus_decoder_init(decoder, sample_rate, channel_count);
|
|
||||||
if (ret == OPUS_OK) {
|
|
||||||
magic = DecodeObjectMagic;
|
|
||||||
initialized = true;
|
|
||||||
state_valid = true;
|
|
||||||
self = this;
|
|
||||||
final_range = 0;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::Shutdown() {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
magic = 0x0;
|
|
||||||
initialized = false;
|
|
||||||
state_valid = false;
|
|
||||||
self = nullptr;
|
|
||||||
final_range = 0;
|
|
||||||
decoder = nullptr;
|
|
||||||
}
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::ResetDecoder() {
|
|
||||||
return opus_decoder_ctl(decoder, OPUS_RESET_STATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::Decode(u32& out_sample_count, u64 output_data, u64 output_data_size,
|
|
||||||
u64 input_data, u64 input_data_size) {
|
|
||||||
ASSERT(initialized);
|
|
||||||
out_sample_count = 0;
|
|
||||||
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto ret_code_or_samples = opus_decode(
|
|
||||||
decoder, reinterpret_cast<const u8*>(input_data), static_cast<opus_int32>(input_data_size),
|
|
||||||
reinterpret_cast<opus_int16*>(output_data), static_cast<opus_int32>(output_data_size), 0);
|
|
||||||
|
|
||||||
if (ret_code_or_samples < OPUS_OK) {
|
|
||||||
return ret_code_or_samples;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_sample_count = ret_code_or_samples;
|
|
||||||
return opus_decoder_ctl(decoder, OPUS_GET_FINAL_RANGE_REQUEST, &final_range);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,38 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <opus.h>
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
using LibOpusDecoder = ::OpusDecoder;
|
|
||||||
static constexpr u32 DecodeObjectMagic = 0xDEADBEEF;
|
|
||||||
|
|
||||||
class OpusDecodeObject {
|
|
||||||
public:
|
|
||||||
static u32 GetWorkBufferSize(u32 channel_count);
|
|
||||||
static OpusDecodeObject& Initialize(u64 buffer, u64 buffer2);
|
|
||||||
|
|
||||||
s32 InitializeDecoder(u32 sample_rate, u32 channel_count);
|
|
||||||
s32 Shutdown();
|
|
||||||
s32 ResetDecoder();
|
|
||||||
s32 Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data,
|
|
||||||
u64 input_data_size);
|
|
||||||
u32 GetFinalRange() const noexcept {
|
|
||||||
return final_range;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
u32 magic;
|
|
||||||
bool initialized;
|
|
||||||
bool state_valid;
|
|
||||||
OpusDecodeObject* self;
|
|
||||||
u32 final_range;
|
|
||||||
LibOpusDecoder* decoder;
|
|
||||||
};
|
|
||||||
static_assert(std::is_trivially_constructible_v<OpusDecodeObject>);
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,269 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <chrono>
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decode_object.h"
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
|
|
||||||
#include "audio_core/adsp/apps/opus/shared_memory.h"
|
|
||||||
#include "audio_core/audio_core.h"
|
|
||||||
#include "audio_core/common/common.h"
|
|
||||||
#include "common/logging/log.h"
|
|
||||||
#include "common/microprofile.h"
|
|
||||||
#include "common/thread.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
#include "core/core_timing.h"
|
|
||||||
|
|
||||||
MICROPROFILE_DEFINE(OpusDecoder, "Audio", "DSP_OpusDecoder", MP_RGB(60, 19, 97));
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
constexpr size_t OpusStreamCountMax = 255;
|
|
||||||
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidMultiStreamChannelCount(u32 channel_count) {
|
|
||||||
return channel_count <= OpusStreamCountMax;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidMultiStreamStreamCounts(s32 total_stream_count, s32 sterero_stream_count) {
|
|
||||||
return IsValidMultiStreamChannelCount(total_stream_count) && total_stream_count > 0 &&
|
|
||||||
sterero_stream_count > 0 && sterero_stream_count <= total_stream_count;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
OpusDecoder::OpusDecoder(Core::System& system_) : system{system_} {
|
|
||||||
init_thread = std::jthread([this](std::stop_token stop_token) { Init(stop_token); });
|
|
||||||
}
|
|
||||||
|
|
||||||
OpusDecoder::~OpusDecoder() {
|
|
||||||
if (!running) {
|
|
||||||
init_thread.request_stop();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shutdown the thread
|
|
||||||
Send(Direction::DSP, Message::Shutdown);
|
|
||||||
auto msg = Receive(Direction::Host);
|
|
||||||
ASSERT_MSG(msg == Message::ShutdownOK, "Expected Opus shutdown code {}, got {}",
|
|
||||||
Message::ShutdownOK, msg);
|
|
||||||
main_thread.request_stop();
|
|
||||||
main_thread.join();
|
|
||||||
running = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpusDecoder::Send(Direction dir, u32 message) {
|
|
||||||
mailbox.Send(dir, std::move(message));
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 OpusDecoder::Receive(Direction dir, std::stop_token stop_token) {
|
|
||||||
return mailbox.Receive(dir, stop_token);
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpusDecoder::Init(std::stop_token stop_token) {
|
|
||||||
Common::SetCurrentThreadName("DSP_OpusDecoder_Init");
|
|
||||||
|
|
||||||
if (Receive(Direction::DSP, stop_token) != Message::Start) {
|
|
||||||
LOG_ERROR(Service_Audio,
|
|
||||||
"DSP OpusDecoder failed to receive Start message. Opus initialization failed.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
main_thread = std::jthread([this](std::stop_token st) { Main(st); });
|
|
||||||
running = true;
|
|
||||||
Send(Direction::Host, Message::StartOK);
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpusDecoder::Main(std::stop_token stop_token) {
|
|
||||||
Common::SetCurrentThreadName("DSP_OpusDecoder_Main");
|
|
||||||
|
|
||||||
while (!stop_token.stop_requested()) {
|
|
||||||
auto msg = Receive(Direction::DSP, stop_token);
|
|
||||||
switch (msg) {
|
|
||||||
case Shutdown:
|
|
||||||
Send(Direction::Host, Message::ShutdownOK);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case GetWorkBufferSize: {
|
|
||||||
auto channel_count = static_cast<s32>(shared_memory->host_send_data[0]);
|
|
||||||
|
|
||||||
ASSERT(IsValidChannelCount(channel_count));
|
|
||||||
|
|
||||||
shared_memory->dsp_return_data[0] = OpusDecodeObject::GetWorkBufferSize(channel_count);
|
|
||||||
Send(Direction::Host, Message::GetWorkBufferSizeOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case InitializeDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
auto sample_rate = static_cast<s32>(shared_memory->host_send_data[2]);
|
|
||||||
auto channel_count = static_cast<s32>(shared_memory->host_send_data[3]);
|
|
||||||
|
|
||||||
ASSERT(sample_rate >= 0);
|
|
||||||
ASSERT(IsValidChannelCount(channel_count));
|
|
||||||
ASSERT(buffer_size >= OpusDecodeObject::GetWorkBufferSize(channel_count));
|
|
||||||
|
|
||||||
auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] =
|
|
||||||
decoder_object.InitializeDecoder(sample_rate, channel_count);
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::InitializeDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case ShutdownDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
|
|
||||||
auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] = decoder_object.Shutdown();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::ShutdownDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case DecodeInterleaved: {
|
|
||||||
auto start_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto input_data = shared_memory->host_send_data[1];
|
|
||||||
auto input_data_size = shared_memory->host_send_data[2];
|
|
||||||
auto output_data = shared_memory->host_send_data[3];
|
|
||||||
auto output_data_size = shared_memory->host_send_data[4];
|
|
||||||
auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
|
|
||||||
auto reset_requested = shared_memory->host_send_data[6];
|
|
||||||
|
|
||||||
u32 decoded_samples{0};
|
|
||||||
|
|
||||||
auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
|
|
||||||
s32 error_code{OPUS_OK};
|
|
||||||
if (reset_requested) {
|
|
||||||
error_code = decoder_object.ResetDecoder();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
error_code = decoder_object.Decode(decoded_samples, output_data, output_data_size,
|
|
||||||
input_data, input_data_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
if (final_range && decoder_object.GetFinalRange() != final_range) {
|
|
||||||
error_code = OPUS_INVALID_PACKET;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto end_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
shared_memory->dsp_return_data[0] = error_code;
|
|
||||||
shared_memory->dsp_return_data[1] = decoded_samples;
|
|
||||||
shared_memory->dsp_return_data[2] = (end_time - start_time).count();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::DecodeInterleavedOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case MapMemory: {
|
|
||||||
[[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
Send(Direction::Host, Message::MapMemoryOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case UnmapMemory: {
|
|
||||||
[[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
Send(Direction::Host, Message::UnmapMemoryOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case GetWorkBufferSizeForMultiStream: {
|
|
||||||
auto total_stream_count = static_cast<s32>(shared_memory->host_send_data[0]);
|
|
||||||
auto stereo_stream_count = static_cast<s32>(shared_memory->host_send_data[1]);
|
|
||||||
|
|
||||||
ASSERT(IsValidMultiStreamStreamCounts(total_stream_count, stereo_stream_count));
|
|
||||||
|
|
||||||
shared_memory->dsp_return_data[0] = OpusMultiStreamDecodeObject::GetWorkBufferSize(
|
|
||||||
total_stream_count, stereo_stream_count);
|
|
||||||
Send(Direction::Host, Message::GetWorkBufferSizeForMultiStreamOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case InitializeMultiStreamDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
auto sample_rate = static_cast<s32>(shared_memory->host_send_data[2]);
|
|
||||||
auto channel_count = static_cast<s32>(shared_memory->host_send_data[3]);
|
|
||||||
auto total_stream_count = static_cast<s32>(shared_memory->host_send_data[4]);
|
|
||||||
auto stereo_stream_count = static_cast<s32>(shared_memory->host_send_data[5]);
|
|
||||||
// Nintendo seem to have a bug here, they try to use &host_send_data[6] for the channel
|
|
||||||
// mappings, but [6] is never set, and there is not enough room in the argument data for
|
|
||||||
// more than 40 channels, when 255 are possible.
|
|
||||||
// It also means the mapping values are undefined, though likely always 0,
|
|
||||||
// and the mappings given by the game are ignored. The mappings are copied to this
|
|
||||||
// dedicated buffer host side, so let's do as intended.
|
|
||||||
auto mappings = shared_memory->channel_mapping.data();
|
|
||||||
|
|
||||||
ASSERT(IsValidMultiStreamStreamCounts(total_stream_count, stereo_stream_count));
|
|
||||||
ASSERT(sample_rate >= 0);
|
|
||||||
ASSERT(buffer_size >= OpusMultiStreamDecodeObject::GetWorkBufferSize(
|
|
||||||
total_stream_count, stereo_stream_count));
|
|
||||||
|
|
||||||
auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] = decoder_object.InitializeDecoder(
|
|
||||||
sample_rate, total_stream_count, channel_count, stereo_stream_count, mappings);
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::InitializeMultiStreamDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case ShutdownMultiStreamDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
|
|
||||||
auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] = decoder_object.Shutdown();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::ShutdownMultiStreamDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case DecodeInterleavedForMultiStream: {
|
|
||||||
auto start_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto input_data = shared_memory->host_send_data[1];
|
|
||||||
auto input_data_size = shared_memory->host_send_data[2];
|
|
||||||
auto output_data = shared_memory->host_send_data[3];
|
|
||||||
auto output_data_size = shared_memory->host_send_data[4];
|
|
||||||
auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
|
|
||||||
auto reset_requested = shared_memory->host_send_data[6];
|
|
||||||
|
|
||||||
u32 decoded_samples{0};
|
|
||||||
|
|
||||||
auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
|
|
||||||
s32 error_code{OPUS_OK};
|
|
||||||
if (reset_requested) {
|
|
||||||
error_code = decoder_object.ResetDecoder();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
error_code = decoder_object.Decode(decoded_samples, output_data, output_data_size,
|
|
||||||
input_data, input_data_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
if (final_range && decoder_object.GetFinalRange() != final_range) {
|
|
||||||
error_code = OPUS_INVALID_PACKET;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto end_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
shared_memory->dsp_return_data[0] = error_code;
|
|
||||||
shared_memory->dsp_return_data[1] = decoded_samples;
|
|
||||||
shared_memory->dsp_return_data[2] = (end_time - start_time).count();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::DecodeInterleavedForMultiStreamOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
LOG_ERROR(Service_Audio, "Invalid OpusDecoder command {}", msg);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,92 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <thread>
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/shared_memory.h"
|
|
||||||
#include "audio_core/adsp/mailbox.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
class System;
|
|
||||||
} // namespace Core
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
enum Message : u32 {
|
|
||||||
Invalid = 0,
|
|
||||||
Start = 1,
|
|
||||||
Shutdown = 2,
|
|
||||||
StartOK = 11,
|
|
||||||
ShutdownOK = 12,
|
|
||||||
GetWorkBufferSize = 21,
|
|
||||||
InitializeDecodeObject = 22,
|
|
||||||
ShutdownDecodeObject = 23,
|
|
||||||
DecodeInterleaved = 24,
|
|
||||||
MapMemory = 25,
|
|
||||||
UnmapMemory = 26,
|
|
||||||
GetWorkBufferSizeForMultiStream = 27,
|
|
||||||
InitializeMultiStreamDecodeObject = 28,
|
|
||||||
ShutdownMultiStreamDecodeObject = 29,
|
|
||||||
DecodeInterleavedForMultiStream = 30,
|
|
||||||
|
|
||||||
GetWorkBufferSizeOK = 41,
|
|
||||||
InitializeDecodeObjectOK = 42,
|
|
||||||
ShutdownDecodeObjectOK = 43,
|
|
||||||
DecodeInterleavedOK = 44,
|
|
||||||
MapMemoryOK = 45,
|
|
||||||
UnmapMemoryOK = 46,
|
|
||||||
GetWorkBufferSizeForMultiStreamOK = 47,
|
|
||||||
InitializeMultiStreamDecodeObjectOK = 48,
|
|
||||||
ShutdownMultiStreamDecodeObjectOK = 49,
|
|
||||||
DecodeInterleavedForMultiStreamOK = 50,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The AudioRenderer application running on the ADSP.
|
|
||||||
*/
|
|
||||||
class OpusDecoder {
|
|
||||||
public:
|
|
||||||
explicit OpusDecoder(Core::System& system);
|
|
||||||
~OpusDecoder();
|
|
||||||
|
|
||||||
bool IsRunning() const noexcept {
|
|
||||||
return running;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Send(Direction dir, u32 message);
|
|
||||||
u32 Receive(Direction dir, std::stop_token stop_token = {});
|
|
||||||
|
|
||||||
void SetSharedMemory(SharedMemory& shared_memory_) {
|
|
||||||
shared_memory = &shared_memory_;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
/**
|
|
||||||
* Initializing thread, launched at audio_core boot to avoid blocking the main emu boot thread.
|
|
||||||
*/
|
|
||||||
void Init(std::stop_token stop_token);
|
|
||||||
/**
|
|
||||||
* Main OpusDecoder thread, responsible for processing the incoming Opus packets.
|
|
||||||
*/
|
|
||||||
void Main(std::stop_token stop_token);
|
|
||||||
|
|
||||||
/// Core system
|
|
||||||
Core::System& system;
|
|
||||||
/// Mailbox to communicate messages with the host, drives the main thread
|
|
||||||
Mailbox mailbox;
|
|
||||||
/// Init thread
|
|
||||||
std::jthread init_thread{};
|
|
||||||
/// Main thread
|
|
||||||
std::jthread main_thread{};
|
|
||||||
/// The current state
|
|
||||||
bool running{};
|
|
||||||
/// Structure shared with the host, input data set by the host before sending a mailbox message,
|
|
||||||
/// and the responses are written back by the OpusDecoder.
|
|
||||||
SharedMemory* shared_memory{};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,111 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
|
|
||||||
#include "common/assert.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) {
|
|
||||||
return total_stream_count > 0 && stereo_stream_count > 0 &&
|
|
||||||
stereo_stream_count <= total_stream_count && IsValidChannelCount(total_stream_count);
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
u32 OpusMultiStreamDecodeObject::GetWorkBufferSize(u32 total_stream_count,
|
|
||||||
u32 stereo_stream_count) {
|
|
||||||
if (IsValidStreamCounts(total_stream_count, stereo_stream_count)) {
|
|
||||||
return static_cast<u32>(sizeof(OpusMultiStreamDecodeObject)) +
|
|
||||||
opus_multistream_decoder_get_size(total_stream_count, stereo_stream_count);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
OpusMultiStreamDecodeObject& OpusMultiStreamDecodeObject::Initialize(u64 buffer, u64 buffer2) {
|
|
||||||
auto* new_decoder = reinterpret_cast<OpusMultiStreamDecodeObject*>(buffer);
|
|
||||||
auto* comparison = reinterpret_cast<OpusMultiStreamDecodeObject*>(buffer2);
|
|
||||||
|
|
||||||
if (new_decoder->magic == DecodeMultiStreamObjectMagic) {
|
|
||||||
if (!new_decoder->initialized ||
|
|
||||||
(new_decoder->initialized && new_decoder->self == comparison)) {
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
new_decoder->initialized = false;
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
return *new_decoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::InitializeDecoder(u32 sample_rate, u32 total_stream_count,
|
|
||||||
u32 channel_count, u32 stereo_stream_count,
|
|
||||||
u8* mappings) {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See OpusDecodeObject::InitializeDecoder for an explanation of this
|
|
||||||
decoder = (LibOpusMSDecoder*)(this + 1);
|
|
||||||
s32 ret = opus_multistream_decoder_init(decoder, sample_rate, channel_count, total_stream_count,
|
|
||||||
stereo_stream_count, mappings);
|
|
||||||
if (ret == OPUS_OK) {
|
|
||||||
magic = DecodeMultiStreamObjectMagic;
|
|
||||||
initialized = true;
|
|
||||||
state_valid = true;
|
|
||||||
self = this;
|
|
||||||
final_range = 0;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::Shutdown() {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
magic = 0x0;
|
|
||||||
initialized = false;
|
|
||||||
state_valid = false;
|
|
||||||
self = nullptr;
|
|
||||||
final_range = 0;
|
|
||||||
decoder = nullptr;
|
|
||||||
}
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::ResetDecoder() {
|
|
||||||
return opus_multistream_decoder_ctl(decoder, OPUS_RESET_STATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::Decode(u32& out_sample_count, u64 output_data,
|
|
||||||
u64 output_data_size, u64 input_data, u64 input_data_size) {
|
|
||||||
ASSERT(initialized);
|
|
||||||
out_sample_count = 0;
|
|
||||||
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto ret_code_or_samples = opus_multistream_decode(
|
|
||||||
decoder, reinterpret_cast<const u8*>(input_data), static_cast<opus_int32>(input_data_size),
|
|
||||||
reinterpret_cast<opus_int16*>(output_data), static_cast<opus_int32>(output_data_size), 0);
|
|
||||||
|
|
||||||
if (ret_code_or_samples < OPUS_OK) {
|
|
||||||
return ret_code_or_samples;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_sample_count = ret_code_or_samples;
|
|
||||||
return opus_multistream_decoder_ctl(decoder, OPUS_GET_FINAL_RANGE_REQUEST, &final_range);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,39 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <opus_multistream.h>
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
using LibOpusMSDecoder = ::OpusMSDecoder;
|
|
||||||
static constexpr u32 DecodeMultiStreamObjectMagic = 0xDEADBEEF;
|
|
||||||
|
|
||||||
class OpusMultiStreamDecodeObject {
|
|
||||||
public:
|
|
||||||
static u32 GetWorkBufferSize(u32 total_stream_count, u32 stereo_stream_count);
|
|
||||||
static OpusMultiStreamDecodeObject& Initialize(u64 buffer, u64 buffer2);
|
|
||||||
|
|
||||||
s32 InitializeDecoder(u32 sample_rate, u32 total_stream_count, u32 channel_count,
|
|
||||||
u32 stereo_stream_count, u8* mappings);
|
|
||||||
s32 Shutdown();
|
|
||||||
s32 ResetDecoder();
|
|
||||||
s32 Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data,
|
|
||||||
u64 input_data_size);
|
|
||||||
u32 GetFinalRange() const noexcept {
|
|
||||||
return final_range;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
u32 magic;
|
|
||||||
bool initialized;
|
|
||||||
bool state_valid;
|
|
||||||
OpusMultiStreamDecodeObject* self;
|
|
||||||
u32 final_range;
|
|
||||||
LibOpusMSDecoder* decoder;
|
|
||||||
};
|
|
||||||
static_assert(std::is_trivially_constructible_v<OpusMultiStreamDecodeObject>);
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,17 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/common_funcs.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
struct SharedMemory {
|
|
||||||
std::array<u8, 0x100> channel_mapping{};
|
|
||||||
std::array<u64, 16> host_send_data{};
|
|
||||||
std::array<u64, 16> dsp_return_data{};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -3,8 +3,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <span>
|
|
||||||
|
|
||||||
#include "common/bounded_threadsafe_queue.h"
|
#include "common/bounded_threadsafe_queue.h"
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
@ -21,6 +19,11 @@ enum class Direction : u32 {
|
|||||||
DSP,
|
DSP,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct MailboxMessage {
|
||||||
|
u32 msg;
|
||||||
|
std::span<u8> data;
|
||||||
|
};
|
||||||
|
|
||||||
class Mailbox {
|
class Mailbox {
|
||||||
public:
|
public:
|
||||||
void Initialize(AppMailboxId id_) {
|
void Initialize(AppMailboxId id_) {
|
||||||
@ -32,19 +35,25 @@ public:
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Send(Direction dir, u32 message) {
|
void Send(Direction dir, MailboxMessage&& message) {
|
||||||
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
||||||
queue.EmplaceWait(message);
|
queue.EmplaceWait(std::move(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Receive(Direction dir, std::stop_token stop_token = {}) {
|
MailboxMessage Receive(Direction dir, bool block = true) {
|
||||||
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
||||||
return queue.PopWait(stop_token);
|
MailboxMessage t;
|
||||||
|
if (block) {
|
||||||
|
queue.PopWait(t);
|
||||||
|
} else {
|
||||||
|
queue.TryPop(t);
|
||||||
|
}
|
||||||
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Reset() {
|
void Reset() {
|
||||||
id = AppMailboxId::Invalid;
|
id = AppMailboxId::Invalid;
|
||||||
u32 t{};
|
MailboxMessage t;
|
||||||
while (host_queue.TryPop(t)) {
|
while (host_queue.TryPop(t)) {
|
||||||
}
|
}
|
||||||
while (adsp_queue.TryPop(t)) {
|
while (adsp_queue.TryPop(t)) {
|
||||||
@ -53,8 +62,8 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
AppMailboxId id{0};
|
AppMailboxId id{0};
|
||||||
Common::SPSCQueue<u32> host_queue;
|
Common::SPSCQueue<MailboxMessage> host_queue;
|
||||||
Common::SPSCQueue<u32> adsp_queue;
|
Common::SPSCQueue<MailboxMessage> adsp_queue;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP
|
} // namespace AudioCore::ADSP
|
||||||
|
@ -1,179 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/opus/decoder.h"
|
|
||||||
#include "audio_core/opus/hardware_opus.h"
|
|
||||||
#include "audio_core/opus/parameters.h"
|
|
||||||
#include "common/alignment.h"
|
|
||||||
#include "common/swap.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
using namespace Service::Audio;
|
|
||||||
namespace {
|
|
||||||
OpusPacketHeader ReverseHeader(OpusPacketHeader header) {
|
|
||||||
OpusPacketHeader out;
|
|
||||||
out.size = Common::swap32(header.size);
|
|
||||||
out.final_range = Common::swap32(header.final_range);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
OpusDecoder::OpusDecoder(Core::System& system_, HardwareOpus& hardware_opus_)
|
|
||||||
: system{system_}, hardware_opus{hardware_opus_} {}
|
|
||||||
|
|
||||||
OpusDecoder::~OpusDecoder() {
|
|
||||||
if (decode_object_initialized) {
|
|
||||||
hardware_opus.ShutdownDecodeObject(shared_buffer.get(), shared_buffer_size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size) {
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
shared_buffer_size = transfer_memory_size;
|
|
||||||
shared_buffer = std::make_unique<u8[]>(shared_buffer_size);
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
|
|
||||||
buffer_size =
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 16);
|
|
||||||
|
|
||||||
out_data = {shared_buffer.get() + shared_buffer_size - buffer_size, buffer_size};
|
|
||||||
size_t in_data_size{0x600u};
|
|
||||||
in_data = {out_data.data() - in_data_size, in_data_size};
|
|
||||||
|
|
||||||
ON_RESULT_FAILURE {
|
|
||||||
if (shared_memory_mapped) {
|
|
||||||
shared_memory_mapped = false;
|
|
||||||
ASSERT(R_SUCCEEDED(hardware_opus.UnmapMemory(shared_buffer.get(), shared_buffer_size)));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.InitializeDecodeObject(params.sample_rate, params.channel_count,
|
|
||||||
shared_buffer.get(), shared_buffer_size));
|
|
||||||
|
|
||||||
sample_rate = params.sample_rate;
|
|
||||||
channel_count = params.channel_count;
|
|
||||||
use_large_frame_size = params.use_large_frame_size;
|
|
||||||
decode_object_initialized = true;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::Initialize(OpusMultiStreamParametersEx& params,
|
|
||||||
Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size) {
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
shared_buffer_size = transfer_memory_size;
|
|
||||||
shared_buffer = std::make_unique<u8[]>(shared_buffer_size);
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
|
|
||||||
buffer_size =
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 16);
|
|
||||||
|
|
||||||
out_data = {shared_buffer.get() + shared_buffer_size - buffer_size, buffer_size};
|
|
||||||
size_t in_data_size{Common::AlignUp(1500ull * params.total_stream_count, 64u)};
|
|
||||||
in_data = {out_data.data() - in_data_size, in_data_size};
|
|
||||||
|
|
||||||
ON_RESULT_FAILURE {
|
|
||||||
if (shared_memory_mapped) {
|
|
||||||
shared_memory_mapped = false;
|
|
||||||
ASSERT(R_SUCCEEDED(hardware_opus.UnmapMemory(shared_buffer.get(), shared_buffer_size)));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.InitializeMultiStreamDecodeObject(
|
|
||||||
params.sample_rate, params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count, params.mappings.data(), shared_buffer.get(),
|
|
||||||
shared_buffer_size));
|
|
||||||
|
|
||||||
sample_rate = params.sample_rate;
|
|
||||||
channel_count = params.channel_count;
|
|
||||||
total_stream_count = params.total_stream_count;
|
|
||||||
stereo_stream_count = params.stereo_stream_count;
|
|
||||||
use_large_frame_size = params.use_large_frame_size;
|
|
||||||
decode_object_initialized = true;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::DecodeInterleaved(u32* out_data_size, u64* out_time_taken,
|
|
||||||
u32* out_sample_count, std::span<const u8> input_data,
|
|
||||||
std::span<u8> output_data, bool reset) {
|
|
||||||
u32 out_samples;
|
|
||||||
u64 time_taken{};
|
|
||||||
|
|
||||||
R_UNLESS(input_data.size_bytes() > sizeof(OpusPacketHeader), ResultInputDataTooSmall);
|
|
||||||
|
|
||||||
auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
|
|
||||||
OpusPacketHeader header{ReverseHeader(*header_p)};
|
|
||||||
|
|
||||||
R_UNLESS(in_data.size_bytes() >= header.size &&
|
|
||||||
header.size + sizeof(OpusPacketHeader) <= input_data.size_bytes(),
|
|
||||||
ResultBufferTooSmall);
|
|
||||||
|
|
||||||
if (!shared_memory_mapped) {
|
|
||||||
R_TRY(hardware_opus.MapMemory(shared_buffer.get(), shared_buffer_size));
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::memcpy(in_data.data(), input_data.data() + sizeof(OpusPacketHeader), header.size);
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.DecodeInterleaved(out_samples, out_data.data(), out_data.size_bytes(),
|
|
||||||
channel_count, in_data.data(), header.size,
|
|
||||||
shared_buffer.get(), time_taken, reset));
|
|
||||||
|
|
||||||
std::memcpy(output_data.data(), out_data.data(), out_samples * channel_count * sizeof(s16));
|
|
||||||
|
|
||||||
*out_data_size = header.size + sizeof(OpusPacketHeader);
|
|
||||||
*out_sample_count = out_samples;
|
|
||||||
if (out_time_taken) {
|
|
||||||
*out_time_taken = time_taken / 1000;
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::SetContext([[maybe_unused]] std::span<const u8> context) {
|
|
||||||
R_SUCCEED_IF(shared_memory_mapped);
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
R_RETURN(hardware_opus.MapMemory(shared_buffer.get(), shared_buffer_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::DecodeInterleavedForMultiStream(u32* out_data_size, u64* out_time_taken,
|
|
||||||
u32* out_sample_count,
|
|
||||||
std::span<const u8> input_data,
|
|
||||||
std::span<u8> output_data, bool reset) {
|
|
||||||
u32 out_samples;
|
|
||||||
u64 time_taken{};
|
|
||||||
|
|
||||||
R_UNLESS(input_data.size_bytes() > sizeof(OpusPacketHeader), ResultInputDataTooSmall);
|
|
||||||
|
|
||||||
auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
|
|
||||||
OpusPacketHeader header{ReverseHeader(*header_p)};
|
|
||||||
|
|
||||||
LOG_ERROR(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
|
|
||||||
header.size, input_data.size_bytes(), in_data.size_bytes());
|
|
||||||
|
|
||||||
R_UNLESS(in_data.size_bytes() >= header.size &&
|
|
||||||
header.size + sizeof(OpusPacketHeader) <= input_data.size_bytes(),
|
|
||||||
ResultBufferTooSmall);
|
|
||||||
|
|
||||||
if (!shared_memory_mapped) {
|
|
||||||
R_TRY(hardware_opus.MapMemory(shared_buffer.get(), shared_buffer_size));
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::memcpy(in_data.data(), input_data.data() + sizeof(OpusPacketHeader), header.size);
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.DecodeInterleavedForMultiStream(
|
|
||||||
out_samples, out_data.data(), out_data.size_bytes(), channel_count, in_data.data(),
|
|
||||||
header.size, shared_buffer.get(), time_taken, reset));
|
|
||||||
|
|
||||||
std::memcpy(output_data.data(), out_data.data(), out_samples * channel_count * sizeof(s16));
|
|
||||||
|
|
||||||
*out_data_size = header.size + sizeof(OpusPacketHeader);
|
|
||||||
*out_sample_count = out_samples;
|
|
||||||
if (out_time_taken) {
|
|
||||||
*out_time_taken = time_taken / 1000;
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,53 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <span>
|
|
||||||
|
|
||||||
#include "audio_core/opus/parameters.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
#include "core/hle/kernel/k_transfer_memory.h"
|
|
||||||
#include "core/hle/service/audio/errors.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
class System;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
class HardwareOpus;
|
|
||||||
|
|
||||||
class OpusDecoder {
|
|
||||||
public:
|
|
||||||
explicit OpusDecoder(Core::System& system, HardwareOpus& hardware_opus_);
|
|
||||||
~OpusDecoder();
|
|
||||||
|
|
||||||
Result Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size);
|
|
||||||
Result Initialize(OpusMultiStreamParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size);
|
|
||||||
Result DecodeInterleaved(u32* out_data_size, u64* out_time_taken, u32* out_sample_count,
|
|
||||||
std::span<const u8> input_data, std::span<u8> output_data, bool reset);
|
|
||||||
Result SetContext([[maybe_unused]] std::span<const u8> context);
|
|
||||||
Result DecodeInterleavedForMultiStream(u32* out_data_size, u64* out_time_taken,
|
|
||||||
u32* out_sample_count, std::span<const u8> input_data,
|
|
||||||
std::span<u8> output_data, bool reset);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Core::System& system;
|
|
||||||
HardwareOpus& hardware_opus;
|
|
||||||
std::unique_ptr<u8[]> shared_buffer{};
|
|
||||||
u64 shared_buffer_size;
|
|
||||||
std::span<u8> in_data{};
|
|
||||||
std::span<u8> out_data{};
|
|
||||||
u64 buffer_size{};
|
|
||||||
s32 sample_rate{};
|
|
||||||
s32 channel_count{};
|
|
||||||
bool use_large_frame_size{false};
|
|
||||||
s32 total_stream_count{};
|
|
||||||
s32 stereo_stream_count{};
|
|
||||||
bool shared_memory_mapped{false};
|
|
||||||
bool decode_object_initialized{false};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,102 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decoder.h"
|
|
||||||
#include "audio_core/opus/decoder_manager.h"
|
|
||||||
#include "common/alignment.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
using namespace Service::Audio;
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidMultiStreamChannelCount(u32 channel_count) {
|
|
||||||
return channel_count > 0 && channel_count <= OpusStreamCountMax;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidSampleRate(u32 sample_rate) {
|
|
||||||
return sample_rate == 8'000 || sample_rate == 12'000 || sample_rate == 16'000 ||
|
|
||||||
sample_rate == 24'000 || sample_rate == 48'000;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidStreamCount(u32 channel_count, u32 total_stream_count, u32 stereo_stream_count) {
|
|
||||||
return total_stream_count > 0 && stereo_stream_count > 0 &&
|
|
||||||
stereo_stream_count <= total_stream_count &&
|
|
||||||
total_stream_count + stereo_stream_count <= channel_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
OpusDecoderManager::OpusDecoderManager(Core::System& system_)
|
|
||||||
: system{system_}, hardware_opus{system} {
|
|
||||||
for (u32 i = 0; i < MaxChannels; i++) {
|
|
||||||
required_workbuffer_sizes[i] = hardware_opus.GetWorkBufferSize(1 + i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSize(OpusParameters& params, u64& out_size) {
|
|
||||||
OpusParametersEx ex{
|
|
||||||
.sample_rate = params.sample_rate,
|
|
||||||
.channel_count = params.channel_count,
|
|
||||||
.use_large_frame_size = false,
|
|
||||||
};
|
|
||||||
R_RETURN(GetWorkBufferSizeExEx(ex, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeEx(OpusParametersEx& params, u64& out_size) {
|
|
||||||
R_RETURN(GetWorkBufferSizeExEx(params, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeExEx(OpusParametersEx& params, u64& out_size) {
|
|
||||||
R_UNLESS(IsValidChannelCount(params.channel_count), ResultInvalidOpusChannelCount);
|
|
||||||
R_UNLESS(IsValidSampleRate(params.sample_rate), ResultInvalidOpusSampleRate);
|
|
||||||
|
|
||||||
auto work_buffer_size{required_workbuffer_sizes[params.channel_count - 1]};
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
work_buffer_size +=
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 64);
|
|
||||||
out_size = work_buffer_size + 0x600;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeForMultiStream(OpusMultiStreamParameters& params,
|
|
||||||
u64& out_size) {
|
|
||||||
OpusMultiStreamParametersEx ex{
|
|
||||||
.sample_rate = params.sample_rate,
|
|
||||||
.channel_count = params.channel_count,
|
|
||||||
.total_stream_count = params.total_stream_count,
|
|
||||||
.stereo_stream_count = params.stereo_stream_count,
|
|
||||||
.use_large_frame_size = false,
|
|
||||||
.mappings = {},
|
|
||||||
};
|
|
||||||
R_RETURN(GetWorkBufferSizeForMultiStreamExEx(ex, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamEx(OpusMultiStreamParametersEx& params,
|
|
||||||
u64& out_size) {
|
|
||||||
R_RETURN(GetWorkBufferSizeForMultiStreamExEx(params, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamExEx(OpusMultiStreamParametersEx& params,
|
|
||||||
u64& out_size) {
|
|
||||||
R_UNLESS(IsValidMultiStreamChannelCount(params.channel_count), ResultInvalidOpusChannelCount);
|
|
||||||
R_UNLESS(IsValidSampleRate(params.sample_rate), ResultInvalidOpusSampleRate);
|
|
||||||
R_UNLESS(IsValidStreamCount(params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count),
|
|
||||||
ResultInvalidOpusSampleRate);
|
|
||||||
|
|
||||||
auto work_buffer_size{hardware_opus.GetWorkBufferSizeForMultiStream(
|
|
||||||
params.total_stream_count, params.stereo_stream_count)};
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
work_buffer_size += Common::AlignUp(1500 * params.total_stream_count, 64);
|
|
||||||
work_buffer_size +=
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 64);
|
|
||||||
out_size = work_buffer_size;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,38 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "audio_core/opus/hardware_opus.h"
|
|
||||||
#include "audio_core/opus/parameters.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
#include "core/hle/service/audio/errors.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
class System;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
|
|
||||||
class OpusDecoderManager {
|
|
||||||
public:
|
|
||||||
OpusDecoderManager(Core::System& system);
|
|
||||||
|
|
||||||
HardwareOpus& GetHardwareOpus() {
|
|
||||||
return hardware_opus;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result GetWorkBufferSize(OpusParameters& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeEx(OpusParametersEx& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeExEx(OpusParametersEx& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeForMultiStream(OpusMultiStreamParameters& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeForMultiStreamEx(OpusMultiStreamParametersEx& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeForMultiStreamExEx(OpusMultiStreamParametersEx& params, u64& out_size);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Core::System& system;
|
|
||||||
HardwareOpus hardware_opus;
|
|
||||||
std::array<u64, MaxChannels> required_workbuffer_sizes{};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,241 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
#include "audio_core/audio_core.h"
|
|
||||||
#include "audio_core/opus/hardware_opus.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
namespace {
|
|
||||||
using namespace Service::Audio;
|
|
||||||
|
|
||||||
static constexpr Result ResultCodeFromLibOpusErrorCode(u64 error_code) {
|
|
||||||
s32 error{static_cast<s32>(error_code)};
|
|
||||||
ASSERT(error <= OPUS_OK);
|
|
||||||
switch (error) {
|
|
||||||
case OPUS_ALLOC_FAIL:
|
|
||||||
R_THROW(ResultLibOpusAllocFail);
|
|
||||||
case OPUS_INVALID_STATE:
|
|
||||||
R_THROW(ResultLibOpusInvalidState);
|
|
||||||
case OPUS_UNIMPLEMENTED:
|
|
||||||
R_THROW(ResultLibOpusUnimplemented);
|
|
||||||
case OPUS_INVALID_PACKET:
|
|
||||||
R_THROW(ResultLibOpusInvalidPacket);
|
|
||||||
case OPUS_INTERNAL_ERROR:
|
|
||||||
R_THROW(ResultLibOpusInternalError);
|
|
||||||
case OPUS_BUFFER_TOO_SMALL:
|
|
||||||
R_THROW(ResultBufferTooSmall);
|
|
||||||
case OPUS_BAD_ARG:
|
|
||||||
R_THROW(ResultLibOpusBadArg);
|
|
||||||
case OPUS_OK:
|
|
||||||
R_RETURN(ResultSuccess);
|
|
||||||
}
|
|
||||||
UNREACHABLE();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
HardwareOpus::HardwareOpus(Core::System& system_)
|
|
||||||
: system{system_}, opus_decoder{system.AudioCore().ADSP().OpusDecoder()} {
|
|
||||||
opus_decoder.SetSharedMemory(shared_memory);
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 HardwareOpus::GetWorkBufferSize(u32 channel) {
|
|
||||||
if (!opus_decoder.IsRunning()) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = channel;
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::GetWorkBufferSize);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::GetWorkBufferSizeOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::GetWorkBufferSizeOK, msg);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return shared_memory.dsp_return_data[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 HardwareOpus::GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = total_stream_count;
|
|
||||||
shared_memory.host_send_data[1] = stereo_stream_count;
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStream);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStreamOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStreamOK, msg);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return shared_memory.dsp_return_data[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::InitializeDecodeObject(u32 sample_rate, u32 channel_count, void* buffer,
|
|
||||||
u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
shared_memory.host_send_data[2] = sample_rate;
|
|
||||||
shared_memory.host_send_data[3] = channel_count;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::InitializeDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::InitializeDecodeObjectOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::InitializeDecodeObjectOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
|
|
||||||
u32 total_stream_count,
|
|
||||||
u32 stereo_stream_count, void* mappings,
|
|
||||||
void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
shared_memory.host_send_data[2] = sample_rate;
|
|
||||||
shared_memory.host_send_data[3] = channel_count;
|
|
||||||
shared_memory.host_send_data[4] = total_stream_count;
|
|
||||||
shared_memory.host_send_data[5] = stereo_stream_count;
|
|
||||||
|
|
||||||
ASSERT(channel_count <= MaxChannels);
|
|
||||||
std::memcpy(shared_memory.channel_mapping.data(), mappings, channel_count * sizeof(u8));
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::InitializeMultiStreamDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::InitializeMultiStreamDecodeObjectOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::InitializeMultiStreamDecodeObjectOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::ShutdownDecodeObject(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::ShutdownDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
ASSERT_MSG(msg == ADSP::OpusDecoder::Message::ShutdownDecodeObjectOK,
|
|
||||||
"Expected Opus shutdown code {}, got {}",
|
|
||||||
ADSP::OpusDecoder::Message::ShutdownDecodeObjectOK, msg);
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
ASSERT_MSG(msg == ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObjectOK,
|
|
||||||
"Expected Opus shutdown code {}, got {}",
|
|
||||||
ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObjectOK, msg);
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::DecodeInterleaved(u32& out_sample_count, void* output_data,
|
|
||||||
u64 output_data_size, u32 channel_count, void* input_data,
|
|
||||||
u64 input_data_size, void* buffer, u64& out_time_taken,
|
|
||||||
bool reset) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = (u64)input_data;
|
|
||||||
shared_memory.host_send_data[2] = input_data_size;
|
|
||||||
shared_memory.host_send_data[3] = (u64)output_data;
|
|
||||||
shared_memory.host_send_data[4] = output_data_size;
|
|
||||||
shared_memory.host_send_data[5] = 0;
|
|
||||||
shared_memory.host_send_data[6] = reset;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::DecodeInterleaved);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::DecodeInterleavedOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::DecodeInterleavedOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto error_code{static_cast<s32>(shared_memory.dsp_return_data[0])};
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
out_sample_count = static_cast<u32>(shared_memory.dsp_return_data[1]);
|
|
||||||
out_time_taken = 1000 * shared_memory.dsp_return_data[2];
|
|
||||||
}
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(error_code));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::DecodeInterleavedForMultiStream(u32& out_sample_count, void* output_data,
|
|
||||||
u64 output_data_size, u32 channel_count,
|
|
||||||
void* input_data, u64 input_data_size,
|
|
||||||
void* buffer, u64& out_time_taken,
|
|
||||||
bool reset) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = (u64)input_data;
|
|
||||||
shared_memory.host_send_data[2] = input_data_size;
|
|
||||||
shared_memory.host_send_data[3] = (u64)output_data;
|
|
||||||
shared_memory.host_send_data[4] = output_data_size;
|
|
||||||
shared_memory.host_send_data[5] = 0;
|
|
||||||
shared_memory.host_send_data[6] = reset;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStream);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto error_code{static_cast<s32>(shared_memory.dsp_return_data[0])};
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
out_sample_count = static_cast<u32>(shared_memory.dsp_return_data[1]);
|
|
||||||
out_time_taken = 1000 * shared_memory.dsp_return_data[2];
|
|
||||||
}
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(error_code));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::MapMemory(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::MapMemory);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::MapMemoryOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::MapMemoryOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::UnmapMemory(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::UnmapMemory);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::UnmapMemoryOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::UnmapMemoryOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,45 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <mutex>
|
|
||||||
#include <opus.h>
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decoder.h"
|
|
||||||
#include "audio_core/adsp/apps/opus/shared_memory.h"
|
|
||||||
#include "audio_core/adsp/mailbox.h"
|
|
||||||
#include "core/hle/service/audio/errors.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
class HardwareOpus {
|
|
||||||
public:
|
|
||||||
HardwareOpus(Core::System& system);
|
|
||||||
|
|
||||||
u64 GetWorkBufferSize(u32 channel);
|
|
||||||
u64 GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count);
|
|
||||||
|
|
||||||
Result InitializeDecodeObject(u32 sample_rate, u32 channel_count, void* buffer,
|
|
||||||
u64 buffer_size);
|
|
||||||
Result InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
|
|
||||||
u32 totaL_stream_count, u32 stereo_stream_count,
|
|
||||||
void* mappings, void* buffer, u64 buffer_size);
|
|
||||||
Result ShutdownDecodeObject(void* buffer, u64 buffer_size);
|
|
||||||
Result ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_size);
|
|
||||||
Result DecodeInterleaved(u32& out_sample_count, void* output_data, u64 output_data_size,
|
|
||||||
u32 channel_count, void* input_data, u64 input_data_size, void* buffer,
|
|
||||||
u64& out_time_taken, bool reset);
|
|
||||||
Result DecodeInterleavedForMultiStream(u32& out_sample_count, void* output_data,
|
|
||||||
u64 output_data_size, u32 channel_count,
|
|
||||||
void* input_data, u64 input_data_size, void* buffer,
|
|
||||||
u64& out_time_taken, bool reset);
|
|
||||||
Result MapMemory(void* buffer, u64 buffer_size);
|
|
||||||
Result UnmapMemory(void* buffer, u64 buffer_size);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Core::System& system;
|
|
||||||
std::mutex mutex;
|
|
||||||
ADSP::OpusDecoder::OpusDecoder& opus_decoder;
|
|
||||||
ADSP::OpusDecoder::SharedMemory shared_memory;
|
|
||||||
};
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,54 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/common_funcs.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
constexpr size_t OpusStreamCountMax = 255;
|
|
||||||
constexpr size_t MaxChannels = 2;
|
|
||||||
|
|
||||||
struct OpusParameters {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
}; // size = 0x8
|
|
||||||
static_assert(sizeof(OpusParameters) == 0x8, "OpusParameters has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusParametersEx {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
/* 0x08 */ bool use_large_frame_size;
|
|
||||||
/* 0x09 */ INSERT_PADDING_BYTES(7);
|
|
||||||
}; // size = 0x10
|
|
||||||
static_assert(sizeof(OpusParametersEx) == 0x10, "OpusParametersEx has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusMultiStreamParameters {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
/* 0x08 */ u32 total_stream_count;
|
|
||||||
/* 0x0C */ u32 stereo_stream_count;
|
|
||||||
/* 0x10 */ std::array<u8, OpusStreamCountMax + 1> mappings;
|
|
||||||
}; // size = 0x110
|
|
||||||
static_assert(sizeof(OpusMultiStreamParameters) == 0x110,
|
|
||||||
"OpusMultiStreamParameters has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusMultiStreamParametersEx {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
/* 0x08 */ u32 total_stream_count;
|
|
||||||
/* 0x0C */ u32 stereo_stream_count;
|
|
||||||
/* 0x10 */ bool use_large_frame_size;
|
|
||||||
/* 0x11 */ INSERT_PADDING_BYTES(7);
|
|
||||||
/* 0x18 */ std::array<u8, OpusStreamCountMax + 1> mappings;
|
|
||||||
}; // size = 0x118
|
|
||||||
static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118,
|
|
||||||
"OpusMultiStreamParametersEx has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusPacketHeader {
|
|
||||||
/* 0x00 */ u32 size;
|
|
||||||
/* 0x04 */ u32 final_range;
|
|
||||||
}; // size = 0x8
|
|
||||||
static_assert(sizeof(OpusPacketHeader) == 0x8, "OpusPacketHeader has the wrong size!");
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -27,12 +27,12 @@ u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
|||||||
|
|
||||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||||
const AdpcmDataSourceVersion1Command& command) const {
|
const AdpcmDataSourceVersion1Command& command) const {
|
||||||
return static_cast<u32>(command.pitch * 0.46f * 1.2f);
|
return static_cast<u32>(command.pitch * 0.25f * 1.2f);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||||
const AdpcmDataSourceVersion2Command& command) const {
|
const AdpcmDataSourceVersion2Command& command) const {
|
||||||
return static_cast<u32>(command.pitch * 0.46f * 1.2f);
|
return static_cast<u32>(command.pitch * 0.25f * 1.2f);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||||
|
@ -684,11 +684,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
|
|||||||
sink_context, splitter_context, perf_manager};
|
sink_context, splitter_context, perf_manager};
|
||||||
|
|
||||||
voice_context.SortInfo();
|
voice_context.SortInfo();
|
||||||
command_generator.GenerateVoiceCommands();
|
|
||||||
|
|
||||||
const auto start_estimated_time{drop_voice_param *
|
const auto start_estimated_time{drop_voice_param *
|
||||||
static_cast<f32>(command_buffer.estimated_process_time)};
|
static_cast<f32>(command_buffer.estimated_process_time)};
|
||||||
|
|
||||||
|
command_generator.GenerateVoiceCommands();
|
||||||
command_generator.GenerateSubMixCommands();
|
command_generator.GenerateSubMixCommands();
|
||||||
command_generator.GenerateFinalMixCommands();
|
command_generator.GenerateFinalMixCommands();
|
||||||
command_generator.GenerateSinkCommands();
|
command_generator.GenerateSinkCommands();
|
||||||
@ -708,13 +708,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
|
|||||||
|
|
||||||
const auto end_estimated_time{drop_voice_param *
|
const auto end_estimated_time{drop_voice_param *
|
||||||
static_cast<f32>(command_buffer.estimated_process_time)};
|
static_cast<f32>(command_buffer.estimated_process_time)};
|
||||||
|
|
||||||
const auto dsp_time_limit{((time_limit_percent / 100.0f) * 2'880'000.0f) *
|
|
||||||
(static_cast<f32>(render_time_limit_percent) / 100.0f)};
|
|
||||||
|
|
||||||
const auto estimated_time{start_estimated_time - end_estimated_time};
|
const auto estimated_time{start_estimated_time - end_estimated_time};
|
||||||
|
|
||||||
const auto time_limit{static_cast<u32>(std::max(dsp_time_limit + estimated_time, 0.0f))};
|
const auto time_limit{static_cast<u32>(
|
||||||
|
estimated_time + (((time_limit_percent / 100.0f) * 2'880'000.0) *
|
||||||
|
(static_cast<f32>(render_time_limit_percent) / 100.0f)))};
|
||||||
num_voices_dropped =
|
num_voices_dropped =
|
||||||
DropVoices(command_buffer, static_cast<u32>(start_estimated_time), time_limit);
|
DropVoices(command_buffer, static_cast<u32>(start_estimated_time), time_limit);
|
||||||
}
|
}
|
||||||
|
@ -26,11 +26,12 @@ add_library(common STATIC
|
|||||||
assert.h
|
assert.h
|
||||||
atomic_helpers.h
|
atomic_helpers.h
|
||||||
atomic_ops.h
|
atomic_ops.h
|
||||||
|
detached_tasks.cpp
|
||||||
|
detached_tasks.h
|
||||||
bit_cast.h
|
bit_cast.h
|
||||||
bit_field.h
|
bit_field.h
|
||||||
bit_set.h
|
bit_set.h
|
||||||
bit_util.h
|
bit_util.h
|
||||||
bounded_threadsafe_queue.h
|
|
||||||
cityhash.cpp
|
cityhash.cpp
|
||||||
cityhash.h
|
cityhash.h
|
||||||
common_funcs.h
|
common_funcs.h
|
||||||
@ -40,8 +41,6 @@ add_library(common STATIC
|
|||||||
container_hash.h
|
container_hash.h
|
||||||
demangle.cpp
|
demangle.cpp
|
||||||
demangle.h
|
demangle.h
|
||||||
detached_tasks.cpp
|
|
||||||
detached_tasks.h
|
|
||||||
div_ceil.h
|
div_ceil.h
|
||||||
dynamic_library.cpp
|
dynamic_library.cpp
|
||||||
dynamic_library.h
|
dynamic_library.h
|
||||||
|
@ -45,13 +45,13 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
T PopWait() {
|
T PopWait() {
|
||||||
T t{};
|
T t;
|
||||||
Pop<PopMode::Wait>(t);
|
Pop<PopMode::Wait>(t);
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
T PopWait(std::stop_token stop_token) {
|
T PopWait(std::stop_token stop_token) {
|
||||||
T t{};
|
T t;
|
||||||
Pop<PopMode::WaitWithStopToken>(t, stop_token);
|
Pop<PopMode::WaitWithStopToken>(t, stop_token);
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
@ -528,41 +528,38 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path,
|
|||||||
// Generic Filesystem Operations
|
// Generic Filesystem Operations
|
||||||
|
|
||||||
bool Exists(const fs::path& path) {
|
bool Exists(const fs::path& path) {
|
||||||
std::error_code ec;
|
|
||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
if (Android::IsContentUri(path)) {
|
if (Android::IsContentUri(path)) {
|
||||||
return Android::Exists(path);
|
return Android::Exists(path);
|
||||||
} else {
|
} else {
|
||||||
return fs::exists(path, ec);
|
return fs::exists(path);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return fs::exists(path, ec);
|
return fs::exists(path);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsFile(const fs::path& path) {
|
bool IsFile(const fs::path& path) {
|
||||||
std::error_code ec;
|
|
||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
if (Android::IsContentUri(path)) {
|
if (Android::IsContentUri(path)) {
|
||||||
return !Android::IsDirectory(path);
|
return !Android::IsDirectory(path);
|
||||||
} else {
|
} else {
|
||||||
return fs::is_regular_file(path, ec);
|
return fs::is_regular_file(path);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return fs::is_regular_file(path, ec);
|
return fs::is_regular_file(path);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsDir(const fs::path& path) {
|
bool IsDir(const fs::path& path) {
|
||||||
std::error_code ec;
|
|
||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
if (Android::IsContentUri(path)) {
|
if (Android::IsContentUri(path)) {
|
||||||
return Android::IsDirectory(path);
|
return Android::IsDirectory(path);
|
||||||
} else {
|
} else {
|
||||||
return fs::is_directory(path, ec);
|
return fs::is_directory(path);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return fs::is_directory(path, ec);
|
return fs::is_directory(path);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
|
|||||||
SUB(Service, NCM) \
|
SUB(Service, NCM) \
|
||||||
SUB(Service, NFC) \
|
SUB(Service, NFC) \
|
||||||
SUB(Service, NFP) \
|
SUB(Service, NFP) \
|
||||||
SUB(Service, NGC) \
|
SUB(Service, NGCT) \
|
||||||
SUB(Service, NIFM) \
|
SUB(Service, NIFM) \
|
||||||
SUB(Service, NIM) \
|
SUB(Service, NIM) \
|
||||||
SUB(Service, NOTIF) \
|
SUB(Service, NOTIF) \
|
||||||
|
@ -80,7 +80,7 @@ enum class Class : u8 {
|
|||||||
Service_NCM, ///< The NCM service
|
Service_NCM, ///< The NCM service
|
||||||
Service_NFC, ///< The NFC (Near-field communication) service
|
Service_NFC, ///< The NFC (Near-field communication) service
|
||||||
Service_NFP, ///< The NFP service
|
Service_NFP, ///< The NFP service
|
||||||
Service_NGC, ///< The NGC (No Good Content) service
|
Service_NGCT, ///< The NGCT (No Good Content for Terra) service
|
||||||
Service_NIFM, ///< The NIFM (Network interface) service
|
Service_NIFM, ///< The NIFM (Network interface) service
|
||||||
Service_NIM, ///< The NIM service
|
Service_NIM, ///< The NIM service
|
||||||
Service_NOTIF, ///< The NOTIF (Notification) service
|
Service_NOTIF, ///< The NOTIF (Notification) service
|
||||||
|
@ -19,8 +19,8 @@
|
|||||||
namespace Common {
|
namespace Common {
|
||||||
|
|
||||||
template <typename Condvar, typename Lock, typename Pred>
|
template <typename Condvar, typename Lock, typename Pred>
|
||||||
void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred&& pred) {
|
void CondvarWait(Condvar& cv, Lock& lock, std::stop_token token, Pred&& pred) {
|
||||||
cv.wait(lk, token, std::move(pred));
|
cv.wait(lock, token, std::move(pred));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Rep, typename Period>
|
template <typename Rep, typename Period>
|
||||||
@ -332,17 +332,13 @@ private:
|
|||||||
namespace Common {
|
namespace Common {
|
||||||
|
|
||||||
template <typename Condvar, typename Lock, typename Pred>
|
template <typename Condvar, typename Lock, typename Pred>
|
||||||
void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred pred) {
|
void CondvarWait(Condvar& cv, Lock& lock, std::stop_token token, Pred pred) {
|
||||||
if (token.stop_requested()) {
|
if (token.stop_requested()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::stop_callback callback(token, [&] {
|
std::stop_callback callback(token, [&] { cv.notify_all(); });
|
||||||
{ std::scoped_lock lk2{*lk.mutex()}; }
|
cv.wait(lock, [&] { return pred() || token.stop_requested(); });
|
||||||
cv.notify_all();
|
|
||||||
});
|
|
||||||
|
|
||||||
cv.wait(lk, [&] { return pred() || token.stop_requested(); });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Rep, typename Period>
|
template <typename Rep, typename Period>
|
||||||
@ -357,10 +353,8 @@ bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep,
|
|||||||
|
|
||||||
std::stop_callback cb(token, [&] {
|
std::stop_callback cb(token, [&] {
|
||||||
// Wake up the waiting thread.
|
// Wake up the waiting thread.
|
||||||
{
|
std::unique_lock lk{m};
|
||||||
std::scoped_lock lk{m};
|
stop_requested = true;
|
||||||
stop_requested = true;
|
|
||||||
}
|
|
||||||
cv.notify_one();
|
cv.notify_one();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -130,17 +130,13 @@ void LogSettings() {
|
|||||||
log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
|
log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateGPUAccuracy() {
|
|
||||||
values.current_gpu_accuracy = values.gpu_accuracy.GetValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsGPULevelExtreme() {
|
bool IsGPULevelExtreme() {
|
||||||
return values.current_gpu_accuracy == GpuAccuracy::Extreme;
|
return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsGPULevelHigh() {
|
bool IsGPULevelHigh() {
|
||||||
return values.current_gpu_accuracy == GpuAccuracy::Extreme ||
|
return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme ||
|
||||||
values.current_gpu_accuracy == GpuAccuracy::High;
|
values.gpu_accuracy.GetValue() == GpuAccuracy::High;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsFastmemEnabled() {
|
bool IsFastmemEnabled() {
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user