Android #59

CMakeLists.txt

@@ -49,8 +49,6 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
 option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 
-option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
-
 CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
 
 CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)
@@ -63,8 +61,6 @@ option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
 
 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
 
-option(YUZU_ENABLE_PORTABLE "Allow yuzu to enable portable mode if a user folder is found in the CWD" ON)
-
 CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
 
 CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
@@ -81,24 +77,6 @@ if (ANDROID OR WIN32 OR APPLE)
 endif()
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
 
-if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
-    set(vvl_version "sdk-1.3.261.1")
-    set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
-    if (NOT EXISTS "${vvl_zip_file}")
-        # Download and extract validation layer release to externals directory
-        set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
-        file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
-            "${vvl_zip_file}" SHOW_PROGRESS)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
-                        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
-    endif()
-
-    # Copy the arm64 binary to src/android/app/main/jniLibs
-    set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
-    file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
-            DESTINATION "${vvl_lib_path}")
-endif()
-
 # On Android, fetch and compile libcxx before doing anything else
 if (ANDROID)
     set(CMAKE_SKIP_INSTALL_RULES ON)

src/CMakeLists.txt

@@ -24,7 +24,7 @@ if (MSVC)
     # Ensure that projects build with Unicode support.
     add_definitions(-DUNICODE -D_UNICODE)
 
-    # /W4                 - Level 4 warnings
+    # /W3                 - Level 3 warnings
     # /MP                 - Multi-threaded compilation
     # /Zi                 - Output debugging information
     # /Zm                 - Specifies the precompiled header memory allocation limit
@@ -61,7 +61,7 @@ if (MSVC)
         /external:W0            # Sets the default warning level to 0 for external headers, effectively turning off warnings for external headers
 
         # Warnings
-        /W4
+        /W3
         /WX
 
         /we4062 # Enumerator 'identifier' in a switch of enum 'enumeration' is not handled
@@ -84,17 +84,12 @@ if (MSVC)
 
         /wd4100 # 'identifier': unreferenced formal parameter
         /wd4324 # 'struct_name': structure was padded due to __declspec(align())
-        /wd4201 # nonstandard extension used : nameless struct/union
-        /wd4702 # unreachable code (when used with LTO)
     )
 
     if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS)
     # when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format
     # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21
         add_compile_options(/Z7)
-        # Avoid D9025 warning
-        string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-        string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
     else()
         add_compile_options(/Zi)
     endif()

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -307,6 +307,21 @@ object NativeLibrary {
      */
     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
      */

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -332,7 +332,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             pictureInPictureActions.add(pauseRemoteAction)
         }
 
-        if (BooleanSetting.AUDIO_MUTED.boolean) {
+        if (NativeLibrary.isMuted()) {
             val unmuteIcon = Icon.createWithResource(
                 this@EmulationActivity,
                 R.drawable.ic_pip_unmute
@@ -389,9 +389,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
                 if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
             }
             if (intent.action == actionUnmute) {
-                if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
+                if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
             } else if (intent.action == actionMute) {
-                if (!BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(true)
+                if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()
             }
             buildPictureInPictureParams()
         }
@@ -417,7 +417,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             } catch (ignored: Exception) {
             }
             // Always resume audio, since there is no UI button
-            if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
+            if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
         }
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt

@@ -4,8 +4,7 @@
 package org.yuzu.yuzu_emu.adapters
 
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -16,10 +15,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.content.res.ResourcesCompat
 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.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
