ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android Audio] Be able to turn audio on or off

This commit is contained in:
zilmar 2016-08-11 20:46:03 +10:00
parent a277fc0a60
commit a3fd417e27
2 changed files with 81 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Android/PluginAudio/AudioSettings.cpp
View File

@ -13,6 +13,14 @@
#include "trace.h" #include "trace.h"
#include "main.h" #include "main.h"
short Set_EnableAudio = 0;
extern bool g_AudioEnabled;
void SettingsChanged(void *)
{
g_AudioEnabled = GetSystemSetting(Set_EnableAudio) != 0;
}
void SetupAudioSettings(void) void SetupAudioSettings(void)
{ {
SetModuleName("AndroidAudio"); SetModuleName("AndroidAudio");
@ -29,4 +37,11 @@ void SetupAudioSettings (void)
g_ModuleLogLevel[TraceAudioInitShutdown] = GetSetting(Logging_LogAudioInitShutdown); g_ModuleLogLevel[TraceAudioInitShutdown] = GetSetting(Logging_LogAudioInitShutdown);
g_ModuleLogLevel[TraceAudioInterface] = GetSetting(Logging_LogAudioInterface); g_ModuleLogLevel[TraceAudioInterface] = GetSetting(Logging_LogAudioInterface);
Set_EnableAudio = FindSystemSettingId("Enable Audio");
if (Set_EnableAudio != 0)
{
SettingsRegisterChange(true, Set_EnableAudio, NULL, SettingsChanged);
g_AudioEnabled = GetSystemSetting(Set_EnableAudio) != 0;
}
} }

8
Source/Android/PluginAudio/Main.cpp
View File

@ -36,6 +36,8 @@ typedef struct threadLock_
} threadLock; } threadLock;
#endif #endif
bool g_AudioEnabled = true;
/* Read header for type definition */ /* Read header for type definition */
AUDIO_INFO g_AudioInfo; AUDIO_INFO g_AudioInfo;
@ -204,7 +206,6 @@ static void CloseAudio(void)
WriteTrace(TraceAudioInitShutdown, TraceDebug, "Done"); WriteTrace(TraceAudioInitShutdown, TraceDebug, "Done");
} }
static bool CreatePrimaryBuffer(void) static bool CreatePrimaryBuffer(void)
{ {
WriteTrace(TraceAudioInitShutdown, TraceDebug, "Start"); WriteTrace(TraceAudioInitShutdown, TraceDebug, "Start");
@ -636,7 +637,10 @@ EXPORT void CALL AiDacrateChanged(int SystemType)
EXPORT void CALL AiLenChanged(void) EXPORT void CALL AiLenChanged(void)
{ {
WriteTrace(TraceAudioInterface, TraceDebug, "Start (DRAM_ADDR = 0x%X LenReg = 0x%X)", *g_AudioInfo.AI__LEN_REG, *g_AudioInfo.AI__DRAM_ADDR_REG); WriteTrace(TraceAudioInterface, TraceDebug, "Start (DRAM_ADDR = 0x%X LenReg = 0x%X)", *g_AudioInfo.AI__LEN_REG, *g_AudioInfo.AI__DRAM_ADDR_REG);
if (!g_AudioEnabled)
{
return;
}
uint32_t LenReg = *g_AudioInfo.AI__LEN_REG; uint32_t LenReg = *g_AudioInfo.AI__LEN_REG;
uint8_t * p = g_AudioInfo.RDRAM + (*g_AudioInfo.AI__DRAM_ADDR_REG & 0xFFFFFF); uint8_t * p = g_AudioInfo.RDRAM + (*g_AudioInfo.AI__DRAM_ADDR_REG & 0xFFFFFF);