From 7b9eb469c9a5185e618dd5df98e7d07cea27ba27 Mon Sep 17 00:00:00 2001 From: averne Date: Tue, 31 Jan 2023 22:36:51 +0100 Subject: [PATCH] audctl: fix TargetVolume functions --- nx/include/switch/services/audctl.h | 8 ++++---- nx/source/services/audctl.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nx/include/switch/services/audctl.h b/nx/include/switch/services/audctl.h index 8eae337a..8c831f28 100644 --- a/nx/include/switch/services/audctl.h +++ b/nx/include/switch/services/audctl.h @@ -41,10 +41,10 @@ Result audctlInitialize(void); void audctlExit(void); Service* audctlGetServiceSession(void); -Result audctlGetTargetVolume(float* volume_out, AudioTarget target); -Result audctlSetTargetVolume(AudioTarget target, float volume); -Result audctlGetTargetVolumeMin(float* volume_out); -Result audctlGetTargetVolumeMax(float* volume_out); +Result audctlGetTargetVolume(s32* volume_out, AudioTarget target); +Result audctlSetTargetVolume(AudioTarget target, s32 volume); +Result audctlGetTargetVolumeMin(s32* volume_out); +Result audctlGetTargetVolumeMax(s32* volume_out); Result audctlIsTargetMute(bool* mute_out, AudioTarget target); Result audctlSetTargetMute(AudioTarget target, bool mute); Result audctlIsTargetConnected(bool* connected_out, AudioTarget target); diff --git a/nx/source/services/audctl.c b/nx/source/services/audctl.c index 7a1a09e8..e4f22f0d 100644 --- a/nx/source/services/audctl.c +++ b/nx/source/services/audctl.c @@ -20,13 +20,13 @@ Service* audctlGetServiceSession(void) { return &g_audctlSrv; } -Result audctlGetTargetVolume(float* volume_out, AudioTarget target) { +Result audctlGetTargetVolume(s32* volume_out, AudioTarget target) { const struct { u32 target; } in = { target }; struct { - float volume; + s32 volume; } out; Result rc = serviceDispatchInOut(&g_audctlSrv, 0, in, out); @@ -37,18 +37,18 @@ Result audctlGetTargetVolume(float* volume_out, AudioTarget target) { return rc; } -Result audctlSetTargetVolume(AudioTarget target, float volume) { +Result audctlSetTargetVolume(AudioTarget target, s32 volume) { const struct { u32 target; - float volume; + s32 volume; } in = { target, volume }; return serviceDispatchIn(&g_audctlSrv, 1, in); } -Result audctlGetTargetVolumeMin(float* volume_out) { +Result audctlGetTargetVolumeMin(s32* volume_out) { struct { - float volume; + s32 volume; } out; Result rc = serviceDispatchOut(&g_audctlSrv, 2, out); @@ -59,9 +59,9 @@ Result audctlGetTargetVolumeMin(float* volume_out) { return rc; } -Result audctlGetTargetVolumeMax(float* volume_out) { +Result audctlGetTargetVolumeMax(s32* volume_out) { struct { - float volume; + s32 volume; } out; Result rc = serviceDispatchOut(&g_audctlSrv, 3, out);