diff options
| author |  Fernando S | 2023-12-19 16:15:07 +0100 |
|---|---|---|
| committer |  GitHub | 2023-12-19 16:15:07 +0100 |
| commit | d61df0f4002274b23c0c7139449906ca392a6a3d (patch) | |
| tree | 18195cd952b7d988570b3586ec1d02feed4a079f /src/android | |
| parent | Merge pull request #12392 from liamwhite/mode (diff) | |
| parent | oboe_sink: specify additional required parameters (diff) | |
| download | yuzu-d61df0f4002274b23c0c7139449906ca392a6a3d.tar.gz yuzu-d61df0f4002274b23c0c7139449906ca392a6a3d.tar.xz yuzu-d61df0f4002274b23c0c7139449906ca392a6a3d.zip | |
Merge pull request #12387 from liamwhite/oboe
android: add oboe audio sink
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | src/android/app/src/main/res/values/strings.xml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index ab435dce9..e3915ef4f 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml | |||
| @@ -256,11 +256,13 @@ | |||
| 256 | 256 | ||
| 257 | <string-array name="outputEngineEntries"> | 257 | <string-array name="outputEngineEntries"> |
| 258 | <item>@string/auto</item> | 258 | <item>@string/auto</item> |
| 259 | <item>@string/oboe</item> | ||
| 259 | <item>@string/cubeb</item> | 260 | <item>@string/cubeb</item> |
| 260 | <item>@string/string_null</item> | 261 | <item>@string/string_null</item> |
| 261 | </string-array> | 262 | </string-array> |
| 262 | <integer-array name="outputEngineValues"> | 263 | <integer-array name="outputEngineValues"> |
| 263 | <item>0</item> | 264 | <item>0</item> |
| 265 | <item>4</item> | ||
| 264 | <item>1</item> | 266 | <item>1</item> |
| 265 | <item>3</item> | 267 | <item>3</item> |
| 266 | </integer-array> | 268 | </integer-array> |
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index c86c43df2..0b80b04a4 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml | |||
| @@ -503,6 +503,7 @@ | |||
| 503 | <string name="theme_mode_dark">Dark</string> | 503 | <string name="theme_mode_dark">Dark</string> |
| 504 | 504 | ||
| 505 | <!-- Audio output engines --> | 505 | <!-- Audio output engines --> |
| 506 | <string name="oboe">oboe</string> | ||
| 506 | <string name="cubeb">cubeb</string> | 507 | <string name="cubeb">cubeb</string> |
| 507 | 508 | ||
| 508 | <!-- Black backgrounds theme --> | 509 | <!-- Black backgrounds theme --> |