@@ -91,24 +87,11 @@ class GameAdapter(private val activity: AppCompatActivity) :
             action = Intent.ACTION_VIEW
             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)
             .setShortLabel(holder.game.title)
             .setIcon(
-                IconCompat.createWithAdaptiveBitmap(
-                    layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
+                IconCompat.createWithBitmap(
+                    (holder.binding.imageGameScreen.drawable as BitmapDrawable).bitmap
                 )
             )
             .setIntent(openIntent)

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt

@@ -10,12 +10,8 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
@@ -90,11 +86,7 @@ class HomeSettingAdapter(
                 binding.optionIcon.alpha = 0.5f
             }
 
-            viewLifecycle.lifecycleScope.launch {
-                viewLifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    option.details.collect { updateOptionDetails(it) }
-                }
-            }
+            option.details.observe(viewLifecycle) { updateOptionDetails(it) }
             binding.optionDetail.postDelayed(
                 {
                     binding.optionDetail.ellipsize = TextUtils.TruncateAt.MARQUEE

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -10,7 +10,6 @@ enum class BooleanSetting(
     override val category: Settings.Category,
     override val androidDefault: Boolean? = null
 ) : AbstractBooleanSetting {
-    AUDIO_MUTED("audio_muted", Settings.Category.Audio),
     CPU_DEBUG_MODE("cpu_debug_mode", Settings.Category.Cpu),
     FASTMEM("cpuopt_fastmem", Settings.Category.Cpu),
     FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.Category.Cpu),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt

@@ -80,17 +80,6 @@ object Settings {
     const val SECTION_THEME = "Theme"
     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_OVERLAY_VERSION = "OverlayVersion"

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt

@@ -3,12 +3,10 @@
 
 package org.yuzu.yuzu_emu.features.settings.model.view
 
-import org.yuzu.yuzu_emu.features.settings.model.Settings
-
 class SubmenuSetting(
     titleId: Int,
     descriptionId: Int,
-    val menuKey: Settings.MenuTag
+    val menuKey: String
 ) : SettingsItem(emptySetting, titleId, descriptionId) {
     override val type = TYPE_SUBMENU
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt

@@ -13,14 +13,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 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.navArgs
 import com.google.android.material.color.MaterialColors
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 import java.io.IOException
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
@@ -71,30 +66,19 @@ class SettingsActivity : AppCompatActivity() {
             )
         }
 
-        lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldRecreate.collectLatest {
+        settingsViewModel.shouldRecreate.observe(this) {
             if (it) {
                 settingsViewModel.setShouldRecreate(false)
                 recreate()
             }
         }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldNavigateBack.collectLatest {
+        settingsViewModel.shouldNavigateBack.observe(this) {
             if (it) {
                 settingsViewModel.setShouldNavigateBack(false)
                 navigateBack()
             }
         }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldShowResetSettingsDialog.collectLatest {
+        settingsViewModel.shouldShowResetSettingsDialog.observe(this) {
             if (it) {
                 settingsViewModel.setShouldShowResetSettingsDialog(false)
                 ResetSettingsDialogFragment().show(
@@ -103,9 +87,6 @@ class SettingsActivity : AppCompatActivity() {
                 )
             }
         }
-                }
-            }
-        }
 
         onBackPressedDispatcher.addCallback(
             this,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.features.settings.ui
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,19 +13,14 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.divider.MaterialDividerItemDecoration
 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.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
 
 class SettingsFragment : Fragment() {
@@ -57,17 +51,15 @@ class SettingsFragment : Fragment() {
         return binding.root
     }
 
-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         settingsAdapter = SettingsAdapter(this, requireContext())
         presenter = SettingsFragmentPresenter(
             settingsViewModel,
             settingsAdapter!!,
-            args.menuTag
+            args.menuTag,
+            args.game?.gameId ?: ""
         )
 
-        binding.toolbarSettingsLayout.title = getString(args.menuTag.titleId)
         val dividerDecoration = MaterialDividerItemDecoration(
             requireContext(),
             LinearLayoutManager.VERTICAL
@@ -83,19 +75,18 @@ class SettingsFragment : Fragment() {
             settingsViewModel.setShouldNavigateBack(true)
         }
 
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldReloadSettingsList.collectLatest {
+        settingsViewModel.toolbarTitle.observe(viewLifecycleOwner) {
+            if (it.isNotEmpty()) binding.toolbarSettingsLayout.title = it
+        }
+
+        settingsViewModel.shouldReloadSettingsList.observe(viewLifecycleOwner) {
             if (it) {
                 settingsViewModel.setShouldReloadSettingsList(false)
                 presenter.loadSettingsList()
             }
         }
-                }
-            }
-            launch {
-                settingsViewModel.isUsingSearch.collectLatest {
+
+        settingsViewModel.isUsingSearch.observe(viewLifecycleOwner) {
             if (it) {
                 reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
                 exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
@@ -104,10 +95,8 @@ class SettingsFragment : Fragment() {
                 exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
             }
         }
-            }
-        }
 
-        if (args.menuTag == Settings.MenuTag.SECTION_ROOT) {
+        if (args.menuTag == SettingsFile.FILE_NAME_CONFIG) {
             binding.toolbarSettings.inflateMenu(R.menu.menu_settings)
             binding.toolbarSettings.setOnMenuItemClickListener {
                 when (it.itemId) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.features.settings.ui
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Build
+import android.text.TextUtils
 import android.widget.Toast
 import androidx.preference.PreferenceManager
 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.ShortSetting
 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.utils.NativeConfig
 
 class SettingsFragmentPresenter(
     private val settingsViewModel: SettingsViewModel,
     private val adapter: SettingsAdapter,
-    private var menuTag: Settings.MenuTag
+    private var menuTag: String,
+    private var gameId: String
 ) {
     private var settingsList = ArrayList<SettingsItem>()
 
@@ -50,15 +53,24 @@ class SettingsFragmentPresenter(
     }
 
     fun loadSettingsList() {
+        if (!TextUtils.isEmpty(gameId)) {
+            settingsViewModel.setToolbarTitle(
+                context.getString(
+                    R.string.advanced_settings_game,
+                    gameId
+                )
+            )
+        }
+
         val sl = ArrayList<SettingsItem>()
         when (menuTag) {
-            Settings.MenuTag.SECTION_ROOT -> addConfigSettings(sl)
-            Settings.MenuTag.SECTION_GENERAL -> addGeneralSettings(sl)
-            Settings.MenuTag.SECTION_SYSTEM -> addSystemSettings(sl)
-            Settings.MenuTag.SECTION_RENDERER -> addGraphicsSettings(sl)
-            Settings.MenuTag.SECTION_AUDIO -> addAudioSettings(sl)
-            Settings.MenuTag.SECTION_THEME -> addThemeSettings(sl)
-            Settings.MenuTag.SECTION_DEBUG -> addDebugSettings(sl)
+            SettingsFile.FILE_NAME_CONFIG -> addConfigSettings(sl)
+            Settings.SECTION_GENERAL -> addGeneralSettings(sl)
+            Settings.SECTION_SYSTEM -> addSystemSettings(sl)
+            Settings.SECTION_RENDERER -> addGraphicsSettings(sl)
+            Settings.SECTION_AUDIO -> addAudioSettings(sl)
+            Settings.SECTION_THEME -> addThemeSettings(sl)
+            Settings.SECTION_DEBUG -> addDebugSettings(sl)
             else -> {
                 val context = YuzuApplication.appContext
                 Toast.makeText(
@@ -74,12 +86,13 @@ class SettingsFragmentPresenter(
     }
 
     private fun addConfigSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.advanced_settings))
         sl.apply {
-            add(SubmenuSetting(R.string.preferences_general, 0, Settings.MenuTag.SECTION_GENERAL))
-            add(SubmenuSetting(R.string.preferences_system, 0, Settings.MenuTag.SECTION_SYSTEM))
-            add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.MenuTag.SECTION_RENDERER))
-            add(SubmenuSetting(R.string.preferences_audio, 0, Settings.MenuTag.SECTION_AUDIO))
-            add(SubmenuSetting(R.string.preferences_debug, 0, Settings.MenuTag.SECTION_DEBUG))
+            add(SubmenuSetting(R.string.preferences_general, 0, Settings.SECTION_GENERAL))
+            add(SubmenuSetting(R.string.preferences_system, 0, Settings.SECTION_SYSTEM))
+            add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.SECTION_RENDERER))
+            add(SubmenuSetting(R.string.preferences_audio, 0, Settings.SECTION_AUDIO))
+            add(SubmenuSetting(R.string.preferences_debug, 0, Settings.SECTION_DEBUG))
             add(
                 RunnableSetting(R.string.reset_to_default, 0, false) {
                     settingsViewModel.setShouldShowResetSettingsDialog(true)
@@ -89,6 +102,7 @@ class SettingsFragmentPresenter(
     }
 
     private fun addGeneralSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_general))
         sl.apply {
             add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
             add(ShortSetting.RENDERER_SPEED_LIMIT.key)
@@ -98,6 +112,7 @@ class SettingsFragmentPresenter(
     }
 
     private fun addSystemSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_system))
         sl.apply {
             add(BooleanSetting.USE_DOCKED_MODE.key)
             add(IntSetting.REGION_INDEX.key)
@@ -108,6 +123,7 @@ class SettingsFragmentPresenter(
     }
 
     private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_graphics))
         sl.apply {
             add(IntSetting.RENDERER_ACCURACY.key)
             add(IntSetting.RENDERER_RESOLUTION.key)
@@ -124,6 +140,7 @@ class SettingsFragmentPresenter(
     }
 
     private fun addAudioSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_audio))
         sl.apply {
             add(IntSetting.AUDIO_OUTPUT_ENGINE.key)
             add(ByteSetting.AUDIO_VOLUME.key)
@@ -131,6 +148,7 @@ class SettingsFragmentPresenter(
     }
 
     private fun addThemeSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_theme))
         sl.apply {
             val theme: AbstractIntSetting = object : AbstractIntSetting {
                 override val int: Int
@@ -243,6 +261,7 @@ class SettingsFragmentPresenter(
     }
 
     private fun addDebugSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_debug))
         sl.apply {
             add(HeaderSetting(R.string.gpu))
             add(IntSetting.RENDERER_BACKEND.key)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -39,7 +39,6 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
@@ -50,6 +49,7 @@ import org.yuzu.yuzu_emu.databinding.DialogOverlayAdjustBinding
 import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
 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.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.overlay.InputOverlay
@@ -129,8 +129,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         return binding.root
     }
 
-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.surfaceEmulation.holder.addCallback(this)
         binding.showFpsText.setTextColor(Color.YELLOW)
@@ -165,7 +163,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 R.id.menu_settings -> {
                     val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                         null,
-                        Settings.MenuTag.SECTION_ROOT
+                        SettingsFile.FILE_NAME_CONFIG
                     )
                     binding.root.findNavController().navigate(action)
                     true
@@ -207,25 +205,21 @@ 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)
         binding.loadingTitle.text = game.title
         binding.loadingTitle.isSelected = true
         binding.loadingText.isSelected = true
 
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    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) {
+        emulationViewModel.shaderProgress.observe(viewLifecycleOwner) {
+            if (it > 0 && it != emulationViewModel.totalShaders.value!!) {
                 binding.loadingProgressIndicator.isIndeterminate = false
 
                 if (it < binding.loadingProgressIndicator.max) {
@@ -233,33 +227,22 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
             }
 
-                        if (it == emulationViewModel.totalShaders.value) {
+            if (it == emulationViewModel.totalShaders.value!!) {
                 binding.loadingText.setText(R.string.loading)
                 binding.loadingProgressIndicator.isIndeterminate = true
             }
         }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.totalShaders.collectLatest {
+        emulationViewModel.totalShaders.observe(viewLifecycleOwner) {
             binding.loadingProgressIndicator.max = it
         }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.shaderMessage.collectLatest {
+        emulationViewModel.shaderMessage.observe(viewLifecycleOwner) {
             if (it.isNotEmpty()) {
                 binding.loadingText.text = it
             }
         }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.emulationStarted.collectLatest {
-                        if (it) {
+
+        emulationViewModel.emulationStarted.observe(viewLifecycleOwner) { started ->
+            if (started) {
                 binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
                 ViewUtils.showView(binding.surfaceInputOverlay)
                 ViewUtils.hideView(binding.loadingIndicator)
@@ -268,11 +251,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 updateShowFpsOverlay()
             }
         }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.isEmulationStopping.collectLatest {
+
+        emulationViewModel.isEmulationStopping.observe(viewLifecycleOwner) {
             if (it) {
                 binding.loadingText.setText(R.string.shutting_down)
                 ViewUtils.showView(binding.loadingIndicator)
@@ -281,9 +261,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
         }
     }
-            }
-        }
-    }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
@@ -297,7 +274,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
             }
         } else {
-            if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
+            if (EmulationMenuSettings.showOverlay &&
+                emulationViewModel.emulationStarted.value == true
+            ) {
                 binding.surfaceInputOverlay.post {
                     binding.surfaceInputOverlay.visibility = View.VISIBLE
                 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -37,6 +37,7 @@ import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
 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.HomeViewModel
 import org.yuzu.yuzu_emu.ui.main.MainActivity
@@ -77,7 +78,7 @@ class HomeSettingsFragment : Fragment() {
                     {
                         val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                             null,
-                            Settings.MenuTag.SECTION_ROOT
+                            SettingsFile.FILE_NAME_CONFIG
                         )
                         binding.root.findNavController().navigate(action)
                     }
@@ -99,7 +100,7 @@ class HomeSettingsFragment : Fragment() {
                     {
                         val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                             null,
-                            Settings.MenuTag.SECTION_THEME
+                            Settings.SECTION_THEME
                         )
                         binding.root.findNavController().navigate(action)
                     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt

@@ -9,12 +9,8 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.model.TaskViewModel
 
@@ -32,15 +28,11 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
             .create()
         dialog.setCanceledOnTouchOutside(false)
 
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                taskViewModel.isComplete.collect {
-                    if (it) {
+        taskViewModel.isComplete.observe(this) { complete ->
+            if (complete) {
                 dialog.dismiss()
                 when (val result = taskViewModel.result.value) {
-                            is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG)
-                                .show()
-
+                    is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG).show()
                     is MessageDialogFragment -> result.show(
                         requireActivity().supportFragmentManager,
                         MessageDialogFragment.TAG
@@ -49,10 +41,8 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
                 taskViewModel.clear()
             }
         }
-            }
-        }
 
-        if (!taskViewModel.isRunning.value) {
+        if (taskViewModel.isRunning.value == false) {
             taskViewModel.runTask()
         }
         return dialog

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.fragments
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -18,13 +17,9 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.PreferenceManager
 import info.debatty.java.stringsimilarity.Jaccard
 import info.debatty.java.stringsimilarity.JaroWinkler
-import kotlinx.coroutines.launch
 import java.util.Locale
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -57,8 +52,6 @@ class SearchFragment : Fragment() {
         return binding.root
     }
 
-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         homeViewModel.setNavigationVisibility(visible = true, animated = false)
         preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
@@ -86,25 +79,16 @@ class SearchFragment : Fragment() {
             filterAndSearch()
         }
 
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    gamesViewModel.searchFocused.collect {
-                        if (it) {
+        gamesViewModel.apply {
+            searchFocused.observe(viewLifecycleOwner) { searchFocused ->
+                if (searchFocused) {
                     focusSearch()
                     gamesViewModel.setSearchFocused(false)
                 }
             }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    gamesViewModel.games.collect { filterAndSearch() }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    gamesViewModel.searchedGames.collect {
+
+            games.observe(viewLifecycleOwner) { filterAndSearch() }
+            searchedGames.observe(viewLifecycleOwner) {
                 (binding.gridGamesSearch.adapter as GameAdapter).submitList(it)
                 if (it.isEmpty()) {
                     binding.noResultsView.visibility = View.VISIBLE
@@ -113,8 +97,6 @@ class SearchFragment : Fragment() {
                 }
             }
         }
-            }
-        }
 
         binding.clearButton.setOnClickListener { binding.searchText.setText("") }
 
@@ -127,7 +109,7 @@ class SearchFragment : Fragment() {
     private inner class ScoredGame(val score: Double, val item: Game)
 
     private fun filterAndSearch() {
-        val baseList = gamesViewModel.games.value
+        val baseList = gamesViewModel.games.value!!
         val filteredList: List<Game> = when (binding.chipGroup.checkedChipId) {
             R.id.chip_recently_played -> {
                 baseList.filter {

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt

@@ -15,14 +15,10 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.transition.MaterialSharedAxis
 import info.debatty.java.stringsimilarity.Cosine
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentSettingsSearchBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
@@ -83,16 +79,12 @@ class SettingsSearchFragment : Fragment() {
             search()
             binding.settingsList.smoothScrollToPosition(0)
         }
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                settingsViewModel.shouldReloadSettingsList.collect {
+        settingsViewModel.shouldReloadSettingsList.observe(viewLifecycleOwner) {
             if (it) {
                 settingsViewModel.setShouldReloadSettingsList(false)
                 search()
             }
         }
-            }
-        }
 
         search()
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt

@@ -22,14 +22,10 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.transition.MaterialFadeThrough
-import kotlinx.coroutines.launch
 import java.io.File
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -210,16 +206,12 @@ class SetupFragment : Fragment() {
             )
         }
 
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                homeViewModel.shouldPageForward.collect {
+        homeViewModel.shouldPageForward.observe(viewLifecycleOwner) {
             if (it) {
                 pageForward()
                 homeViewModel.setShouldPageForward(false)
             }
         }
-            }
-        }
 
         binding.viewPager2.apply {
             adapter = SetupAdapter(requireActivity() as AppCompatActivity, pages)

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/EmulationViewModel.kt

@@ -3,28 +3,28 @@
 
 package org.yuzu.yuzu_emu.model
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 
 class EmulationViewModel : ViewModel() {
-    val emulationStarted: StateFlow<Boolean> get() = _emulationStarted
-    private val _emulationStarted = MutableStateFlow(false)
+    private val _emulationStarted = MutableLiveData(false)
+    val emulationStarted: LiveData<Boolean> get() = _emulationStarted
 
-    val isEmulationStopping: StateFlow<Boolean> get() = _isEmulationStopping
-    private val _isEmulationStopping = MutableStateFlow(false)
+    private val _isEmulationStopping = MutableLiveData(false)
+    val isEmulationStopping: LiveData<Boolean> get() = _isEmulationStopping
 
-    val shaderProgress: StateFlow<Int> get() = _shaderProgress
-    private val _shaderProgress = MutableStateFlow(0)
+    private val _shaderProgress = MutableLiveData(0)
+    val shaderProgress: LiveData<Int> get() = _shaderProgress
 
-    val totalShaders: StateFlow<Int> get() = _totalShaders
-    private val _totalShaders = MutableStateFlow(0)
+    private val _totalShaders = MutableLiveData(0)
+    val totalShaders: LiveData<Int> get() = _totalShaders
 
-    val shaderMessage: StateFlow<String> get() = _shaderMessage
-    private val _shaderMessage = MutableStateFlow("")
+    private val _shaderMessage = MutableLiveData("")
+    val shaderMessage: LiveData<String> get() = _shaderMessage
 
     fun setEmulationStarted(started: Boolean) {
-        _emulationStarted.value = started
+        _emulationStarted.postValue(started)
     }
 
     fun setIsEmulationStopping(value: Boolean) {
@@ -50,18 +50,10 @@ class EmulationViewModel : ViewModel() {
     }
 
     fun clear() {
-        setEmulationStarted(false)
-        setIsEmulationStopping(false)
-        setShaderProgress(0)
-        setTotalShaders(0)
-        setShaderMessage("")
-    }
-
-    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"
+        _emulationStarted.value = false
+        _isEmulationStopping.value = false
+        _shaderProgress.value = 0
+        _totalShaders.value = 0
+        _shaderMessage.value = ""
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt

@@ -5,13 +5,13 @@ package org.yuzu.yuzu_emu.model
 
 import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.preference.PreferenceManager
 import java.util.Locale
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -24,23 +24,23 @@ import org.yuzu.yuzu_emu.utils.GameHelper
 
 @OptIn(ExperimentalSerializationApi::class)
 class GamesViewModel : ViewModel() {
-    val games: StateFlow<List<Game>> get() = _games
-    private val _games = MutableStateFlow(emptyList<Game>())
+    private val _games = MutableLiveData<List<Game>>(emptyList())
+    val games: LiveData<List<Game>> get() = _games
 
-    val searchedGames: StateFlow<List<Game>> get() = _searchedGames
-    private val _searchedGames = MutableStateFlow(emptyList<Game>())
+    private val _searchedGames = MutableLiveData<List<Game>>(emptyList())
+    val searchedGames: LiveData<List<Game>> get() = _searchedGames
 
-    val isReloading: StateFlow<Boolean> get() = _isReloading
-    private val _isReloading = MutableStateFlow(false)
+    private val _isReloading = MutableLiveData(false)
+    val isReloading: LiveData<Boolean> get() = _isReloading
 
-    val shouldSwapData: StateFlow<Boolean> get() = _shouldSwapData
-    private val _shouldSwapData = MutableStateFlow(false)
+    private val _shouldSwapData = MutableLiveData(false)
+    val shouldSwapData: LiveData<Boolean> get() = _shouldSwapData
 
-    val shouldScrollToTop: StateFlow<Boolean> get() = _shouldScrollToTop
-    private val _shouldScrollToTop = MutableStateFlow(false)
+    private val _shouldScrollToTop = MutableLiveData(false)
+    val shouldScrollToTop: LiveData<Boolean> get() = _shouldScrollToTop
 
-    val searchFocused: StateFlow<Boolean> get() = _searchFocused
-    private val _searchFocused = MutableStateFlow(false)
+    private val _searchFocused = MutableLiveData(false)
+    val searchFocused: LiveData<Boolean> get() = _searchFocused
 
     init {
         // 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>) {
-        _searchedGames.value = games
+        _searchedGames.postValue(games)
     }
 
     fun setShouldSwapData(shouldSwap: Boolean) {
-        _shouldSwapData.value = shouldSwap
+        _shouldSwapData.postValue(shouldSwap)
     }
 
     fun setShouldScrollToTop(shouldScroll: Boolean) {
-        _shouldScrollToTop.value = shouldScroll
+        _shouldScrollToTop.postValue(shouldScroll)
     }
 
     fun setSearchFocused(searchFocused: Boolean) {
-        _searchFocused.value = searchFocused
+        _searchFocused.postValue(searchFocused)
     }
 
     fun reloadGames(directoryChanged: Boolean) {
-        if (isReloading.value) {
+        if (isReloading.value == true) {
             return
         }
-        _isReloading.value = true
+        _isReloading.postValue(true)
 
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
                 NativeLibrary.resetRomMetadata()
                 setGames(GameHelper.getGames())
-                _isReloading.value = false
+                _isReloading.postValue(false)
 
                 if (directoryChanged) {
                     setShouldSwapData(true)

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeSetting.kt

@@ -3,8 +3,8 @@
 
 package org.yuzu.yuzu_emu.model
 
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 
 data class HomeSetting(
     val titleId: Int,
@@ -14,5 +14,5 @@ data class HomeSetting(
     val isEnabled: () -> Boolean = { true },
     val disabledTitleId: Int = 0,
     val disabledMessageId: Int = 0,
-    val details: StateFlow<String> = MutableStateFlow("")
+    val details: LiveData<String> = MutableLiveData("")
 )

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt

@@ -5,43 +5,47 @@ package org.yuzu.yuzu_emu.model
 
 import android.net.Uri
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 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.utils.GameHelper
 
 class HomeViewModel : ViewModel() {
-    val navigationVisible: StateFlow<Pair<Boolean, Boolean>> get() = _navigationVisible
-    private val _navigationVisible = MutableStateFlow(Pair(false, false))
+    private val _navigationVisible = MutableLiveData<Pair<Boolean, Boolean>>()
+    val navigationVisible: LiveData<Pair<Boolean, Boolean>> get() = _navigationVisible
 
-    val statusBarShadeVisible: StateFlow<Boolean> get() = _statusBarShadeVisible
-    private val _statusBarShadeVisible = MutableStateFlow(true)
+    private val _statusBarShadeVisible = MutableLiveData(true)
+    val statusBarShadeVisible: LiveData<Boolean> get() = _statusBarShadeVisible
 
-    val shouldPageForward: StateFlow<Boolean> get() = _shouldPageForward
-    private val _shouldPageForward = MutableStateFlow(false)
+    private val _shouldPageForward = MutableLiveData(false)
+    val shouldPageForward: LiveData<Boolean> get() = _shouldPageForward
 
-    val gamesDir: StateFlow<String> get() = _gamesDir
-    private val _gamesDir = MutableStateFlow(
+    private val _gamesDir = MutableLiveData(
         Uri.parse(
             PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
                 .getString(GameHelper.KEY_GAME_PATH, "")
         ).path ?: ""
     )
+    val gamesDir: LiveData<String> get() = _gamesDir
 
     var navigatedToSetup = false
 
+    init {
+        _navigationVisible.value = Pair(false, false)
+    }
+
     fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
-        if (navigationVisible.value.first == visible) {
+        if (_navigationVisible.value?.first == visible) {
             return
         }
         _navigationVisible.value = Pair(visible, animated)
     }
 
     fun setStatusBarShadeVisibility(visible: Boolean) {
-        if (statusBarShadeVisible.value == visible) {
+        if (_statusBarShadeVisible.value == visible) {
             return
         }
         _statusBarShadeVisible.value = visible

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt

@@ -3,43 +3,48 @@
 
 package org.yuzu.yuzu_emu.model
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 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.YuzuApplication
 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 shouldSave = false
 
     var clickedItem: SettingsItem? = null
 
-    val shouldRecreate: StateFlow<Boolean> get() = _shouldRecreate
-    private val _shouldRecreate = MutableStateFlow(false)
+    private val _toolbarTitle = MutableLiveData("")
+    val toolbarTitle: LiveData<String> get() = _toolbarTitle
 
-    val shouldNavigateBack: StateFlow<Boolean> get() = _shouldNavigateBack
-    private val _shouldNavigateBack = MutableStateFlow(false)
+    private val _shouldRecreate = MutableLiveData(false)
+    val shouldRecreate: LiveData<Boolean> get() = _shouldRecreate
 
-    val shouldShowResetSettingsDialog: StateFlow<Boolean> get() = _shouldShowResetSettingsDialog
-    private val _shouldShowResetSettingsDialog = MutableStateFlow(false)
+    private val _shouldNavigateBack = MutableLiveData(false)
+    val shouldNavigateBack: LiveData<Boolean> get() = _shouldNavigateBack
 
-    val shouldReloadSettingsList: StateFlow<Boolean> get() = _shouldReloadSettingsList
-    private val _shouldReloadSettingsList = MutableStateFlow(false)
+    private val _shouldShowResetSettingsDialog = MutableLiveData(false)
+    val shouldShowResetSettingsDialog: LiveData<Boolean> get() = _shouldShowResetSettingsDialog
 
-    val isUsingSearch: StateFlow<Boolean> get() = _isUsingSearch
-    private val _isUsingSearch = MutableStateFlow(false)
+    private val _shouldReloadSettingsList = MutableLiveData(false)
+    val shouldReloadSettingsList: LiveData<Boolean> get() = _shouldReloadSettingsList
 
-    val sliderProgress: StateFlow<Int> get() = _sliderProgress
-    private val _sliderProgress = MutableStateFlow(-1)
+    private val _isUsingSearch = MutableLiveData(false)
+    val isUsingSearch: LiveData<Boolean> get() = _isUsingSearch
 
-    val sliderTextValue: StateFlow<String> get() = _sliderTextValue
-    private val _sliderTextValue = MutableStateFlow("")
+    val sliderProgress = savedStateHandle.getStateFlow(KEY_SLIDER_PROGRESS, -1)
 
-    val adapterItemChanged: StateFlow<Int> get() = _adapterItemChanged
-    private val _adapterItemChanged = MutableStateFlow(-1)
+    val sliderTextValue = savedStateHandle.getStateFlow(KEY_SLIDER_TEXT_VALUE, "")
+
+    val adapterItemChanged = savedStateHandle.getStateFlow(KEY_ADAPTER_ITEM_CHANGED, -1)
+
+    fun setToolbarTitle(value: String) {
+        _toolbarTitle.value = value
+    }
 
     fun setShouldRecreate(value: Boolean) {
         _shouldRecreate.value = value
@@ -62,8 +67,8 @@ class SettingsViewModel : ViewModel() {
     }
 
     fun setSliderTextValue(value: Float, units: String) {
-        _sliderProgress.value = value.toInt()
-        _sliderTextValue.value = String.format(
+        savedStateHandle[KEY_SLIDER_PROGRESS] = value
+        savedStateHandle[KEY_SLIDER_TEXT_VALUE] = String.format(
             YuzuApplication.appContext.getString(R.string.value_with_units),
             value.toInt().toString(),
             units
@@ -71,15 +76,21 @@ class SettingsViewModel : ViewModel() {
     }
 
     fun setSliderProgress(value: Float) {
-        _sliderProgress.value = value.toInt()
+        savedStateHandle[KEY_SLIDER_PROGRESS] = value
     }
 
     fun setAdapterItemChanged(value: Int) {
-        _adapterItemChanged.value = value
+        savedStateHandle[KEY_ADAPTER_ITEM_CHANGED] = value
     }
 
     fun clear() {
         game = null
         shouldSave = false
     }
+
+    companion object {
+        const val KEY_SLIDER_TEXT_VALUE = "SliderTextValue"
+        const val KEY_SLIDER_PROGRESS = "SliderProgress"
+        const val KEY_ADAPTER_ITEM_CHANGED = "AdapterItemChanged"
+    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt

@@ -3,25 +3,29 @@
 
 package org.yuzu.yuzu_emu.model
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 
 class TaskViewModel : ViewModel() {
-    val result: StateFlow<Any> get() = _result
-    private val _result = MutableStateFlow(Any())
+    private val _result = MutableLiveData<Any>()
+    val result: LiveData<Any> = _result
 
-    val isComplete: StateFlow<Boolean> get() = _isComplete
-    private val _isComplete = MutableStateFlow(false)
+    private val _isComplete = MutableLiveData<Boolean>()
+    val isComplete: LiveData<Boolean> = _isComplete
 
-    val isRunning: StateFlow<Boolean> get() = _isRunning
-    private val _isRunning = MutableStateFlow(false)
+    private val _isRunning = MutableLiveData<Boolean>()
+    val isRunning: LiveData<Boolean> = _isRunning
 
     lateinit var task: () -> Any
 
+    init {
+        clear()
+    }
+
     fun clear() {
         _result.value = Any()
         _isComplete.value = false
@@ -29,16 +33,15 @@ class TaskViewModel : ViewModel() {
     }
 
     fun runTask() {
-        if (isRunning.value) {
+        if (_isRunning.value == true) {
             return
         }
         _isRunning.value = true
 
         viewModelScope.launch(Dispatchers.IO) {
             val res = task()
-            _result.value = res
-            _isComplete.value = true
-            _isRunning.value = false
+            _result.postValue(res)
+            _isComplete.postValue(true)
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.ui
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,12 +14,8 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 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.transition.MaterialFadeThrough
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.adapters.GameAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
@@ -49,8 +44,6 @@ class GamesFragment : Fragment() {
         return binding.root
     }
 
-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         homeViewModel.setNavigationVisibility(visible = true, animated = false)
 
@@ -87,19 +80,16 @@ class GamesFragment : Fragment() {
                 if (_binding == null) {
                     return@post
                 }
-                binding.swipeRefresh.isRefreshing = gamesViewModel.isReloading.value
+                binding.swipeRefresh.isRefreshing = gamesViewModel.isReloading.value!!
             }
         }
 
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.isReloading.collect { binding.swipeRefresh.isRefreshing = it }
+        gamesViewModel.apply {
+            // Watch for when we get updates to any of our games lists
+            isReloading.observe(viewLifecycleOwner) { isReloading ->
+                binding.swipeRefresh.isRefreshing = isReloading
             }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.games.collect {
+            games.observe(viewLifecycleOwner) {
                 (binding.gridGames.adapter as GameAdapter).submitList(it)
                 if (it.isEmpty()) {
                     binding.noticeText.visibility = View.VISIBLE
@@ -107,31 +97,23 @@ class GamesFragment : Fragment() {
                     binding.noticeText.visibility = View.GONE
                 }
             }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.shouldSwapData.collect {
-                        if (it) {
+            shouldSwapData.observe(viewLifecycleOwner) { shouldSwapData ->
+                if (shouldSwapData) {
                     (binding.gridGames.adapter as GameAdapter).submitList(
-                                gamesViewModel.games.value
+                        gamesViewModel.games.value!!
                     )
                     gamesViewModel.setShouldSwapData(false)
                 }
             }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.shouldScrollToTop.collect {
-                        if (it) {
+
+            // Check if the user reselected the games menu item and then scroll to top of the list
+            shouldScrollToTop.observe(viewLifecycleOwner) { shouldScroll ->
+                if (shouldScroll) {
                     scrollToTop()
                     gamesViewModel.setShouldScrollToTop(false)
                 }
             }
         }
-            }
-        }
 
         setInsets()
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -19,9 +19,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
@@ -42,6 +40,7 @@ import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 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.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.GamesViewModel
@@ -108,7 +107,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 R.id.homeSettingsFragment -> {
                     val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                         null,
-                        Settings.MenuTag.SECTION_ROOT
+                        SettingsFile.FILE_NAME_CONFIG
                     )
                     navHostFragment.navController.navigate(action)
                 }
@@ -116,22 +115,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         }
 
         // 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.statusBarShade.visibility = View.INVISIBLE
         }
 
-        lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.navigationVisible.collect { showNavigation(it.first, it.second) }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.statusBarShadeVisible.collect { showStatusBarShade(it) }
-                }
+        homeViewModel.navigationVisible.observe(this) {
+            showNavigation(it.first, it.second)
         }
+        homeViewModel.statusBarShadeVisible.observe(this) { visible ->
+            showStatusBarShade(visible)
         }
 
         // Dismiss previous notifications (should not happen unless a crash occurred)

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt

@@ -6,11 +6,9 @@ package org.yuzu.yuzu_emu.utils
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.widget.ImageView
-import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
 import coil.ImageLoader
 import coil.decode.DataSource
-import coil.executeBlocking
 import coil.fetch.DrawableResult
 import coil.fetch.FetchResult
 import coil.fetch.Fetcher
@@ -76,13 +74,4 @@ object GameIconUtils {
             .build()
         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)
-    }
 }

src/android/app/src/main/jni/native.cpp

@@ -262,12 +262,14 @@ public:
     Core::SystemResultStatus InitializeEmulation(const std::string& filepath) {
         std::scoped_lock lock(m_mutex);
 
+        // Loads the configuration.
+        Config{};
+
         // Create the render window.
         m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window,
                                                        m_vulkan_library);
 
         m_system.SetFilesystem(m_vfs);
-        m_system.GetUserChannel().clear();
 
         // Initialize system.
         jauto android_keyboard = std::make_unique<SoftwareKeyboard::AndroidKeyboard>();
@@ -327,13 +329,12 @@ public:
             m_system.ShutdownMainProcess();
             m_detached_tasks.WaitForAllTasks();
             m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
-            m_window.reset();
-            OnEmulationStopped(Core::SystemResultStatus::Success);
-            return;
         }
 
         // Tear down the render window.
         m_window.reset();
+
+        OnEmulationStopped(m_load_result);
     }
 
     void PauseEmulation() {
@@ -670,6 +671,18 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass claz
     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) {
     return EmulationSession::GetInstance().IsHandheldOnly();
 }

src/android/app/src/main/res/drawable/shortcut.xml

@@ -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>

src/android/app/src/main/res/navigation/emulation_navigation.xml

@@ -27,7 +27,7 @@
             app:nullable="true" />
         <argument
             android:name="menuTag"
-            app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
+            app:argType="string" />
     </activity>
 
     <action

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -82,7 +82,7 @@
             app:nullable="true" />
         <argument
             android:name="menuTag"
-            app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
+            app:argType="string" />
     </activity>
 
     <action

src/android/app/src/main/res/navigation/settings_navigation.xml

@@ -10,7 +10,7 @@
         android:label="SettingsFragment">
         <argument
             android:name="menuTag"
-            app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
+            app:argType="string" />
         <argument
             android:name="game"
             app:argType="org.yuzu.yuzu_emu.model.Game"

src/android/app/src/main/res/values/dimens.xml

@@ -12,7 +12,6 @@
     <dimen name="spacing_refresh_end">72dp</dimen>
     <dimen name="menu_width">256dp</dimen>
     <dimen name="card_width">165dp</dimen>
-    <dimen name="icon_inset">24dp</dimen>
 
     <dimen name="dialog_margin">20dp</dimen>
     <dimen name="elevated_app_bar">3dp</dimen>

src/audio_core/CMakeLists.txt

@@ -2,14 +2,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 add_library(audio_core STATIC
-    adsp/adsp.cpp
-    adsp/adsp.h
-    adsp/mailbox.h
-    adsp/apps/audio_renderer/audio_renderer.cpp
-    adsp/apps/audio_renderer/audio_renderer.h
-    adsp/apps/audio_renderer/command_buffer.h
-    adsp/apps/audio_renderer/command_list_processor.cpp
-    adsp/apps/audio_renderer/command_list_processor.h
     audio_core.cpp
     audio_core.h
     audio_event.h
@@ -40,6 +32,13 @@ add_library(audio_core STATIC
     out/audio_out_system.cpp
     out/audio_out_system.h
     precompiled_headers.h
+    renderer/adsp/adsp.cpp
+    renderer/adsp/adsp.h
+    renderer/adsp/audio_renderer.cpp
+    renderer/adsp/audio_renderer.h
+    renderer/adsp/command_buffer.h
+    renderer/adsp/command_list_processor.cpp
+    renderer/adsp/command_list_processor.h
     renderer/audio_device.cpp
     renderer/audio_device.h
     renderer/audio_renderer.h

src/audio_core/adsp/adsp.cpp

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "audio_core/adsp/adsp.h"
-#include "core/core.h"
-
-namespace AudioCore::ADSP {
-
-ADSP::ADSP(Core::System& system, Sink::Sink& sink) {
-    audio_renderer =
-        std::make_unique<AudioRenderer::AudioRenderer>(system, system.ApplicationMemory(), sink);
-}
-
-AudioRenderer::AudioRenderer& ADSP::AudioRenderer() {
-    return *audio_renderer.get();
-}
-
-} // namespace AudioCore::ADSP

src/audio_core/adsp/adsp.h

@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "audio_core/adsp/apps/audio_renderer/audio_renderer.h"
-#include "common/common_types.h"
-
-namespace Core {
-class System;
-} // namespace Core
-
-namespace AudioCore {
-namespace Sink {
-class Sink;
-}
-
-namespace ADSP {
-
-/**
- * Represents the ADSP embedded within the audio sysmodule.
- * This is a 32-bit Linux4Tegra kernel from nVidia, which is launched with the sysmodule on boot.
- *
- * The kernel will run the apps you write for it, Nintendo have the following:
- *
- * Gmix - Responsible for mixing final audio and sending it out to hardware. This is last place all
- *        audio samples end up, and we skip it entirely, since we have very different backends and
- *        mixing is implicitly handled by the OS (but also due to lack of research/simplicity).
- *
- * AudioRenderer - Receives command lists generated by the audio render
- *                 system on the host, processes them, and sends the samples to Gmix.
- *
- * OpusDecoder - Contains libopus, and decodes Opus audio packets into raw pcm data.
- *
- * Communication between the host and ADSP is done through mailboxes, and mapping of shared memory.
- */
-class ADSP {
-public:
-    explicit ADSP(Core::System& system, Sink::Sink& sink);
-    ~ADSP() = default;
-
-    AudioRenderer::AudioRenderer& AudioRenderer();
-
-private:
-    /// AudioRenderer app
-    std::unique_ptr<AudioRenderer::AudioRenderer> audio_renderer{};
-};
-
-} // namespace ADSP
-} // namespace AudioCore

src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp

@@ -1,220 +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/audio_renderer/audio_renderer.h"
-#include "audio_core/audio_core.h"
-#include "audio_core/common/common.h"
-#include "audio_core/sink/sink.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(Audio_Renderer, "Audio", "DSP", MP_RGB(60, 19, 97));
-
-namespace AudioCore::ADSP::AudioRenderer {
-
-AudioRenderer::AudioRenderer(Core::System& system_, Core::Memory::Memory& memory_,
-                             Sink::Sink& sink_)
-    : system{system_}, memory{memory_}, sink{sink_} {}
-
-AudioRenderer::~AudioRenderer() {
-    Stop();
-}
-
-void AudioRenderer::Start() {
-    CreateSinkStreams();
-
-    mailbox.Initialize(AppMailboxId::AudioRenderer);
-
-    main_thread = std::jthread([this](std::stop_token stop_token) { Main(stop_token); });
-
-    mailbox.Send(Direction::DSP, {Message::InitializeOK, {}});
-    if (mailbox.Receive(Direction::Host).msg != Message::InitializeOK) {
-        LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
-                                 "message response from ADSP!");
-        return;
-    }
-    running = true;
-}
-
-void AudioRenderer::Stop() {
-    if (!running) {
-        return;
-    }
-
-    mailbox.Send(Direction::DSP, {Message::Shutdown, {}});
-    if (mailbox.Receive(Direction::Host).msg != Message::Shutdown) {
-        LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
-                                 "message response from ADSP!");
-    }
-    main_thread.request_stop();
-    main_thread.join();
-
-    for (auto& stream : streams) {
-        if (stream) {
-            stream->Stop();
-            sink.CloseStream(stream);
-            stream = nullptr;
-        }
-    }
-    running = false;
-}
-
-void AudioRenderer::Signal() {
-    signalled_tick = system.CoreTiming().GetGlobalTimeNs().count();
-    Send(Direction::DSP, {Message::Render, {}});
-}
-
-void AudioRenderer::Wait() {
-    auto received = Receive(Direction::Host);
-    if (received.msg != Message::RenderResponse) {
-        LOG_ERROR(Service_Audio,
-                  "Did not receive the expected render response from the AudioRenderer! Expected "
-                  "{}, got {}",
-                  Message::RenderResponse, received.msg);
-    }
-}
-
-void AudioRenderer::Send(Direction dir, MailboxMessage message) {
-    mailbox.Send(dir, std::move(message));
-}
-
-MailboxMessage AudioRenderer::Receive(Direction dir, bool block) {
-    return mailbox.Receive(dir, block);
-}
-
-void AudioRenderer::SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
-                                     u64 applet_resource_user_id, bool reset) noexcept {
-    command_buffers[session_id].buffer = buffer;
-    command_buffers[session_id].size = size;
-    command_buffers[session_id].time_limit = time_limit;
-    command_buffers[session_id].applet_resource_user_id = applet_resource_user_id;
-    command_buffers[session_id].reset_buffer = reset;
-}
-
-u32 AudioRenderer::GetRemainCommandCount(s32 session_id) const noexcept {
-    return command_buffers[session_id].remaining_command_count;
-}
-
-void AudioRenderer::ClearRemainCommandCount(s32 session_id) noexcept {
-    command_buffers[session_id].remaining_command_count = 0;
-}
-
-u64 AudioRenderer::GetRenderingStartTick(s32 session_id) const noexcept {
-    return (1000 * command_buffers[session_id].render_time_taken_us) + signalled_tick;
-}
-
-void AudioRenderer::CreateSinkStreams() {
-    u32 channels{sink.GetDeviceChannels()};
-    for (u32 i = 0; i < MaxRendererSessions; i++) {
-        std::string name{fmt::format("ADSP_RenderStream-{}", i)};
-        streams[i] =
-            sink.AcquireSinkStream(system, channels, name, ::AudioCore::Sink::StreamType::Render);
-        streams[i]->SetRingSize(4);
-    }
-}
-
-void AudioRenderer::Main(std::stop_token stop_token) {
-    static constexpr char name[]{"AudioRenderer"};
-    MicroProfileOnThreadCreate(name);
-    Common::SetCurrentThreadName(name);
-    Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
-
-    // TODO: Create buffer map/unmap thread + mailbox
-    // TODO: Create gMix devices, initialize them here
-
-    if (mailbox.Receive(Direction::DSP).msg != Message::InitializeOK) {
-        LOG_ERROR(Service_Audio,
-                  "ADSP Audio Renderer -- Failed to receive initialize message from host!");
-        return;
-    }
-
-    mailbox.Send(Direction::Host, {Message::InitializeOK, {}});
-
-    // 0.12 seconds (2,304,000 / 19,200,000)
-    constexpr u64 max_process_time{2'304'000ULL};
-
-    while (!stop_token.stop_requested()) {
-        auto received{mailbox.Receive(Direction::DSP)};
-        switch (received.msg) {
-        case Message::Shutdown:
-            mailbox.Send(Direction::Host, {Message::Shutdown, {}});
-            return;
-
-        case Message::Render: {
-            if (system.IsShuttingDown()) [[unlikely]] {
-                std::this_thread::sleep_for(std::chrono::milliseconds(5));
-                mailbox.Send(Direction::Host, {Message::RenderResponse, {}});
-                continue;
-            }
-            std::array<bool, MaxRendererSessions> buffers_reset{};
-            std::array<u64, MaxRendererSessions> render_times_taken{};
-            const auto start_time{system.CoreTiming().GetGlobalTimeUs().count()};
-
-            for (u32 index = 0; index < MaxRendererSessions; index++) {
-                auto& command_buffer{command_buffers[index]};
-                auto& command_list_processor{command_list_processors[index]};
-
-                // Check this buffer is valid, as it may not be used.
-                if (command_buffer.buffer != 0) {
-                    // If there are no remaining commands (from the previous list),
-                    // this is a new command list, initialize it.
-                    if (command_buffer.remaining_command_count == 0) {
-                        command_list_processor.Initialize(system, command_buffer.buffer,
-                                                          command_buffer.size, streams[index]);
-                    }
-
-                    if (command_buffer.reset_buffer && !buffers_reset[index]) {
-                        streams[index]->ClearQueue();
-                        buffers_reset[index] = true;
-                    }
-
-                    u64 max_time{max_process_time};
-                    if (index == 1 && command_buffer.applet_resource_user_id ==
-                                          command_buffers[0].applet_resource_user_id) {
-                        max_time = max_process_time - render_times_taken[0];
-                        if (render_times_taken[0] > max_process_time) {
-                            max_time = 0;
-                        }
-                    }
-
-                    max_time = std::min(command_buffer.time_limit, max_time);
-                    command_list_processor.SetProcessTimeMax(max_time);
-
-                    if (index == 0) {
-                        streams[index]->WaitFreeSpace(stop_token);
-                    }
-
-                    // Process the command list
-                    {
-                        MICROPROFILE_SCOPE(Audio_Renderer);
-                        render_times_taken[index] =
-                            command_list_processor.Process(index) - start_time;
-                    }
-
-                    const auto end_time{system.CoreTiming().GetGlobalTimeUs().count()};
-
-                    command_buffer.remaining_command_count =
-                        command_list_processor.GetRemainingCommandCount();
-                    command_buffer.render_time_taken_us = end_time - start_time;
-                }
-            }
-
-            mailbox.Send(Direction::Host, {Message::RenderResponse, {}});
-        } break;
-
-        default:
-            LOG_WARNING(Service_Audio,
-                        "ADSP AudioRenderer received an invalid message, msg={:02X}!",
-                        received.msg);
-            break;
-        }
-    }
-}
-
-} // namespace AudioCore::ADSP::AudioRenderer

src/audio_core/adsp/apps/audio_renderer/audio_renderer.h

@@ -1,116 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include <memory>
-#include <thread>
-
-#include "audio_core/adsp/apps/audio_renderer/command_buffer.h"
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
-#include "audio_core/adsp/mailbox.h"
-#include "common/common_types.h"
-#include "common/polyfill_thread.h"
-#include "common/reader_writer_queue.h"
-#include "common/thread.h"
-
-namespace Core {
-class System;
-namespace Timing {
-struct EventType;
-}
-namespace Memory {
-class Memory;
-}
-class System;
-} // namespace Core
-
-namespace AudioCore {
-namespace Sink {
-class Sink;
-}
-
-namespace ADSP::AudioRenderer {
-
-enum Message : u32 {
-    Invalid = 0x00,
-    MapUnmap_Map = 0x01,
-    MapUnmap_MapResponse = 0x02,
-    MapUnmap_Unmap = 0x03,
-    MapUnmap_UnmapResponse = 0x04,
-    MapUnmap_InvalidateCache = 0x05,
-    MapUnmap_InvalidateCacheResponse = 0x06,
-    MapUnmap_Shutdown = 0x07,
-    MapUnmap_ShutdownResponse = 0x08,
-    InitializeOK = 0x16,
-    RenderResponse = 0x20,
-    Render = 0x2A,
-    Shutdown = 0x34,
-};
-
-/**
- * The AudioRenderer application running on the ADSP.
- */
-class AudioRenderer {
-public:
-    explicit AudioRenderer(Core::System& system, Core::Memory::Memory& memory, Sink::Sink& sink);
-    ~AudioRenderer();
-
-    /**
-     * Start the AudioRenderer.
-     *
-     * @param mailbox The mailbox to use for this session.
-     */
-    void Start();
-
-    /**
-     * Stop the AudioRenderer.
-     */
-    void Stop();
-
-    void Signal();
-    void Wait();
-
-    void Send(Direction dir, MailboxMessage message);
-    MailboxMessage Receive(Direction dir, bool block = true);
-
-    void SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
-                          u64 applet_resource_user_id, bool reset) noexcept;
-    u32 GetRemainCommandCount(s32 session_id) const noexcept;
-    void ClearRemainCommandCount(s32 session_id) noexcept;
-    u64 GetRenderingStartTick(s32 session_id) const noexcept;
-
-private:
-    /**
-     * Main AudioRenderer thread, responsible for processing the command lists.
-     */
-    void Main(std::stop_token stop_token);
-
-    /**
-     * Creates the streams which will receive the processed samples.
-     */
-    void CreateSinkStreams();
-
-    /// Core system
-    Core::System& system;
-    /// Memory
-    Core::Memory::Memory& memory;
-    /// The output sink the AudioRenderer will use
-    Sink::Sink& sink;
-    /// The active mailbox
-    Mailbox mailbox;
-    /// Main thread
-    std::jthread main_thread{};
-    /// The current state
-    std::atomic<bool> running{};
-    std::array<CommandBuffer, MaxRendererSessions> command_buffers{};
-    /// The command lists to process
-    std::array<CommandListProcessor, MaxRendererSessions> command_list_processors{};
-    /// The streams which will receive the processed samples
-    std::array<Sink::SinkStream*, MaxRendererSessions> streams{};
-    u64 signalled_tick{0};
-};
-
-} // namespace ADSP::AudioRenderer
-} // namespace AudioCore

src/audio_core/adsp/apps/audio_renderer/command_buffer.h

@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "audio_core/common/common.h"
-#include "common/common_types.h"
-
-namespace AudioCore::ADSP::AudioRenderer {
-
-struct CommandBuffer {
-    // Set by the host
-    CpuAddr buffer{};
-    u64 size{};
-    u64 time_limit{};
-    u64 applet_resource_user_id{};
-    bool reset_buffer{};
-    // Set by the DSP
-    u32 remaining_command_count{};
-    u64 render_time_taken_us{};
-};
-
-} // namespace AudioCore::ADSP::AudioRenderer

src/audio_core/adsp/mailbox.h

@@ -1,69 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/bounded_threadsafe_queue.h"
-#include "common/common_types.h"
-
-namespace AudioCore::ADSP {
-
-enum class AppMailboxId : u32 {
-    Invalid = 0,
-    AudioRenderer = 50,
-    AudioRendererMemoryMapUnmap = 51,
-};
-
-enum class Direction : u32 {
-    Host,
-    DSP,
-};
-
-struct MailboxMessage {
-    u32 msg;
-    std::span<u8> data;
-};
-
-class Mailbox {
-public:
-    void Initialize(AppMailboxId id_) {
-        Reset();
-        id = id_;
-    }
-
-    AppMailboxId Id() const noexcept {
-        return id;
-    }
-
-    void Send(Direction dir, MailboxMessage&& message) {
-        auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
-        queue.EmplaceWait(std::move(message));
-    }
-
-    MailboxMessage Receive(Direction dir, bool block = true) {
-        auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
-        MailboxMessage t;
-        if (block) {
-            queue.PopWait(t);
-        } else {
-            queue.TryPop(t);
-        }
-        return t;
-    }
-
-    void Reset() {
-        id = AppMailboxId::Invalid;
-        MailboxMessage t;
-        while (host_queue.TryPop(t)) {
-        }
-        while (adsp_queue.TryPop(t)) {
-        }
-    }
-
-private:
-    AppMailboxId id{0};
-    Common::SPSCQueue<MailboxMessage> host_queue;
-    Common::SPSCQueue<MailboxMessage> adsp_queue;
-};
-
-} // namespace AudioCore::ADSP

src/audio_core/audio_core.cpp

@@ -11,7 +11,7 @@ namespace AudioCore {
 AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {
     CreateSinks();
     // Must be created after the sinks
-    adsp = std::make_unique<ADSP::ADSP>(system, *output_sink);
+    adsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink);
 }
 
 AudioCore ::~AudioCore() {
@@ -43,7 +43,7 @@ Sink::Sink& AudioCore::GetInputSink() {
     return *input_sink;
 }
 
-ADSP::ADSP& AudioCore::ADSP() {
+AudioRenderer::ADSP::ADSP& AudioCore::GetADSP() {
     return *adsp;
 }
 

src/audio_core/audio_core.h

@@ -5,8 +5,8 @@
 
 #include <memory>
 
-#include "audio_core/adsp/adsp.h"
 #include "audio_core/audio_manager.h"
+#include "audio_core/renderer/adsp/adsp.h"
 #include "audio_core/sink/sink.h"
 
 namespace Core {
@@ -55,7 +55,7 @@ public:
      *
      * @return Ref to the ADSP.
      */
-    ADSP::ADSP& ADSP();
+    AudioRenderer::ADSP::ADSP& GetADSP();
 
 private:
     /**
@@ -70,7 +70,7 @@ private:
     /// Sink used for audio input
     std::unique_ptr<Sink::Sink> input_sink;
     /// The ADSP in the sysmodule
-    std::unique_ptr<ADSP::ADSP> adsp;
+    std::unique_ptr<AudioRenderer::ADSP::ADSP> adsp;
 };
 
 } // namespace AudioCore

src/audio_core/audio_event.cpp

@@ -20,6 +20,7 @@ size_t Event::GetManagerIndex(const Type type) const {
     default:
         UNREACHABLE();
     }
+    return 3;
 }
 
 void Event::SetAudioEvent(const Type type, const bool signalled) {

src/audio_core/audio_in_manager.cpp

@@ -73,7 +73,7 @@ void Manager::BufferReleaseAndRegister() {
     }
 }
 
-u32 Manager::GetDeviceNames(std::vector<Renderer::AudioDevice::AudioDeviceName>& names,
+u32 Manager::GetDeviceNames(std::vector<AudioRenderer::AudioDevice::AudioDeviceName>& names,
                             [[maybe_unused]] const u32 max_count,
                             [[maybe_unused]] const bool filter) {
     std::scoped_lock l{mutex};

src/audio_core/audio_in_manager.h

@@ -65,8 +65,8 @@ public:
      *
      * @return Number of names written.
      */
-    u32 GetDeviceNames(std::vector<Renderer::AudioDevice::AudioDeviceName>& names, u32 max_count,
-                       bool filter);
+    u32 GetDeviceNames(std::vector<AudioRenderer::AudioDevice::AudioDeviceName>& names,
+                       u32 max_count, bool filter);
 
     /// Core system
     Core::System& system;

src/audio_core/audio_out_manager.cpp

@@ -73,7 +73,7 @@ void Manager::BufferReleaseAndRegister() {
 }
 
 u32 Manager::GetAudioOutDeviceNames(
-    std::vector<Renderer::AudioDevice::AudioDeviceName>& names) const {
+    std::vector<AudioRenderer::AudioDevice::AudioDeviceName>& names) const {
     names.emplace_back("DeviceOut");
     return 1;
 }

src/audio_core/audio_out_manager.h

@@ -61,7 +61,8 @@ public:
      * @param names     - Output container to write names to.
      * @return Number of names written.
      */
-    u32 GetAudioOutDeviceNames(std::vector<Renderer::AudioDevice::AudioDeviceName>& names) const;
+    u32 GetAudioOutDeviceNames(
+        std::vector<AudioRenderer::AudioDevice::AudioDeviceName>& names) const;
 
     /// Core system
     Core::System& system;

src/audio_core/audio_render_manager.cpp

@@ -6,7 +6,7 @@
 #include "audio_core/common/feature_support.h"
 #include "core/core.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 Manager::Manager(Core::System& system_)
     : system{system_}, system_manager{std::make_unique<SystemManager>(system)} {
@@ -67,4 +67,4 @@ bool Manager::RemoveSystem(System& system_) {
     return system_manager->Remove(system_);
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/audio_render_manager.h

@@ -20,7 +20,7 @@ class System;
 namespace AudioCore {
 struct AudioRendererParameterInternal;
 
-namespace Renderer {
+namespace AudioRenderer {
 /**
  * Wrapper for the audio system manager, handles service calls.
  */
@@ -101,5 +101,5 @@ private:
     std::unique_ptr<SystemManager> system_manager{};
 };
 
-} // namespace Renderer
+} // namespace AudioRenderer
 } // namespace AudioCore

src/audio_core/common/audio_renderer_parameter.h

@@ -51,10 +51,10 @@ struct AudioRendererSystemContext {
     s32 session_id;
     s8 channels;
     s16 mix_buffer_count;
-    Renderer::BehaviorInfo* behavior;
+    AudioRenderer::BehaviorInfo* behavior;
     std::span<s32> depop_buffer;
-    Renderer::UpsamplerManager* upsampler_manager;
-    Renderer::MemoryPoolInfo* memory_pool_info;
+    AudioRenderer::UpsamplerManager* upsampler_manager;
+    AudioRenderer::MemoryPoolInfo* memory_pool_info;
 };
 
 } // namespace AudioCore

src/audio_core/renderer/adsp/adsp.cpp

@@ -0,0 +1,117 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "audio_core/renderer/adsp/adsp.h"
+#include "audio_core/renderer/adsp/command_buffer.h"
+#include "audio_core/sink/sink.h"
+#include "common/logging/log.h"
+#include "core/core.h"
+#include "core/core_timing.h"
+#include "core/memory.h"
+
+namespace AudioCore::AudioRenderer::ADSP {
+
+ADSP::ADSP(Core::System& system_, Sink::Sink& sink_)
+    : system{system_}, memory{system.ApplicationMemory()}, sink{sink_} {}
+
+ADSP::~ADSP() {
+    ClearCommandBuffers();
+}
+
+State ADSP::GetState() const {
+    if (running) {
+        return State::Started;
+    }
+    return State::Stopped;
+}
+
+AudioRenderer_Mailbox* ADSP::GetRenderMailbox() {
+    return &render_mailbox;
+}
+
+void ADSP::ClearRemainCount(const u32 session_id) {
+    render_mailbox.ClearRemainCount(session_id);
+}
+
+u64 ADSP::GetSignalledTick() const {
+    return render_mailbox.GetSignalledTick();
+}
+
+u64 ADSP::GetTimeTaken() const {
+    return render_mailbox.GetRenderTimeTaken();
+}
+
+u64 ADSP::GetRenderTimeTaken(const u32 session_id) {
+    return render_mailbox.GetCommandBuffer(session_id).render_time_taken;
+}
+
+u32 ADSP::GetRemainCommandCount(const u32 session_id) const {
+    return render_mailbox.GetRemainCommandCount(session_id);
+}
+
+void ADSP::SendCommandBuffer(const u32 session_id, const CommandBuffer& command_buffer) {
+    render_mailbox.SetCommandBuffer(session_id, command_buffer);
+}
+
+u64 ADSP::GetRenderingStartTick(const u32 session_id) {
+    return render_mailbox.GetSignalledTick() +
+           render_mailbox.GetCommandBuffer(session_id).render_time_taken;
+}
+
+bool ADSP::Start() {
+    if (running) {
+        return running;
+    }
+
+    running = true;
+    systems_active++;
+    audio_renderer = std::make_unique<AudioRenderer>(system);
+    audio_renderer->Start(&render_mailbox);
+    render_mailbox.HostSendMessage(RenderMessage::AudioRenderer_InitializeOK);
+    if (render_mailbox.HostWaitMessage() != RenderMessage::AudioRenderer_InitializeOK) {
+        LOG_ERROR(
+            Service_Audio,
+            "Host Audio Renderer -- Failed to receive initialize message response from ADSP!");
+    }
+    return running;
+}
+
+void ADSP::Stop() {
+    systems_active--;
+    if (running && systems_active == 0) {
+        {
+            std::scoped_lock l{mailbox_lock};
+            render_mailbox.HostSendMessage(RenderMessage::AudioRenderer_Shutdown);
+            if (render_mailbox.HostWaitMessage() != RenderMessage::AudioRenderer_Shutdown) {
+                LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
+                                         "message response from ADSP!");
+            }
+        }
+        audio_renderer->Stop();
+        running = false;
+    }
+}
+
+void ADSP::Signal() {
+    const auto signalled_tick{system.CoreTiming().GetClockTicks()};
+    render_mailbox.SetSignalledTick(signalled_tick);
+    render_mailbox.HostSendMessage(RenderMessage::AudioRenderer_Render);
+}
+
+void ADSP::Wait() {
+    std::scoped_lock l{mailbox_lock};
+    auto response{render_mailbox.HostWaitMessage()};
+    if (response != RenderMessage::AudioRenderer_RenderResponse) {
+        LOG_ERROR(Service_Audio, "Invalid ADSP response message, expected 0x{:02X}, got 0x{:02X}",
+                  static_cast<u32>(RenderMessage::AudioRenderer_RenderResponse),
+                  static_cast<u32>(response));
+    }
+
+    ClearCommandBuffers();
+}
+
+void ADSP::ClearCommandBuffers() {
+    render_mailbox.ClearCommandBuffers();
+}
+
+} // namespace AudioCore::AudioRenderer::ADSP

src/audio_core/renderer/adsp/adsp.h

@@ -0,0 +1,171 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <memory>
+#include <mutex>
+
+#include "audio_core/renderer/adsp/audio_renderer.h"
+#include "common/common_types.h"
+
+namespace Core {
+namespace Memory {
+class Memory;
+}
+class System;
+} // namespace Core
+
+namespace AudioCore {
+namespace Sink {
+class Sink;
+}
+
+namespace AudioRenderer::ADSP {
+struct CommandBuffer;
+
+enum class State {
+    Started,
+    Stopped,
+};
+
+/**
+ * Represents the ADSP embedded within the audio sysmodule.
+ * This is a 32-bit Linux4Tegra kernel from nVidia, which is launched with the sysmodule on boot.
+ *
+ * The kernel will run apps you program for it, Nintendo have the following:
+ *
+ * Gmix - Responsible for mixing final audio and sending it out to hardware. This is last place all
+ *        audio samples end up, and we skip it entirely, since we have very different backends and
+ *        mixing is implicitly handled by the OS (but also due to lack of research/simplicity).
+ *
+ * AudioRenderer - Receives command lists generated by the audio render
+ *                 system, processes them, and sends the samples to Gmix.
+ *
+ * OpusDecoder - Contains libopus, and controls processing Opus audio and sends it to Gmix.
+ *               Not much research done here, TODO if needed.
+ *
+ * We only implement the AudioRenderer for now.
+ *
+ * Communication for the apps is done through mailboxes, and some shared memory.
+ */
+class ADSP {
+public:
+    explicit ADSP(Core::System& system, Sink::Sink& sink);
+    ~ADSP();
+
+    /**
+     * Start the ADSP.
+     *
+     * @return True if started or already running, otherwise false.
+     */
+    bool Start();
+
+    /**
+     * Stop the ADSP.
+     */
+    void Stop();
+
+    /**
+     * Get the ADSP's state.
+     *
+     * @return Started or Stopped.
+     */
+    State GetState() const;
+
+    /**
+     * Get the AudioRenderer mailbox to communicate with it.
+     *
+     * @return The AudioRenderer mailbox.
+     */
+    AudioRenderer_Mailbox* GetRenderMailbox();
+
+    /**
+     * Get the tick the ADSP was signalled.
+     *
+     * @return The tick the ADSP was signalled.
+     */
+    u64 GetSignalledTick() const;
+
+    /**
+     * Get the total time it took for the ADSP to run the last command lists (both command lists).
+     *
+     * @return The tick the ADSP was signalled.
+     */
+    u64 GetTimeTaken() const;
+
+    /**
+     * Get the last time a given command list took to run.
+     *
+     * @param session_id - The session id to check (0 or 1).
+     * @return The time it took.
+     */
+    u64 GetRenderTimeTaken(u32 session_id);
+
+    /**
+     * Clear the remaining command count for a given session.
+     *
+     * @param session_id - The session id to check (0 or 1).
+     */
+    void ClearRemainCount(u32 session_id);
+
+    /**
+     * Get the remaining number of commands left to process for a command list.
+     *
+     * @param session_id - The session id to check (0 or 1).
+     * @return The number of commands remaining.
+     */
+    u32 GetRemainCommandCount(u32 session_id) const;
+
+    /**
+     * Get the last tick a command list started processing.
+     *
+     * @param session_id - The session id to check (0 or 1).
+     * @return The last tick the given command list started.
+     */
+    u64 GetRenderingStartTick(u32 session_id);
+
+    /**
+     * Set a command buffer to be processed.
+     *
+     * @param session_id     - The session id to check (0 or 1).
+     * @param command_buffer - The command buffer to process.
+     */
+    void SendCommandBuffer(u32 session_id, const CommandBuffer& command_buffer);
+
+    /**
+     * Clear the command buffers (does not clear the time taken or the remaining command count)
+     */
+    void ClearCommandBuffers();
+
+    /**
+     * Signal the AudioRenderer to begin processing.
+     */
+    void Signal();
+
+    /**
+     * Wait for the AudioRenderer to finish processing.
+     */
+    void Wait();
+
+private:
+    /// Core system
+    Core::System& system;
+    /// Core memory
+    Core::Memory::Memory& memory;
+    /// Number of systems active, used to prevent accidental shutdowns
+    u8 systems_active{0};
+    /// ADSP running state
+    std::atomic<bool> running{false};
+    /// Output sink used by the ADSP
+    Sink::Sink& sink;
+    /// AudioRenderer app
+    std::unique_ptr<AudioRenderer> audio_renderer{};
+    /// Communication for the AudioRenderer
+    AudioRenderer_Mailbox render_mailbox{};
+    /// Mailbox lock ffor the render mailbox
+    std::mutex mailbox_lock;
+};
+
+} // namespace AudioRenderer::ADSP
+} // namespace AudioCore

src/audio_core/renderer/adsp/audio_renderer.cpp

@@ -0,0 +1,225 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <array>
+#include <chrono>
+
+#include "audio_core/audio_core.h"
+#include "audio_core/common/common.h"
+#include "audio_core/renderer/adsp/audio_renderer.h"
+#include "audio_core/sink/sink.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(Audio_Renderer, "Audio", "DSP", MP_RGB(60, 19, 97));
+
+namespace AudioCore::AudioRenderer::ADSP {
+
+void AudioRenderer_Mailbox::HostSendMessage(RenderMessage message_) {
+    adsp_messages.enqueue(message_);
+    adsp_event.Set();
+}
+
+RenderMessage AudioRenderer_Mailbox::HostWaitMessage() {
+    host_event.Wait();
+    RenderMessage msg{RenderMessage::Invalid};
+    if (!host_messages.try_dequeue(msg)) {
+        LOG_ERROR(Service_Audio, "Failed to dequeue host message!");
+    }
+    return msg;
+}
+
+void AudioRenderer_Mailbox::ADSPSendMessage(const RenderMessage message_) {
+    host_messages.enqueue(message_);
+    host_event.Set();
+}
+
+RenderMessage AudioRenderer_Mailbox::ADSPWaitMessage() {
+    adsp_event.Wait();
+    RenderMessage msg{RenderMessage::Invalid};
+    if (!adsp_messages.try_dequeue(msg)) {
+        LOG_ERROR(Service_Audio, "Failed to dequeue ADSP message!");
+    }
+    return msg;
+}
+
+CommandBuffer& AudioRenderer_Mailbox::GetCommandBuffer(const u32 session_id) {
+    return command_buffers[session_id];
+}
+
+void AudioRenderer_Mailbox::SetCommandBuffer(const u32 session_id, const CommandBuffer& buffer) {
+    command_buffers[session_id] = buffer;
+}
+
+u64 AudioRenderer_Mailbox::GetRenderTimeTaken() const {
+    return command_buffers[0].render_time_taken + command_buffers[1].render_time_taken;
+}
+
+u64 AudioRenderer_Mailbox::GetSignalledTick() const {
+    return signalled_tick;
+}
+
+void AudioRenderer_Mailbox::SetSignalledTick(const u64 tick) {
+    signalled_tick = tick;
+}
+
+void AudioRenderer_Mailbox::ClearRemainCount(const u32 session_id) {
+    command_buffers[session_id].remaining_command_count = 0;
+}
+
+u32 AudioRenderer_Mailbox::GetRemainCommandCount(const u32 session_id) const {
+    return command_buffers[session_id].remaining_command_count;
+}
+
+void AudioRenderer_Mailbox::ClearCommandBuffers() {
+    command_buffers[0].buffer = 0;
+    command_buffers[0].size = 0;
+    command_buffers[0].reset_buffers = false;
+    command_buffers[1].buffer = 0;
+    command_buffers[1].size = 0;
+    command_buffers[1].reset_buffers = false;
+}
+
+AudioRenderer::AudioRenderer(Core::System& system_)
+    : system{system_}, sink{system.AudioCore().GetOutputSink()} {
+    CreateSinkStreams();
+}
+
+AudioRenderer::~AudioRenderer() {
+    Stop();
+    for (auto& stream : streams) {
+        if (stream) {
+            sink.CloseStream(stream);
+        }
+        stream = nullptr;
+    }
+}
+
+void AudioRenderer::Start(AudioRenderer_Mailbox* mailbox_) {
+    if (running) {
+        return;
+    }
+
+    mailbox = mailbox_;
+    thread = std::jthread([this](std::stop_token stop_token) { ThreadFunc(stop_token); });
+    running = true;
+}
+
+void AudioRenderer::Stop() {
+    if (!running) {
+        return;
+    }
+
+    for (auto& stream : streams) {
+        stream->Stop();
+    }
+    thread.join();
+    running = false;
+}
+
+void AudioRenderer::CreateSinkStreams() {
+    u32 channels{sink.GetDeviceChannels()};
+    for (u32 i = 0; i < MaxRendererSessions; i++) {
+        std::string name{fmt::format("ADSP_RenderStream-{}", i)};
+        streams[i] =
+            sink.AcquireSinkStream(system, channels, name, ::AudioCore::Sink::StreamType::Render);
+        streams[i]->SetRingSize(4);
+    }
+}
+
+void AudioRenderer::ThreadFunc(std::stop_token stop_token) {
+    static constexpr char name[]{"AudioRenderer"};
+    MicroProfileOnThreadCreate(name);
+    Common::SetCurrentThreadName(name);
+    Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
+    if (mailbox->ADSPWaitMessage() != RenderMessage::AudioRenderer_InitializeOK) {
+        LOG_ERROR(Service_Audio,
+                  "ADSP Audio Renderer -- Failed to receive initialize message from host!");
+        return;
+    }
+
+    mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_InitializeOK);
+
+    // 0.12 seconds (2304000 / 19200000)
+    constexpr u64 max_process_time{2'304'000ULL};
+
+    while (!stop_token.stop_requested()) {
+        auto message{mailbox->ADSPWaitMessage()};
+        switch (message) {
+        case RenderMessage::AudioRenderer_Shutdown:
+            mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_Shutdown);
+            return;
+
+        case RenderMessage::AudioRenderer_Render: {
+            if (system.IsShuttingDown()) [[unlikely]] {
+                std::this_thread::sleep_for(std::chrono::milliseconds(5));
+                mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_RenderResponse);
+                continue;
+            }
+            std::array<bool, MaxRendererSessions> buffers_reset{};
+            std::array<u64, MaxRendererSessions> render_times_taken{};
+            const auto start_time{system.CoreTiming().GetClockTicks()};
+
+            for (u32 index = 0; index < 2; index++) {
+                auto& command_buffer{mailbox->GetCommandBuffer(index)};
+                auto& command_list_processor{command_list_processors[index]};
+
+                // Check this buffer is valid, as it may not be used.
+                if (command_buffer.buffer != 0) {
+                    // If there are no remaining commands (from the previous list),
+                    // this is a new command list, initialize it.
+                    if (command_buffer.remaining_command_count == 0) {
+                        command_list_processor.Initialize(system, command_buffer.buffer,
+                                                          command_buffer.size, streams[index]);
+                    }
+
+                    if (command_buffer.reset_buffers && !buffers_reset[index]) {
+                        streams[index]->ClearQueue();
+                        buffers_reset[index] = true;
+                    }
+
+                    u64 max_time{max_process_time};
+                    if (index == 1 && command_buffer.applet_resource_user_id ==
+                                          mailbox->GetCommandBuffer(0).applet_resource_user_id) {
+                        max_time = max_process_time - render_times_taken[0];
+                        if (render_times_taken[0] > max_process_time) {
+                            max_time = 0;
+                        }
+                    }
+
+                    max_time = std::min(command_buffer.time_limit, max_time);
+                    command_list_processor.SetProcessTimeMax(max_time);
+
+                    streams[index]->WaitFreeSpace(stop_token);
+
+                    // Process the command list
+                    {
+                        MICROPROFILE_SCOPE(Audio_Renderer);
+                        render_times_taken[index] =
+                            command_list_processor.Process(index) - start_time;
+                    }
+
+                    const auto end_time{system.CoreTiming().GetClockTicks()};
+
+                    command_buffer.remaining_command_count =
+                        command_list_processor.GetRemainingCommandCount();
+                    command_buffer.render_time_taken = end_time - start_time;
+                }
+            }
+
+            mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_RenderResponse);
+        } break;
+
+        default:
+            LOG_WARNING(Service_Audio,
+                        "ADSP AudioRenderer received an invalid message, msg={:02X}!",
+                        static_cast<u32>(message));
+            break;
+        }
+    }
+}
+
+} // namespace AudioCore::AudioRenderer::ADSP

src/audio_core/renderer/adsp/audio_renderer.h

@@ -0,0 +1,204 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <array>
+#include <memory>
+#include <thread>
+
+#include "audio_core/renderer/adsp/command_buffer.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
+#include "common/common_types.h"
+#include "common/polyfill_thread.h"
+#include "common/reader_writer_queue.h"
+#include "common/thread.h"
+
+namespace Core {
+namespace Timing {
+struct EventType;
+}
+class System;
+} // namespace Core
+
+namespace AudioCore {
+namespace Sink {
+class Sink;
+}
+
+namespace AudioRenderer::ADSP {
+
+enum class RenderMessage {
+    /* 0x00 */ Invalid,
+    /* 0x01 */ AudioRenderer_MapUnmap_Map,
+    /* 0x02 */ AudioRenderer_MapUnmap_MapResponse,
+    /* 0x03 */ AudioRenderer_MapUnmap_Unmap,
+    /* 0x04 */ AudioRenderer_MapUnmap_UnmapResponse,
+    /* 0x05 */ AudioRenderer_MapUnmap_InvalidateCache,
+    /* 0x06 */ AudioRenderer_MapUnmap_InvalidateCacheResponse,
+    /* 0x07 */ AudioRenderer_MapUnmap_Shutdown,
+    /* 0x08 */ AudioRenderer_MapUnmap_ShutdownResponse,
+    /* 0x16 */ AudioRenderer_InitializeOK = 0x16,
+    /* 0x20 */ AudioRenderer_RenderResponse = 0x20,
+    /* 0x2A */ AudioRenderer_Render = 0x2A,
+    /* 0x34 */ AudioRenderer_Shutdown = 0x34,
+};
+
+/**
+ * A mailbox for the AudioRenderer, allowing communication between the host and the AudioRenderer
+ * running on the ADSP.
+ */
+class AudioRenderer_Mailbox {
+public:
+    /**
+     * Send a message from the host to the AudioRenderer.
+     *
+     * @param message - The message to send to the AudioRenderer.
+     */
+    void HostSendMessage(RenderMessage message);
+
+    /**
+     * Host wait for a message from the AudioRenderer.
+     *
+     * @return The message returned from the AudioRenderer.
+     */
+    RenderMessage HostWaitMessage();
+
+    /**
+     * Send a message from the AudioRenderer to the host.
+     *
+     * @param message - The message to send to the host.
+     */
+    void ADSPSendMessage(RenderMessage message);
+
+    /**
+     * AudioRenderer wait for a message from the host.
+     *
+     * @return The message returned from the AudioRenderer.
+     */
+    RenderMessage ADSPWaitMessage();
+
+    /**
+     * Get the command buffer with the given session id (0 or 1).
+     *
+     * @param session_id - The session id to get (0 or 1).
+     * @return The command buffer.
+     */
+    CommandBuffer& GetCommandBuffer(u32 session_id);
+
+    /**
+     * Set the command buffer with the given session id (0 or 1).
+     *
+     * @param session_id - The session id to get (0 or 1).
+     * @param buffer     - The command buffer to set.
+     */
+    void SetCommandBuffer(u32 session_id, const CommandBuffer& buffer);
+
+    /**
+     * Get the total render time taken for the last command lists sent.
+     *
+     * @return Total render time taken for the last command lists.
+     */
+    u64 GetRenderTimeTaken() const;
+
+    /**
+     * Get the tick the AudioRenderer was signalled.
+     *
+     * @return The tick the AudioRenderer was signalled.
+     */
+    u64 GetSignalledTick() const;
+
+    /**
+     * Set the tick the AudioRenderer was signalled.
+     *
+     * @param tick - The tick the AudioRenderer was signalled.
+     */
+    void SetSignalledTick(u64 tick);
+
+    /**
+     * Clear the remaining command count.
+     *
+     * @param session_id - Index for which command list to clear (0 or 1).
+     */
+    void ClearRemainCount(u32 session_id);
+
+    /**
+     * Get the remaining command count for a given command list.
+     *
+     * @param session_id - Index for which command list to clear (0 or 1).
+     * @return The remaining command count.
+     */
+    u32 GetRemainCommandCount(u32 session_id) const;
+
+    /**
+     * Clear the command buffers (does not clear the time taken or the remaining command count).
+     */
+    void ClearCommandBuffers();
+
+private:
+    /// Host signalling event
+    Common::Event host_event{};
+    /// AudioRenderer signalling event
+    Common::Event adsp_event{};
+    /// Host message queue
+
+    Common::ReaderWriterQueue<RenderMessage> host_messages{};
+    /// AudioRenderer message queue
+
+    Common::ReaderWriterQueue<RenderMessage> adsp_messages{};
+    /// Command buffers
+
+    std::array<CommandBuffer, MaxRendererSessions> command_buffers{};
+    /// Tick the AudioRnederer was signalled
+    u64 signalled_tick{};
+};
+
+/**
+ * The AudioRenderer application running on the ADSP.
+ */
+class AudioRenderer {
+public:
+    explicit AudioRenderer(Core::System& system);
+    ~AudioRenderer();
+
+    /**
+     * Start the AudioRenderer.
+     *
+     * @param mailbox The mailbox to use for this session.
+     */
+    void Start(AudioRenderer_Mailbox* mailbox);
+
+    /**
+     * Stop the AudioRenderer.
+     */
+    void Stop();
+
+private:
+    /**
+     * Main AudioRenderer thread, responsible for processing the command lists.
+     */
+    void ThreadFunc(std::stop_token stop_token);
+
+    /**
+     * Creates the streams which will receive the processed samples.
+     */
+    void CreateSinkStreams();
+
+    /// Core system
+    Core::System& system;
+    /// Main thread
+    std::jthread thread{};
+    /// The current state
+    std::atomic<bool> running{};
+    /// The active mailbox
+    AudioRenderer_Mailbox* mailbox{};
+    /// The command lists to process
+    std::array<CommandListProcessor, MaxRendererSessions> command_list_processors{};
+    /// The output sink the AudioRenderer will use
+    Sink::Sink& sink;
+    /// The streams which will receive the processed samples
+    std::array<Sink::SinkStream*, MaxRendererSessions> streams;
+};
+
+} // namespace AudioRenderer::ADSP
+} // namespace AudioCore

src/audio_core/renderer/adsp/command_buffer.h

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "audio_core/common/common.h"
+#include "common/common_types.h"
+
+namespace AudioCore::AudioRenderer::ADSP {
+
+struct CommandBuffer {
+    CpuAddr buffer;
+    u64 size;
+    u64 time_limit;
+    u32 remaining_command_count;
+    bool reset_buffers;
+    u64 applet_resource_user_id;
+    u64 render_time_taken;
+};
+
+} // namespace AudioCore::AudioRenderer::ADSP

src/audio_core/renderer/adsp/command_list_processor.cpp

@@ -1,9 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <string>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/command_list_header.h"
 #include "audio_core/renderer/command/commands.h"
 #include "common/settings.h"
@@ -11,15 +11,15 @@
 #include "core/core_timing.h"
 #include "core/memory.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer::ADSP {
 
 void CommandListProcessor::Initialize(Core::System& system_, CpuAddr buffer, u64 size,
                                       Sink::SinkStream* stream_) {
     system = &system_;
     memory = &system->ApplicationMemory();
     stream = stream_;
-    header = reinterpret_cast<Renderer::CommandListHeader*>(buffer);
-    commands = reinterpret_cast<u8*>(buffer + sizeof(Renderer::CommandListHeader));
+    header = reinterpret_cast<CommandListHeader*>(buffer);
+    commands = reinterpret_cast<u8*>(buffer + sizeof(CommandListHeader));
     commands_buffer_size = size;
     command_count = header->command_count;
     sample_count = header->sample_count;
@@ -37,12 +37,17 @@ u32 CommandListProcessor::GetRemainingCommandCount() const {
     return command_count - processed_command_count;
 }
 
+void CommandListProcessor::SetBuffer(const CpuAddr buffer, const u64 size) {
+    commands = reinterpret_cast<u8*>(buffer + sizeof(CommandListHeader));
+    commands_buffer_size = size;
+}
+
 Sink::SinkStream* CommandListProcessor::GetOutputSinkStream() const {
     return stream;
 }
 
 u64 CommandListProcessor::Process(u32 session_id) {
-    const auto start_time_{system->CoreTiming().GetGlobalTimeUs().count()};
+    const auto start_time_{system->CoreTiming().GetClockTicks()};
     const auto command_base{CpuAddr(commands)};
 
     if (processed_command_count > 0) {
@@ -55,12 +60,12 @@ u64 CommandListProcessor::Process(u32 session_id) {
     std::string dump{fmt::format("\nSession {}\n", session_id)};
 
     for (u32 index = 0; index < command_count; index++) {
-        auto& command{*reinterpret_cast<Renderer::ICommand*>(commands)};
+        auto& command{*reinterpret_cast<ICommand*>(commands)};
 
         if (command.magic != 0xCAFEBABE) {
             LOG_ERROR(Service_Audio, "Command has invalid magic! Expected 0xCAFEBABE, got {:08X}",
                       command.magic);
-            return system->CoreTiming().GetGlobalTimeUs().count() - start_time_;
+            return system->CoreTiming().GetClockTicks() - start_time_;
         }
 
         auto current_offset{CpuAddr(commands) - command_base};
@@ -69,8 +74,8 @@ u64 CommandListProcessor::Process(u32 session_id) {
             LOG_ERROR(Service_Audio,
                       "Command exceeded command buffer, buffer size {:08X}, command ends at {:08X}",
                       commands_buffer_size,
-                      CpuAddr(commands) + command.size - sizeof(Renderer::CommandListHeader));
-            return system->CoreTiming().GetGlobalTimeUs().count() - start_time_;
+                      CpuAddr(commands) + command.size - sizeof(CommandListHeader));
+            return system->CoreTiming().GetClockTicks() - start_time_;
         }
 
         if (Settings::values.dump_audio_commands) {
@@ -96,8 +101,8 @@ u64 CommandListProcessor::Process(u32 session_id) {
         last_dump = dump;
     }
 
-    end_time = system->CoreTiming().GetGlobalTimeUs().count();
+    end_time = system->CoreTiming().GetClockTicks();
     return end_time - start_time_;
 }
 
-} // namespace AudioCore::ADSP::AudioRenderer
+} // namespace AudioCore::AudioRenderer::ADSP

src/audio_core/renderer/adsp/command_list_processor.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -6,7 +6,6 @@
 #include <span>
 
 #include "audio_core/common/common.h"
-#include "audio_core/renderer/command/command_list_header.h"
 #include "common/common_types.h"
 
 namespace Core {
@@ -21,11 +20,10 @@ namespace Sink {
 class SinkStream;
 }
 
-namespace Renderer {
+namespace AudioRenderer {
 struct CommandListHeader;
-}
 
-namespace ADSP::AudioRenderer {
+namespace ADSP {
 
 /**
  * A processor for command lists given to the AudioRenderer.
@@ -56,6 +54,14 @@ public:
      */
     u32 GetRemainingCommandCount() const;
 
+    /**
+     * Set the command buffer.
+     *
+     * @param buffer - The buffer to use.
+     * @param size   - The size of the buffer.
+     */
+    void SetBuffer(CpuAddr buffer, u64 size);
+
     /**
      * Get the stream for this command list.
      *
@@ -79,7 +85,7 @@ public:
     /// Stream for the processed samples
     Sink::SinkStream* stream{};
     /// Header info for this command list
-    Renderer::CommandListHeader* header{};
+    CommandListHeader* header{};
     /// The command buffer
     u8* commands{};
     /// The command buffer size
@@ -108,5 +114,6 @@ public:
     std::string last_dump{};
 };
 
-} // namespace ADSP::AudioRenderer
+} // namespace ADSP
+} // namespace AudioRenderer
 } // namespace AudioCore

src/audio_core/renderer/audio_device.cpp

@@ -10,7 +10,7 @@
 #include "audio_core/sink/sink.h"
 #include "core/core.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 constexpr std::array usb_device_names{
     AudioDevice::AudioDeviceName{"AudioStereoJackOutput"},
@@ -71,4 +71,4 @@ f32 AudioDevice::GetDeviceVolume([[maybe_unused]] std::string_view name) const {
     return output_sink.GetDeviceVolume();
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/audio_device.h

@@ -16,7 +16,7 @@ namespace Sink {
 class Sink;
 }
 
-namespace Renderer {
+namespace AudioRenderer {
 /**
  * An interface to an output audio device available to the Switch.
  */
@@ -76,5 +76,5 @@ private:
     const u32 user_revision;
 };
 
-} // namespace Renderer
+} // namespace AudioRenderer
 } // namespace AudioCore

src/audio_core/renderer/audio_renderer.cpp

@@ -9,7 +9,7 @@
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/service/audio/errors.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 Renderer::Renderer(Core::System& system_, Manager& manager_, Kernel::KEvent* rendered_event)
     : core{system_}, manager{manager_}, system{system_, rendered_event} {}
@@ -64,4 +64,4 @@ Result Renderer::RequestUpdate(std::span<const u8> input, std::span<u8> performa
     return system.Update(input, performance, output);
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/audio_renderer.h

@@ -19,7 +19,7 @@ class KTransferMemory;
 namespace AudioCore {
 struct AudioRendererParameterInternal;
 
-namespace Renderer {
+namespace AudioRenderer {
 class Manager;
 
 /**
@@ -31,7 +31,7 @@ public:
 
     /**
      * Initialize the renderer.
-     * Registers the system with the Renderer::Manager, allocates workbuffers and initializes
+     * Registers the system with the AudioRenderer::Manager, allocates workbuffers and initializes
      * everything to a default state.
      *
      * @param params                  - Input parameters to initialize the system with.
@@ -93,5 +93,5 @@ private:
     System system;
 };
 
-} // namespace Renderer
+} // namespace AudioRenderer
 } // namespace AudioCore

src/audio_core/renderer/behavior/behavior_info.cpp

@@ -4,7 +4,7 @@
 #include "audio_core/common/feature_support.h"
 #include "audio_core/renderer/behavior/behavior_info.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 BehaviorInfo::BehaviorInfo() : process_revision{CurrentRevision} {}
 
@@ -190,4 +190,4 @@ bool BehaviorInfo::IsI3dl2ReverbChannelMappingChanged() const {
     return CheckFeatureSupported(SupportTags::I3dl2ReverbChannelMappingChange, user_revision);
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/behavior/behavior_info.h

@@ -10,7 +10,7 @@
 #include "common/common_types.h"
 #include "core/hle/service/audio/errors.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Holds host and user revisions, checks whether render features can be enabled, and reports errors.
  */
@@ -264,7 +264,7 @@ public:
     /**
      * Check if skipping voice pitch and sample rate conversion is supported.
      * This speeds up the data source commands by skipping resampling if unwanted.
-     * See AudioCore::Renderer::DecodeFromWaveBuffers
+     * See AudioCore::AudioRenderer::DecodeFromWaveBuffers
      *
      * @return True if supported, otherwise false.
      */
@@ -273,7 +273,7 @@ public:
     /**
      * Check if resetting played sample count at loop points is supported.
      * This resets the number of samples played in a voice state when a loop point is reached.
-     * See AudioCore::Renderer::DecodeFromWaveBuffers
+     * See AudioCore::AudioRenderer::DecodeFromWaveBuffers
      *
      * @return True if supported, otherwise false.
      */
@@ -373,4 +373,4 @@ public:
     u32 error_count{};
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/behavior/info_updater.cpp

@@ -15,7 +15,7 @@
 #include "audio_core/renderer/splitter/splitter_context.h"
 #include "audio_core/renderer/voice/voice_context.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 InfoUpdater::InfoUpdater(std::span<const u8> input_, std::span<u8> output_,
                          const u32 process_handle_, BehaviorInfo& behaviour_)
@@ -536,4 +536,4 @@ Result InfoUpdater::CheckConsumedSize() {
     return ResultSuccess;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/behavior/info_updater.h

@@ -8,7 +8,7 @@
 #include "common/common_types.h"
 #include "core/hle/service/audio/errors.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 class BehaviorInfo;
 class VoiceContext;
 class MixContext;
@@ -202,4 +202,4 @@ private:
     BehaviorInfo& behaviour;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/command_buffer.cpp

@@ -16,7 +16,7 @@
 #include "audio_core/renderer/voice/voice_info.h"
 #include "audio_core/renderer/voice/voice_state.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 template <typename T, CommandId Id>
 T& CommandBuffer::GenerateStart(const s32 node_id) {
@@ -713,4 +713,4 @@ void CommandBuffer::GenerateCompressorCommand(s16 buffer_offset, EffectInfoBase&
     GenerateEnd<CompressorCommand>(cmd);
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/command_buffer.h

@@ -10,7 +10,7 @@
 #include "audio_core/renderer/performance/performance_manager.h"
 #include "common/common_types.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 struct UpsamplerInfo;
 struct VoiceState;
 class EffectInfoBase;
@@ -465,4 +465,4 @@ private:
     void GenerateEnd(T& cmd);
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/command_generator.cpp

@@ -21,7 +21,7 @@
 #include "audio_core/renderer/voice/voice_context.h"
 #include "common/alignment.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 CommandGenerator::CommandGenerator(CommandBuffer& command_buffer_,
                                    const CommandListHeader& command_list_header_,
@@ -793,4 +793,4 @@ void CommandGenerator::GeneratePerformanceCommand(
     command_buffer.GeneratePerformanceCommand(node_id, state, entry_addresses);
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/command_generator.h

@@ -12,7 +12,7 @@
 namespace AudioCore {
 struct AudioRendererSystemContext;
 
-namespace Renderer {
+namespace AudioRenderer {
 class CommandBuffer;
 struct CommandListHeader;
 class VoiceContext;
@@ -345,5 +345,5 @@ private:
     PerformanceManager* performance_manager;
 };
 
-} // namespace Renderer
+} // namespace AudioRenderer
 } // namespace AudioCore

src/audio_core/renderer/command/command_list_header.h

@@ -8,7 +8,7 @@
 #include "audio_core/common/common.h"
 #include "common/common_types.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 struct CommandListHeader {
     u64 buffer_size;
@@ -19,4 +19,4 @@ struct CommandListHeader {
     u32 sample_rate;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/command_processing_time_estimator.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/renderer/command/command_processing_time_estimator.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 u32 CommandProcessingTimeEstimatorVersion1::Estimate(
     const PcmInt16DataSourceVersion1Command& command) const {
@@ -3617,4 +3617,4 @@ u32 CommandProcessingTimeEstimatorVersion5::Estimate(const CompressorCommand& co
     }
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/command_processing_time_estimator.h

@@ -6,7 +6,7 @@
 #include "audio_core/renderer/command/commands.h"
 #include "common/common_types.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Estimate the processing time required for all commands.
  */
@@ -251,4 +251,4 @@ private:
     u32 buffer_count{};
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/adpcm.cpp

@@ -3,29 +3,23 @@
 
 #include <span>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/data_source/adpcm.h"
 #include "audio_core/renderer/command/data_source/decode.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
-void AdpcmDataSourceVersion1Command::Dump(const AudioRenderer::CommandListProcessor& processor,
+void AdpcmDataSourceVersion1Command::Dump(const ADSP::CommandListProcessor& processor,
                                           std::string& string) {
     string += fmt::format("AdpcmDataSourceVersion1Command\n\toutput_index {:02X} source sample "
                           "rate {} target sample rate {} src quality {}\n",
                           output_index, sample_rate, processor.target_sample_rate, src_quality);
 }
 
-void AdpcmDataSourceVersion1Command::Process(const AudioRenderer::CommandListProcessor& processor) {
+void AdpcmDataSourceVersion1Command::Process(const ADSP::CommandListProcessor& processor) {
     auto out_buffer{processor.mix_buffers.subspan(output_index * processor.sample_count,
                                                   processor.sample_count)};
 
-    for (auto& wave_buffer : wave_buffers) {
-        wave_buffer.loop_start_offset = wave_buffer.start_offset;
-        wave_buffer.loop_end_offset = wave_buffer.end_offset;
-        wave_buffer.loop_count = wave_buffer.loop ? -1 : 0;
-    }
-
     DecodeFromWaveBuffersArgs args{
         .sample_format{SampleFormat::Adpcm},
         .output{out_buffer},
@@ -47,18 +41,18 @@ void AdpcmDataSourceVersion1Command::Process(const AudioRenderer::CommandListPro
     DecodeFromWaveBuffers(*processor.memory, args);
 }
 
-bool AdpcmDataSourceVersion1Command::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool AdpcmDataSourceVersion1Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-void AdpcmDataSourceVersion2Command::Dump(const AudioRenderer::CommandListProcessor& processor,
+void AdpcmDataSourceVersion2Command::Dump(const ADSP::CommandListProcessor& processor,
                                           std::string& string) {
     string += fmt::format("AdpcmDataSourceVersion2Command\n\toutput_index {:02X} source sample "
                           "rate {} target sample rate {} src quality {}\n",
                           output_index, sample_rate, processor.target_sample_rate, src_quality);
 }
 
-void AdpcmDataSourceVersion2Command::Process(const AudioRenderer::CommandListProcessor& processor) {
+void AdpcmDataSourceVersion2Command::Process(const ADSP::CommandListProcessor& processor) {
     auto out_buffer{processor.mix_buffers.subspan(output_index * processor.sample_count,
                                                   processor.sample_count)};
 
@@ -83,8 +77,8 @@ void AdpcmDataSourceVersion2Command::Process(const AudioRenderer::CommandListPro
     DecodeFromWaveBuffers(*processor.memory, args);
 }
 
-bool AdpcmDataSourceVersion2Command::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool AdpcmDataSourceVersion2Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/adpcm.h

@@ -11,12 +11,11 @@
 #include "audio_core/renderer/command/icommand.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command to decode ADPCM-encoded version 1 wavebuffers
  * into the output_index mix buffer.
@@ -28,14 +27,14 @@ struct AdpcmDataSourceVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -43,13 +42,13 @@ struct AdpcmDataSourceVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Quality used for sample rate conversion
     SrcQuality src_quality;
     /// Mix buffer index for decoded samples
     s16 output_index;
-    /// Flags to control decoding (see AudioCore::Renderer::VoiceInfo::Flags)
+    /// Flags to control decoding (see AudioCore::AudioRenderer::VoiceInfo::Flags)
     u16 flags;
     /// Wavebuffer sample rate
     u32 sample_rate;
@@ -76,14 +75,14 @@ struct AdpcmDataSourceVersion2Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -91,13 +90,13 @@ struct AdpcmDataSourceVersion2Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Quality used for sample rate conversion
     SrcQuality src_quality;
     /// Mix buffer index for decoded samples
     s16 output_index;
-    /// Flags to control decoding (see AudioCore::Renderer::VoiceInfo::Flags)
+    /// Flags to control decoding (see AudioCore::AudioRenderer::VoiceInfo::Flags)
     u16 flags;
     /// Wavebuffer sample rate
     u32 sample_rate;
@@ -117,4 +116,4 @@ struct AdpcmDataSourceVersion2Command : ICommand {
     u64 data_size;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/decode.cpp

@@ -11,7 +11,7 @@
 #include "common/scratch_buffer.h"
 #include "core/memory.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 constexpr u32 TempBufferSize = 0x3F00;
 constexpr std::array<u8, 3> PitchBySrcQuality = {4, 8, 4};
@@ -123,13 +123,11 @@ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span<s16> out_buffer,
         return 0;
     }
 
-    auto start_pos{req.start_offset + req.offset};
-    auto samples_to_process{std::min(req.end_offset - start_pos, req.samples_to_read)};
-    if (samples_to_process == 0) {
-        return 0;
-    }
+    auto samples_to_process{
+        std::min(req.end_offset - req.start_offset - req.offset, req.samples_to_read)};
 
     auto samples_to_read{samples_to_process};
+    auto start_pos{req.start_offset + req.offset};
     auto samples_remaining_in_frame{start_pos % SamplesPerFrame};
     auto position_in_frame{(start_pos / SamplesPerFrame) * NibblesPerFrame +
                            samples_remaining_in_frame};
@@ -227,24 +225,13 @@ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span<s16> out_buffer,
  * @param args   - The wavebuffer data, and information for how to decode it.
  */
 void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuffersArgs& args) {
-    static constexpr auto EndWaveBuffer = [](auto& voice_state, auto& wavebuffer, auto& index,
-                                             auto& played_samples, auto& consumed) -> void {
-        voice_state.wave_buffer_valid[index] = false;
-        voice_state.loop_count = 0;
-
-        if (wavebuffer.stream_ended) {
-            played_samples = 0;
-        }
-
-        index = (index + 1) % MaxWaveBuffers;
-        consumed++;
-    };
     auto& voice_state{*args.voice_state};
     auto remaining_sample_count{args.sample_count};
     auto fraction{voice_state.fraction};
 
-    const auto sample_rate_ratio{Common::FixedPoint<49, 15>(
-        (f32)args.source_sample_rate / (f32)args.target_sample_rate * (f32)args.pitch)};
+    const auto sample_rate_ratio{
+        (Common::FixedPoint<49, 15>(args.source_sample_rate) / args.target_sample_rate) *
+        args.pitch};
     const auto size_required{fraction + remaining_sample_count * sample_rate_ratio};
 
     if (size_required < 0) {
@@ -311,13 +298,13 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf
             auto end_offset{wavebuffer.end_offset};
 
             if (wavebuffer.loop && voice_state.loop_count > 0 &&
+                wavebuffer.loop_start_offset != 0 && wavebuffer.loop_end_offset != 0 &&
                 wavebuffer.loop_start_offset <= wavebuffer.loop_end_offset) {
                 start_offset = wavebuffer.loop_start_offset;
                 end_offset = wavebuffer.loop_end_offset;
             }
 
-            DecodeArg decode_arg{
-                .buffer{wavebuffer.buffer},
+            DecodeArg decode_arg{.buffer{wavebuffer.buffer},
                                  .buffer_size{wavebuffer.buffer_size},
                                  .start_offset{start_offset},
                                  .end_offset{end_offset},
@@ -326,8 +313,7 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf
                                  .adpcm_context{nullptr},
                                  .target_channel{args.channel},
                                  .offset{offset},
-                .samples_to_read{samples_to_read - samples_read},
-            };
+                                 .samples_to_read{samples_to_read - samples_read}};
 
             s32 samples_decoded{0};
 
@@ -364,17 +350,31 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf
             temp_buffer_pos += samples_decoded;
             offset += samples_decoded;
 
-            if (samples_decoded && offset < end_offset - start_offset) {
-                continue;
+            if (samples_decoded == 0 || offset >= end_offset - start_offset) {
+                offset = 0;
+                if (!wavebuffer.loop) {
+                    voice_state.wave_buffer_valid[wavebuffer_index] = false;
+                    voice_state.loop_count = 0;
+
+                    if (wavebuffer.stream_ended) {
+                        played_sample_count = 0;
                     }
 
-            offset = 0;
-            if (wavebuffer.loop) {
+                    wavebuffer_index = (wavebuffer_index + 1) % MaxWaveBuffers;
+                    wavebuffers_consumed++;
+                } else {
                     voice_state.loop_count++;
-                if (wavebuffer.loop_count >= 0 &&
+                    if (wavebuffer.loop_count > 0 &&
                         (voice_state.loop_count > wavebuffer.loop_count || samples_decoded == 0)) {
-                    EndWaveBuffer(voice_state, wavebuffer, wavebuffer_index, played_sample_count,
-                                  wavebuffers_consumed);
+                        voice_state.wave_buffer_valid[wavebuffer_index] = false;
+                        voice_state.loop_count = 0;
+
+                        if (wavebuffer.stream_ended) {
+                            played_sample_count = 0;
+                        }
+
+                        wavebuffer_index = (wavebuffer_index + 1) % MaxWaveBuffers;
+                        wavebuffers_consumed++;
                     }
 
                     if (samples_decoded == 0) {
@@ -385,9 +385,7 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf
                     if (args.IsVoicePlayedSampleCountResetAtLoopPointSupported) {
                         played_sample_count = 0;
                     }
-            } else {
-                EndWaveBuffer(voice_state, wavebuffer, wavebuffer_index, played_sample_count,
-                              wavebuffers_consumed);
+                }
             }
         }
 
@@ -425,4 +423,4 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf
     voice_state.fraction = fraction;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/decode.h

@@ -15,7 +15,7 @@ namespace Core::Memory {
 class Memory;
 }
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 struct DecodeFromWaveBuffersArgs {
     SampleFormat sample_format;
@@ -56,4 +56,4 @@ struct DecodeArg {
  */
 void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuffersArgs& args);
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/pcm_float.cpp

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/data_source/decode.h"
 #include "audio_core/renderer/command/data_source/pcm_float.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
-void PcmFloatDataSourceVersion1Command::Dump(const AudioRenderer::CommandListProcessor& processor,
+void PcmFloatDataSourceVersion1Command::Dump(const ADSP::CommandListProcessor& processor,
                                              std::string& string) {
     string +=
         fmt::format("PcmFloatDataSourceVersion1Command\n\toutput_index {:02X} channel {} "
@@ -16,17 +16,10 @@ void PcmFloatDataSourceVersion1Command::Dump(const AudioRenderer::CommandListPro
                     processor.target_sample_rate, src_quality);
 }
 
-void PcmFloatDataSourceVersion1Command::Process(
-    const AudioRenderer::CommandListProcessor& processor) {
+void PcmFloatDataSourceVersion1Command::Process(const ADSP::CommandListProcessor& processor) {
     auto out_buffer = processor.mix_buffers.subspan(output_index * processor.sample_count,
                                                     processor.sample_count);
 
-    for (auto& wave_buffer : wave_buffers) {
-        wave_buffer.loop_start_offset = wave_buffer.start_offset;
-        wave_buffer.loop_end_offset = wave_buffer.end_offset;
-        wave_buffer.loop_count = wave_buffer.loop ? -1 : 0;
-    }
-
     DecodeFromWaveBuffersArgs args{
         .sample_format{SampleFormat::PcmFloat},
         .output{out_buffer},
@@ -48,12 +41,11 @@ void PcmFloatDataSourceVersion1Command::Process(
     DecodeFromWaveBuffers(*processor.memory, args);
 }
 
-bool PcmFloatDataSourceVersion1Command::Verify(
-    const AudioRenderer::CommandListProcessor& processor) {
+bool PcmFloatDataSourceVersion1Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-void PcmFloatDataSourceVersion2Command::Dump(const AudioRenderer::CommandListProcessor& processor,
+void PcmFloatDataSourceVersion2Command::Dump(const ADSP::CommandListProcessor& processor,
                                              std::string& string) {
     string +=
         fmt::format("PcmFloatDataSourceVersion2Command\n\toutput_index {:02X} channel {} "
@@ -62,8 +54,7 @@ void PcmFloatDataSourceVersion2Command::Dump(const AudioRenderer::CommandListPro
                     processor.target_sample_rate, src_quality);
 }
 
-void PcmFloatDataSourceVersion2Command::Process(
-    const AudioRenderer::CommandListProcessor& processor) {
+void PcmFloatDataSourceVersion2Command::Process(const ADSP::CommandListProcessor& processor) {
     auto out_buffer = processor.mix_buffers.subspan(output_index * processor.sample_count,
                                                     processor.sample_count);
 
@@ -88,9 +79,8 @@ void PcmFloatDataSourceVersion2Command::Process(
     DecodeFromWaveBuffers(*processor.memory, args);
 }
 
-bool PcmFloatDataSourceVersion2Command::Verify(
-    const AudioRenderer::CommandListProcessor& processor) {
+bool PcmFloatDataSourceVersion2Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/pcm_float.h

@@ -9,12 +9,11 @@
 #include "audio_core/renderer/command/icommand.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command to decode PCM float-encoded version 1 wavebuffers
  * into the output_index mix buffer.
@@ -26,14 +25,14 @@ struct PcmFloatDataSourceVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -41,13 +40,13 @@ struct PcmFloatDataSourceVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Quality used for sample rate conversion
     SrcQuality src_quality;
     /// Mix buffer index for decoded samples
     s16 output_index;
-    /// Flags to control decoding (see AudioCore::Renderer::VoiceInfo::Flags)
+    /// Flags to control decoding (see AudioCore::AudioRenderer::VoiceInfo::Flags)
     u16 flags;
     /// Wavebuffer sample rate
     u32 sample_rate;
@@ -74,14 +73,14 @@ struct PcmFloatDataSourceVersion2Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -89,13 +88,13 @@ struct PcmFloatDataSourceVersion2Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Quality used for sample rate conversion
     SrcQuality src_quality;
     /// Mix buffer index for decoded samples
     s16 output_index;
-    /// Flags to control decoding (see AudioCore::Renderer::VoiceInfo::Flags)
+    /// Flags to control decoding (see AudioCore::AudioRenderer::VoiceInfo::Flags)
     u16 flags;
     /// Wavebuffer sample rate
     u32 sample_rate;
@@ -111,4 +110,4 @@ struct PcmFloatDataSourceVersion2Command : ICommand {
     CpuAddr voice_state;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/pcm_int16.cpp

@@ -3,13 +3,13 @@
 
 #include <span>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/data_source/decode.h"
 #include "audio_core/renderer/command/data_source/pcm_int16.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
-void PcmInt16DataSourceVersion1Command::Dump(const AudioRenderer::CommandListProcessor& processor,
+void PcmInt16DataSourceVersion1Command::Dump(const ADSP::CommandListProcessor& processor,
                                              std::string& string) {
     string +=
         fmt::format("PcmInt16DataSourceVersion1Command\n\toutput_index {:02X} channel {} "
@@ -18,17 +18,10 @@ void PcmInt16DataSourceVersion1Command::Dump(const AudioRenderer::CommandListPro
                     processor.target_sample_rate, src_quality);
 }
 
-void PcmInt16DataSourceVersion1Command::Process(
-    const AudioRenderer::CommandListProcessor& processor) {
+void PcmInt16DataSourceVersion1Command::Process(const ADSP::CommandListProcessor& processor) {
     auto out_buffer = processor.mix_buffers.subspan(output_index * processor.sample_count,
                                                     processor.sample_count);
 
-    for (auto& wave_buffer : wave_buffers) {
-        wave_buffer.loop_start_offset = wave_buffer.start_offset;
-        wave_buffer.loop_end_offset = wave_buffer.end_offset;
-        wave_buffer.loop_count = wave_buffer.loop ? -1 : 0;
-    }
-
     DecodeFromWaveBuffersArgs args{
         .sample_format{SampleFormat::PcmInt16},
         .output{out_buffer},
@@ -50,12 +43,11 @@ void PcmInt16DataSourceVersion1Command::Process(
     DecodeFromWaveBuffers(*processor.memory, args);
 }
 
-bool PcmInt16DataSourceVersion1Command::Verify(
-    const AudioRenderer::CommandListProcessor& processor) {
+bool PcmInt16DataSourceVersion1Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-void PcmInt16DataSourceVersion2Command::Dump(const AudioRenderer::CommandListProcessor& processor,
+void PcmInt16DataSourceVersion2Command::Dump(const ADSP::CommandListProcessor& processor,
                                              std::string& string) {
     string +=
         fmt::format("PcmInt16DataSourceVersion2Command\n\toutput_index {:02X} channel {} "
@@ -64,8 +56,7 @@ void PcmInt16DataSourceVersion2Command::Dump(const AudioRenderer::CommandListPro
                     processor.target_sample_rate, src_quality);
 }
 
-void PcmInt16DataSourceVersion2Command::Process(
-    const AudioRenderer::CommandListProcessor& processor) {
+void PcmInt16DataSourceVersion2Command::Process(const ADSP::CommandListProcessor& processor) {
     auto out_buffer = processor.mix_buffers.subspan(output_index * processor.sample_count,
                                                     processor.sample_count);
     DecodeFromWaveBuffersArgs args{
@@ -89,9 +80,8 @@ void PcmInt16DataSourceVersion2Command::Process(
     DecodeFromWaveBuffers(*processor.memory, args);
 }
 
-bool PcmInt16DataSourceVersion2Command::Verify(
-    const AudioRenderer::CommandListProcessor& processor) {
+bool PcmInt16DataSourceVersion2Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/data_source/pcm_int16.h

@@ -9,12 +9,11 @@
 #include "audio_core/renderer/command/icommand.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command to decode PCM s16-encoded version 1 wavebuffers
  * into the output_index mix buffer.
@@ -26,14 +25,14 @@ struct PcmInt16DataSourceVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -41,13 +40,13 @@ struct PcmInt16DataSourceVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Quality used for sample rate conversion
     SrcQuality src_quality;
     /// Mix buffer index for decoded samples
     s16 output_index;
-    /// Flags to control decoding (see AudioCore::Renderer::VoiceInfo::Flags)
+    /// Flags to control decoding (see AudioCore::AudioRenderer::VoiceInfo::Flags)
     u16 flags;
     /// Wavebuffer sample rate
     u32 sample_rate;
@@ -73,26 +72,26 @@ struct PcmInt16DataSourceVersion2Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Quality used for sample rate conversion
     SrcQuality src_quality;
     /// Mix buffer index for decoded samples
     s16 output_index;
-    /// Flags to control decoding (see AudioCore::Renderer::VoiceInfo::Flags)
+    /// Flags to control decoding (see AudioCore::AudioRenderer::VoiceInfo::Flags)
     u16 flags;
     /// Wavebuffer sample rate
     u32 sample_rate;
@@ -108,4 +107,4 @@ struct PcmInt16DataSourceVersion2Command : ICommand {
     CpuAddr voice_state;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/aux_.cpp

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/aux_.h"
 #include "audio_core/renderer/effect/aux_.h"
 #include "core/core.h"
 #include "core/memory.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Reset an AuxBuffer.
  *
@@ -175,13 +175,13 @@ static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr return_info_,
     return read_count_;
 }
 
-void AuxCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcessor& processor,
+void AuxCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
                       std::string& string) {
     string += fmt::format("AuxCommand\n\tenabled {} input {:02X} output {:02X}\n", effect_enabled,
                           input, output);
 }
 
-void AuxCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void AuxCommand::Process(const ADSP::CommandListProcessor& processor) {
     auto input_buffer{
         processor.mix_buffers.subspan(input * processor.sample_count, processor.sample_count)};
     auto output_buffer{
@@ -208,8 +208,8 @@ void AuxCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
     }
 }
 
-bool AuxCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool AuxCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/aux_.h

@@ -8,12 +8,11 @@
 #include "audio_core/renderer/command/icommand.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command to read and write an auxiliary buffer, writing the input mix buffer to game
  * memory, and reading into the output buffer from game memory.
@@ -25,14 +24,14 @@ struct AuxCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -40,7 +39,7 @@ struct AuxCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer index
     s16 input;
@@ -64,4 +63,4 @@ struct AuxCommand : ICommand {
     bool effect_enabled;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/biquad_filter.cpp

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/biquad_filter.h"
 #include "audio_core/renderer/voice/voice_state.h"
 #include "common/bit_cast.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Biquad filter float implementation.
  *
@@ -76,14 +76,14 @@ static void ApplyBiquadFilterInt(std::span<s32> output, std::span<const s32> inp
     }
 }
 
-void BiquadFilterCommand::Dump(
-    [[maybe_unused]] const AudioRenderer::CommandListProcessor& processor, std::string& string) {
+void BiquadFilterCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
+                               std::string& string) {
     string += fmt::format(
         "BiquadFilterCommand\n\tinput {:02X} output {:02X} needs_init {} use_float_processing {}\n",
         input, output, needs_init, use_float_processing);
 }
 
-void BiquadFilterCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void BiquadFilterCommand::Process(const ADSP::CommandListProcessor& processor) {
     auto state_{reinterpret_cast<VoiceState::BiquadFilterState*>(state)};
     if (needs_init) {
         *state_ = {};
@@ -103,8 +103,8 @@ void BiquadFilterCommand::Process(const AudioRenderer::CommandListProcessor& pro
     }
 }
 
-bool BiquadFilterCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool BiquadFilterCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/biquad_filter.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/voice/voice_state.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for applying a biquad filter to the input mix buffer, saving the results to
  * the output mix buffer.
@@ -27,14 +26,14 @@ struct BiquadFilterCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -42,7 +41,7 @@ struct BiquadFilterCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer index
     s16 input;
@@ -72,4 +71,4 @@ void ApplyBiquadFilterFloat(std::span<s32> output, std::span<const s32> input,
                             std::array<s16, 3>& b, std::array<s16, 2>& a,
                             VoiceState::BiquadFilterState& state, const u32 sample_count);
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/capture.cpp

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/capture.h"
 #include "audio_core/renderer/effect/aux_.h"
 #include "core/memory.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Reset an AuxBuffer.
  *
@@ -118,13 +118,13 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr send_in
     return write_count_;
 }
 
-void CaptureCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcessor& processor,
+void CaptureCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
                           std::string& string) {
     string += fmt::format("CaptureCommand\n\tenabled {} input {:02X} output {:02X}", effect_enabled,
                           input, output);
 }
 
-void CaptureCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void CaptureCommand::Process(const ADSP::CommandListProcessor& processor) {
     if (effect_enabled) {
         auto input_buffer{
             processor.mix_buffers.subspan(input * processor.sample_count, processor.sample_count)};
@@ -135,8 +135,8 @@ void CaptureCommand::Process(const AudioRenderer::CommandListProcessor& processo
     }
 }
 
-bool CaptureCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool CaptureCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/capture.h

@@ -8,12 +8,11 @@
 #include "audio_core/renderer/command/icommand.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for capturing a mix buffer. That is, writing it back to a given game memory
  * address.
@@ -25,14 +24,14 @@ struct CaptureCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -40,7 +39,7 @@ struct CaptureCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer index
     s16 input;
@@ -60,4 +59,4 @@ struct CaptureCommand : ICommand {
     bool effect_enabled;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/compressor.cpp

@@ -5,11 +5,11 @@
 #include <span>
 #include <vector>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/compressor.h"
 #include "audio_core/renderer/effect/compressor.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 static void SetCompressorEffectParameter(const CompressorInfo::ParameterVersion2& params,
                                          CompressorInfo::State& state) {
@@ -110,7 +110,7 @@ static void ApplyCompressorEffect(const CompressorInfo::ParameterVersion2& param
     }
 }
 
-void CompressorCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcessor& processor,
+void CompressorCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
                              std::string& string) {
     string += fmt::format("CompressorCommand\n\tenabled {} \n\tinputs: ", effect_enabled);
     for (s16 i = 0; i < parameter.channel_count; i++) {
@@ -123,7 +123,7 @@ void CompressorCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListPr
     string += "\n";
 }
 
-void CompressorCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void CompressorCommand::Process(const ADSP::CommandListProcessor& processor) {
     std::array<std::span<const s32>, MaxChannels> input_buffers{};
     std::array<std::span<s32>, MaxChannels> output_buffers{};
 
@@ -148,8 +148,8 @@ void CompressorCommand::Process(const AudioRenderer::CommandListProcessor& proce
                           processor.sample_count);
 }
 
-bool CompressorCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool CompressorCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/compressor.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/effect/compressor.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for limiting volume between a high and low threshold.
  * Version 1.
@@ -27,14 +26,14 @@ struct CompressorCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -42,7 +41,7 @@ struct CompressorCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer offsets for each channel
     std::array<s16, MaxChannels> inputs;
@@ -58,4 +57,4 @@ struct CompressorCommand : ICommand {
     bool effect_enabled;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/delay.cpp

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/delay.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Update the DelayInfo state according to the given parameters.
  *
@@ -194,7 +194,7 @@ static void ApplyDelayEffect(const DelayInfo::ParameterVersion1& params, DelayIn
     }
 }
 
-void DelayCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcessor& processor,
+void DelayCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
                         std::string& string) {
     string += fmt::format("DelayCommand\n\tenabled {} \n\tinputs: ", effect_enabled);
     for (u32 i = 0; i < MaxChannels; i++) {
@@ -207,7 +207,7 @@ void DelayCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcess
     string += "\n";
 }
 
-void DelayCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void DelayCommand::Process(const ADSP::CommandListProcessor& processor) {
     std::array<std::span<const s32>, MaxChannels> input_buffers{};
     std::array<std::span<s32>, MaxChannels> output_buffers{};
 
@@ -231,8 +231,8 @@ void DelayCommand::Process(const AudioRenderer::CommandListProcessor& processor)
                      processor.sample_count);
 }
 
-bool DelayCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool DelayCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/delay.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/effect/delay.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for a delay effect. Delays inputs mix buffers according to the parameters
  * and state, outputs receives the delayed samples.
@@ -27,14 +26,14 @@ struct DelayCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -42,7 +41,7 @@ struct DelayCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer offsets for each channel
     std::array<s16, MaxChannels> inputs;
@@ -58,4 +57,4 @@ struct DelayCommand : ICommand {
     bool effect_enabled;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/i3dl2_reverb.cpp

@@ -3,11 +3,11 @@
 
 #include <numbers>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/i3dl2_reverb.h"
 #include "common/polyfill_ranges.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 constexpr std::array<f32, I3dl2ReverbInfo::MaxDelayLines> MinDelayLineTimes{
     5.0f,
@@ -394,7 +394,7 @@ static void ApplyI3dl2ReverbEffect(const I3dl2ReverbInfo::ParameterVersion1& par
     }
 }
 
-void I3dl2ReverbCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcessor& processor,
+void I3dl2ReverbCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
                               std::string& string) {
     string += fmt::format("I3dl2ReverbCommand\n\tenabled {} \n\tinputs: ", effect_enabled);
     for (u32 i = 0; i < parameter.channel_count; i++) {
@@ -407,7 +407,7 @@ void I3dl2ReverbCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListP
     string += "\n";
 }
 
-void I3dl2ReverbCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void I3dl2ReverbCommand::Process(const ADSP::CommandListProcessor& processor) {
     std::array<std::span<const s32>, MaxChannels> input_buffers{};
     std::array<std::span<s32>, MaxChannels> output_buffers{};
 
@@ -431,8 +431,8 @@ void I3dl2ReverbCommand::Process(const AudioRenderer::CommandListProcessor& proc
                            processor.sample_count);
 }
 
-bool I3dl2ReverbCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool I3dl2ReverbCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/i3dl2_reverb.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/effect/i3dl2.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for a I3DL2Reverb effect. Apply a reverb to inputs mix buffer according to
  * the I3DL2 spec, outputs receives the results.
@@ -27,14 +26,14 @@ struct I3dl2ReverbCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -42,7 +41,7 @@ struct I3dl2ReverbCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer offsets for each channel
     std::array<s16, MaxChannels> inputs;
@@ -58,4 +57,4 @@ struct I3dl2ReverbCommand : ICommand {
     bool effect_enabled;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/light_limiter.cpp

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/light_limiter.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 /**
  * Update the LightLimiterInfo state according to the given parameters.
  * A no-op.
@@ -133,8 +133,8 @@ static void ApplyLightLimiterEffect(const LightLimiterInfo::ParameterVersion2& p
     }
 }
 
-void LightLimiterVersion1Command::Dump(
-    [[maybe_unused]] const AudioRenderer::CommandListProcessor& processor, std::string& string) {
+void LightLimiterVersion1Command::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
+                                       std::string& string) {
     string += fmt::format("LightLimiterVersion1Command\n\tinputs: ");
     for (u32 i = 0; i < MaxChannels; i++) {
         string += fmt::format("{:02X}, ", inputs[i]);
@@ -146,7 +146,7 @@ void LightLimiterVersion1Command::Dump(
     string += "\n";
 }
 
-void LightLimiterVersion1Command::Process(const AudioRenderer::CommandListProcessor& processor) {
+void LightLimiterVersion1Command::Process(const ADSP::CommandListProcessor& processor) {
     std::array<std::span<const s32>, MaxChannels> input_buffers{};
     std::array<std::span<s32>, MaxChannels> output_buffers{};
 
@@ -172,12 +172,12 @@ void LightLimiterVersion1Command::Process(const AudioRenderer::CommandListProces
                             processor.sample_count, statistics);
 }
 
-bool LightLimiterVersion1Command::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool LightLimiterVersion1Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-void LightLimiterVersion2Command::Dump(
-    [[maybe_unused]] const AudioRenderer::CommandListProcessor& processor, std::string& string) {
+void LightLimiterVersion2Command::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
+                                       std::string& string) {
     string += fmt::format("LightLimiterVersion2Command\n\tinputs: \n");
     for (u32 i = 0; i < MaxChannels; i++) {
         string += fmt::format("{:02X}, ", inputs[i]);
@@ -189,7 +189,7 @@ void LightLimiterVersion2Command::Dump(
     string += "\n";
 }
 
-void LightLimiterVersion2Command::Process(const AudioRenderer::CommandListProcessor& processor) {
+void LightLimiterVersion2Command::Process(const ADSP::CommandListProcessor& processor) {
     std::array<std::span<const s32>, MaxChannels> input_buffers{};
     std::array<std::span<s32>, MaxChannels> output_buffers{};
 
@@ -215,8 +215,8 @@ void LightLimiterVersion2Command::Process(const AudioRenderer::CommandListProces
                             processor.sample_count, statistics);
 }
 
-bool LightLimiterVersion2Command::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool LightLimiterVersion2Command::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/light_limiter.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/effect/light_limiter.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for limiting volume between a high and low threshold.
  * Version 1.
@@ -27,14 +26,14 @@ struct LightLimiterVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -42,7 +41,7 @@ struct LightLimiterVersion1Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer offsets for each channel
     std::array<s16, MaxChannels> inputs;
@@ -69,21 +68,21 @@ struct LightLimiterVersion2Command : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer offsets for each channel
     std::array<s16, MaxChannels> inputs;
@@ -101,4 +100,4 @@ struct LightLimiterVersion2Command : ICommand {
     bool effect_enabled;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/multi_tap_biquad_filter.cpp

@@ -1,20 +1,20 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/biquad_filter.h"
 #include "audio_core/renderer/command/effect/multi_tap_biquad_filter.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
-void MultiTapBiquadFilterCommand::Dump(
-    [[maybe_unused]] const AudioRenderer::CommandListProcessor& processor, std::string& string) {
+void MultiTapBiquadFilterCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
+                                       std::string& string) {
     string += fmt::format(
         "MultiTapBiquadFilterCommand\n\tinput {:02X}\n\toutput {:02X}\n\tneeds_init ({}, {})\n",
         input, output, needs_init[0], needs_init[1]);
 }
 
-void MultiTapBiquadFilterCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void MultiTapBiquadFilterCommand::Process(const ADSP::CommandListProcessor& processor) {
     if (filter_tap_count > MaxBiquadFilters) {
         LOG_ERROR(Service_Audio, "Too many filter taps! {}", filter_tap_count);
         filter_tap_count = MaxBiquadFilters;
@@ -38,8 +38,8 @@ void MultiTapBiquadFilterCommand::Process(const AudioRenderer::CommandListProces
     }
 }
 
-bool MultiTapBiquadFilterCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool MultiTapBiquadFilterCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/multi_tap_biquad_filter.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/voice/voice_info.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for applying multiple biquads at once.
  */
@@ -26,14 +25,14 @@ struct MultiTapBiquadFilterCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -41,7 +40,7 @@ struct MultiTapBiquadFilterCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer index
     s16 input;
@@ -57,4 +56,4 @@ struct MultiTapBiquadFilterCommand : ICommand {
     u8 filter_tap_count;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/reverb.cpp

@@ -4,11 +4,11 @@
 #include <numbers>
 #include <ranges>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/effect/reverb.h"
 #include "common/polyfill_ranges.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
 constexpr std::array<f32, ReverbInfo::MaxDelayLines> FdnMaxDelayLineTimes = {
     53.9532470703125f,
@@ -396,7 +396,7 @@ static void ApplyReverbEffect(const ReverbInfo::ParameterVersion2& params, Rever
     }
 }
 
-void ReverbCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProcessor& processor,
+void ReverbCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
                          std::string& string) {
     string += fmt::format(
         "ReverbCommand\n\tenabled {} long_size_pre_delay_supported {}\n\tinputs: ", effect_enabled,
@@ -411,7 +411,7 @@ void ReverbCommand::Dump([[maybe_unused]] const AudioRenderer::CommandListProces
     string += "\n";
 }
 
-void ReverbCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void ReverbCommand::Process(const ADSP::CommandListProcessor& processor) {
     std::array<std::span<const s32>, MaxChannels> input_buffers{};
     std::array<std::span<s32>, MaxChannels> output_buffers{};
 
@@ -435,8 +435,8 @@ void ReverbCommand::Process(const AudioRenderer::CommandListProcessor& processor
                       processor.sample_count);
 }
 
-bool ReverbCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool ReverbCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/effect/reverb.h

@@ -10,12 +10,11 @@
 #include "audio_core/renderer/effect/reverb.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-
 /**
  * AudioRenderer command for a Reverb effect. Apply a reverb to inputs mix buffer, outputs receives
  * the results.
@@ -27,14 +26,14 @@ struct ReverbCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string - The string to print into.
      */
-    void Dump(const AudioRenderer::CommandListProcessor& processor, std::string& string) override;
+    void Dump(const ADSP::CommandListProcessor& processor, std::string& string) override;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    void Process(const AudioRenderer::CommandListProcessor& processor) override;
+    void Process(const ADSP::CommandListProcessor& processor) override;
 
     /**
      * Verify this command's data is valid.
@@ -42,7 +41,7 @@ struct ReverbCommand : ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    bool Verify(const AudioRenderer::CommandListProcessor& processor) override;
+    bool Verify(const ADSP::CommandListProcessor& processor) override;
 
     /// Input mix buffer offsets for each channel
     std::array<s16, MaxChannels> inputs;
@@ -60,4 +59,4 @@ struct ReverbCommand : ICommand {
     bool long_size_pre_delay_supported;
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/icommand.h

@@ -3,18 +3,14 @@
 
 #pragma once
 
-#include <string>
-
 #include "audio_core/common/common.h"
 #include "common/common_types.h"
 
-namespace AudioCore::ADSP::AudioRenderer {
+namespace AudioCore::AudioRenderer {
+namespace ADSP {
 class CommandListProcessor;
 }
 
-namespace AudioCore::Renderer {
-using namespace ::AudioCore::ADSP;
-
 enum class CommandId : u8 {
     /* 0x00 */ Invalid,
     /* 0x01 */ DataSourcePcmInt16Version1,
@@ -63,15 +59,14 @@ struct ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @param string    - The string to print into.
      */
-    virtual void Dump(const AudioRenderer::CommandListProcessor& processor,
-                      std::string& string) = 0;
+    virtual void Dump(const ADSP::CommandListProcessor& processor, std::string& string) = 0;
 
     /**
      * Process this command.
      *
      * @param processor - The CommandListProcessor processing this command.
      */
-    virtual void Process(const AudioRenderer::CommandListProcessor& processor) = 0;
+    virtual void Process(const ADSP::CommandListProcessor& processor) = 0;
 
     /**
      * Verify this command's data is valid.
@@ -79,7 +74,7 @@ struct ICommand {
      * @param processor - The CommandListProcessor processing this command.
      * @return True if the command is valid, otherwise false.
      */
-    virtual bool Verify(const AudioRenderer::CommandListProcessor& processor) = 0;
+    virtual bool Verify(const ADSP::CommandListProcessor& processor) = 0;
 
     /// Command magic 0xCAFEBABE
     u32 magic{};
@@ -95,4 +90,4 @@ struct ICommand {
     u32 node_id{};
 };
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer

src/audio_core/renderer/command/mix/clear_mix.cpp

@@ -3,22 +3,22 @@
 
 #include <string>
 
-#include "audio_core/adsp/apps/audio_renderer/command_list_processor.h"
+#include "audio_core/renderer/adsp/command_list_processor.h"
 #include "audio_core/renderer/command/mix/clear_mix.h"
 
-namespace AudioCore::Renderer {
+namespace AudioCore::AudioRenderer {
 
-void ClearMixBufferCommand::Dump(
-    [[maybe_unused]] const AudioRenderer::CommandListProcessor& processor, std::string& string) {
+void ClearMixBufferCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor,
+                                 std::string& string) {
     string += fmt::format("ClearMixBufferCommand\n");
 }
 
-void ClearMixBufferCommand::Process(const AudioRenderer::CommandListProcessor& processor) {
+void ClearMixBufferCommand::Process(const ADSP::CommandListProcessor& processor) {
     memset(processor.mix_buffers.data(), 0, processor.mix_buffers.size_bytes());
 }
 
-bool ClearMixBufferCommand::Verify(const AudioRenderer::CommandListProcessor& processor) {
+bool ClearMixBufferCommand::Verify(const ADSP::CommandListProcessor& processor) {
     return true;
 }
 
-} // namespace AudioCore::Renderer
+} // namespace AudioCore::AudioRenderer