summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/audio
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-04-13 06:25:32 +0200
committerGitHub <noreply@github.com>2018-04-13 06:25:32 +0200
commitb7369f99ec3f794bcc626b83f78efa5728087750 (patch)
tree44141ddb2b3d6093b14886df22d84ff120e941e5 /src/core/hle/service/audio
parentMerge pull request #320 from mailwl/ssl-update (diff)
parentVarious fixes and clang (diff)
downloadyuzu-b7369f99ec3f794bcc626b83f78efa5728087750.tar
yuzu-b7369f99ec3f794bcc626b83f78efa5728087750.tar.gz
yuzu-b7369f99ec3f794bcc626b83f78efa5728087750.tar.bz2
yuzu-b7369f99ec3f794bcc626b83f78efa5728087750.tar.lz
yuzu-b7369f99ec3f794bcc626b83f78efa5728087750.tar.xz
yuzu-b7369f99ec3f794bcc626b83f78efa5728087750.tar.zst
yuzu-b7369f99ec3f794bcc626b83f78efa5728087750.zip
Diffstat (limited to 'src/core/hle/service/audio')
-rw-r--r--src/core/hle/service/audio/audin_u.cpp29
-rw-r--r--src/core/hle/service/audio/audout_u.cpp29
-rw-r--r--src/core/hle/service/audio/audrec_u.cpp16
-rw-r--r--src/core/hle/service/audio/audren_u.cpp24
-rw-r--r--src/core/hle/service/audio/codecctl.cpp6
5 files changed, 60 insertions, 44 deletions
diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp
index ee749fddd..3c495b3a0 100644
--- a/src/core/hle/service/audio/audin_u.cpp
+++ b/src/core/hle/service/audio/audin_u.cpp
@@ -14,15 +14,20 @@ class IAudioIn final : public ServiceFramework<IAudioIn> {
public:
IAudioIn() : ServiceFramework("IAudioIn") {
static const FunctionInfo functions[] = {
- {0x0, nullptr, "GetAudioInState"},
- {0x1, nullptr, "StartAudioIn"},
- {0x2, nullptr, "StopAudioIn"},
- {0x3, nullptr, "AppendAudioInBuffer_1"},
- {0x4, nullptr, "RegisterBufferEvent"},
- {0x5, nullptr, "GetReleasedAudioInBuffer_1"},
- {0x6, nullptr, "ContainsAudioInBuffer"},
- {0x7, nullptr, "AppendAudioInBuffer_2"},
- {0x8, nullptr, "GetReleasedAudioInBuffer_2"},
+ {0, nullptr, "GetAudioInState"},
+ {1, nullptr, "StartAudioIn"},
+ {2, nullptr, "StopAudioIn"},
+ {3, nullptr, "AppendAudioInBuffer"},
+ {4, nullptr, "RegisterBufferEvent"},
+ {5, nullptr, "GetReleasedAudioInBuffer"},
+ {6, nullptr, "ContainsAudioInBuffer"},
+ {7, nullptr, "AppendAudioInBufferWithUserEvent"},
+ {8, nullptr, "AppendAudioInBufferAuto"},
+ {9, nullptr, "GetReleasedAudioInBufferAuto"},
+ {10, nullptr, "AppendAudioInBufferWithUserEventAuto"},
+ {11, nullptr, "GetAudioInBufferCount"},
+ {12, nullptr, "SetAudioInDeviceGain"},
+ {13, nullptr, "GetAudioInDeviceGain"},
};
RegisterHandlers(functions);
}
@@ -31,8 +36,10 @@ public:
AudInU::AudInU() : ServiceFramework("audin:u") {
static const FunctionInfo functions[] = {
- {0x00000000, nullptr, "ListAudioIns"},
- {0x00000001, nullptr, "OpenAudioIn"},
+ {0, nullptr, "ListAudioIns"},
+ {1, nullptr, "OpenAudioIn"},
+ {3, nullptr, "OpenAudioInAuto"},
+ {4, nullptr, "ListAudioInsAuto"},
};
RegisterHandlers(functions);
}
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 8e935cb7f..db6e6647c 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -25,15 +25,18 @@ class IAudioOut final : public ServiceFramework<IAudioOut> {
public:
IAudioOut() : ServiceFramework("IAudioOut"), audio_out_state(AudioState::Stopped) {
static const FunctionInfo functions[] = {
- {0x0, &IAudioOut::GetAudioOutState, "GetAudioOutState"},
- {0x1, &IAudioOut::StartAudioOut, "StartAudioOut"},
- {0x2, &IAudioOut::StopAudioOut, "StopAudioOut"},
- {0x3, &IAudioOut::AppendAudioOutBuffer_1, "AppendAudioOutBuffer_1"},
- {0x4, &IAudioOut::RegisterBufferEvent, "RegisterBufferEvent"},
- {0x5, &IAudioOut::GetReleasedAudioOutBuffer_1, "GetReleasedAudioOutBuffer_1"},
- {0x6, nullptr, "ContainsAudioOutBuffer"},
- {0x7, nullptr, "AppendAudioOutBuffer_2"},
- {0x8, nullptr, "GetReleasedAudioOutBuffer_2"},
+ {0, &IAudioOut::GetAudioOutState, "GetAudioOutState"},
+ {1, &IAudioOut::StartAudioOut, "StartAudioOut"},
+ {2, &IAudioOut::StopAudioOut, "StopAudioOut"},
+ {3, &IAudioOut::AppendAudioOutBuffer, "AppendAudioOutBuffer"},
+ {4, &IAudioOut::RegisterBufferEvent, "RegisterBufferEvent"},
+ {5, &IAudioOut::GetReleasedAudioOutBuffer, "GetReleasedAudioOutBuffer"},
+ {6, nullptr, "ContainsAudioOutBuffer"},
+ {7, nullptr, "AppendAudioOutBufferAuto"},
+ {8, nullptr, "GetReleasedAudioOutBufferAuto"},
+ {9, nullptr, "GetAudioOutBufferCount"},
+ {10, nullptr, "GetAudioOutPlayedSampleCount"},
+ {11, nullptr, "FlushAudioOutBuffers"},
};
RegisterHandlers(functions);
@@ -94,7 +97,7 @@ private:
rb.PushCopyObjects(buffer_event);
}
- void AppendAudioOutBuffer_1(Kernel::HLERequestContext& ctx) {
+ void AppendAudioOutBuffer(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::RequestParser rp{ctx};
@@ -105,7 +108,7 @@ private:
rb.Push(RESULT_SUCCESS);
}
- void GetReleasedAudioOutBuffer_1(Kernel::HLERequestContext& ctx) {
+ void GetReleasedAudioOutBuffer(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_Audio, "(STUBBED) called");
// TODO(st4rk): This is how libtransistor currently implements the
@@ -196,8 +199,8 @@ void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) {
AudOutU::AudOutU() : ServiceFramework("audout:u") {
static const FunctionInfo functions[] = {{0x00000000, &AudOutU::ListAudioOuts, "ListAudioOuts"},
{0x00000001, &AudOutU::OpenAudioOut, "OpenAudioOut"},
- {0x00000002, nullptr, "Unknown2"},
- {0x00000003, nullptr, "Unknown3"}};
+ {0x00000002, nullptr, "ListAudioOutsAuto"},
+ {0x00000003, nullptr, "OpenAudioOutAuto"}};
RegisterHandlers(functions);
}
diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/audrec_u.cpp
index f2626ec70..953104f19 100644
--- a/src/core/hle/service/audio/audrec_u.cpp
+++ b/src/core/hle/service/audio/audrec_u.cpp
@@ -14,13 +14,15 @@ class IFinalOutputRecorder final : public ServiceFramework<IFinalOutputRecorder>
public:
IFinalOutputRecorder() : ServiceFramework("IFinalOutputRecorder") {
static const FunctionInfo functions[] = {
- {0x0, nullptr, "GetFinalOutputRecorderState"},
- {0x1, nullptr, "StartFinalOutputRecorder"},
- {0x2, nullptr, "StopFinalOutputRecorder"},
- {0x3, nullptr, "AppendFinalOutputRecorderBuffer"},
- {0x4, nullptr, "RegisterBufferEvent"},
- {0x5, nullptr, "GetReleasedFinalOutputRecorderBuffer"},
- {0x6, nullptr, "ContainsFinalOutputRecorderBuffer"},
+ {0, nullptr, "GetFinalOutputRecorderState"},
+ {1, nullptr, "StartFinalOutputRecorder"},
+ {2, nullptr, "StopFinalOutputRecorder"},
+ {3, nullptr, "AppendFinalOutputRecorderBuffer"},
+ {4, nullptr, "RegisterBufferEvent"},
+ {5, nullptr, "GetReleasedFinalOutputRecorderBuffer"},
+ {6, nullptr, "ContainsFinalOutputRecorderBuffer"},
+ {8, nullptr, "AppendFinalOutputRecorderBufferAuto"},
+ {9, nullptr, "GetReleasedFinalOutputRecorderBufferAuto"},
};
RegisterHandlers(functions);
}
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 7990595aa..0e78c57e9 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -19,16 +19,18 @@ class IAudioRenderer final : public ServiceFramework<IAudioRenderer> {
public:
IAudioRenderer() : ServiceFramework("IAudioRenderer") {
static const FunctionInfo functions[] = {
- {0x0, nullptr, "GetAudioRendererSampleRate"},
- {0x1, nullptr, "GetAudioRendererSampleCount"},
- {0x2, nullptr, "GetAudioRendererMixBufferCount"},
- {0x3, nullptr, "GetAudioRendererState"},
- {0x4, &IAudioRenderer::RequestUpdateAudioRenderer, "RequestUpdateAudioRenderer"},
- {0x5, &IAudioRenderer::StartAudioRenderer, "StartAudioRenderer"},
- {0x6, &IAudioRenderer::StopAudioRenderer, "StopAudioRenderer"},
- {0x7, &IAudioRenderer::QuerySystemEvent, "QuerySystemEvent"},
- {0x8, nullptr, "SetAudioRendererRenderingTimeLimit"},
- {0x9, nullptr, "GetAudioRendererRenderingTimeLimit"},
+ {0, nullptr, "GetAudioRendererSampleRate"},
+ {1, nullptr, "GetAudioRendererSampleCount"},
+ {2, nullptr, "GetAudioRendererMixBufferCount"},
+ {3, nullptr, "GetAudioRendererState"},
+ {4, &IAudioRenderer::RequestUpdateAudioRenderer, "RequestUpdateAudioRenderer"},
+ {5, &IAudioRenderer::StartAudioRenderer, "StartAudioRenderer"},
+ {6, &IAudioRenderer::StopAudioRenderer, "StopAudioRenderer"},
+ {7, &IAudioRenderer::QuerySystemEvent, "QuerySystemEvent"},
+ {8, nullptr, "SetAudioRendererRenderingTimeLimit"},
+ {9, nullptr, "GetAudioRendererRenderingTimeLimit"},
+ {10, nullptr, "RequestUpdateAudioRendererAuto"},
+ {11, nullptr, "ExecuteAudioRendererRendering"},
};
RegisterHandlers(functions);
@@ -237,6 +239,8 @@ AudRenU::AudRenU() : ServiceFramework("audren:u") {
{0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"},
{1, &AudRenU::GetAudioRendererWorkBufferSize, "GetAudioRendererWorkBufferSize"},
{2, &AudRenU::GetAudioDevice, "GetAudioDevice"},
+ {3, nullptr, "OpenAudioRendererAuto"},
+ {4, nullptr, "GetAudioDeviceServiceWithRevisionInfo"},
};
RegisterHandlers(functions);
}
diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp
index d2a7f4cd0..1c86d8d17 100644
--- a/src/core/hle/service/audio/codecctl.cpp
+++ b/src/core/hle/service/audio/codecctl.cpp
@@ -22,9 +22,9 @@ CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
{0x00000007, nullptr, "SetCodecActiveTarget"},
{0x00000008, nullptr, "Unknown"},
{0x00000009, nullptr, "BindCodecHeadphoneMicJackInterrupt"},
- {0x0000000A, nullptr, "IsCodecHeadphoneMicJackInserted"},
- {0x0000000B, nullptr, "ClearCodecHeadphoneMicJackInterrupt"},
- {0x0000000C, nullptr, "IsCodecDeviceRequested"},
+ {0x00000010, nullptr, "IsCodecHeadphoneMicJackInserted"},
+ {0x00000011, nullptr, "ClearCodecHeadphoneMicJackInterrupt"},
+ {0x00000012, nullptr, "IsCodecDeviceRequested"},
};
RegisterHandlers(functions);
}