From 8fdac10ceb6f05c460b7eabe5999bc1c676cbed4 Mon Sep 17 00:00:00 2001 From: Vektor Date: Tue, 4 Jul 2023 15:06:36 +0200 Subject: [PATCH] wip audio api rework --- c-api/core.cpp | 2 +- c-api/entities/audio.cpp | 14 +++++++------- cpp-sdk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/c-api/core.cpp b/c-api/core.cpp index 2c70807..e35cf05 100644 --- a/c-api/core.cpp +++ b/c-api/core.cpp @@ -1447,7 +1447,7 @@ alt::IWebSocketClient* Core_CreateWebsocketClient(alt::ICore* core, alt::IResour } alt::IAudio* Core_CreateAudio(alt::ICore* core, alt::IResource* resource, const char* source, float volume, uint32_t category, uint8_t frontend, uint32_t &id) { - auto audio = core->CreateAudio(source, volume, category, frontend, resource); + auto audio = core->CreateAudio(source, volume, resource); if (audio != nullptr) { id = audio->GetID(); } diff --git a/c-api/entities/audio.cpp b/c-api/entities/audio.cpp index 42ba42c..036ebab 100644 --- a/c-api/entities/audio.cpp +++ b/c-api/entities/audio.cpp @@ -14,11 +14,11 @@ alt::IBaseObject* Audio_GetBaseObject(alt::IAudio* audio) { uint32_t Audio_GetCategory(alt::IAudio* audio) { - return audio->GetCategory(); + return 0; } void Audio_SetCategory(alt::IAudio* audio, uint32_t value) { - audio->SetCategory(value); + //audio->SetCategory(value); } double Audio_GetCurrentTime(alt::IAudio* audio) { @@ -26,7 +26,7 @@ double Audio_GetCurrentTime(alt::IAudio* audio) { } uint8_t Audio_IsFrontendPlay(alt::IAudio* audio) { - return audio->IsFrontendPlay(); + return 0; } uint8_t Audio_GetLooped(alt::IAudio* audio) { @@ -63,19 +63,19 @@ void Audio_SetVolume(alt::IAudio* audio, float value) { void Audio_AddOutput_ScriptId(alt::IAudio* audio, uint32_t value) { - audio->AddOutput(value); + //audio->AddOutput(value); } void Audio_AddOutput_Entity(alt::IAudio* audio, alt::IEntity* value) { - audio->AddOutput(value); + //audio->AddOutput(value); } void Audio_RemoveOutput_ScriptId(alt::IAudio* audio, uint32_t value) { - audio->RemoveOutput(value); + //->RemoveOutput(value); } void Audio_RemoveOutput_Entity(alt::IAudio* audio, alt::IEntity* value) { - audio->RemoveOutput(value); + //audio->RemoveOutput(value); } void Audio_GetOutputs(alt::IAudio* audio, void**& entityArray, uint8_t*& entityTypesArray, uint32_t*& scriptIdArray, uint32_t& size) { diff --git a/cpp-sdk b/cpp-sdk index 3199c7e..bda8685 160000 --- a/cpp-sdk +++ b/cpp-sdk @@ -1 +1 @@ -Subproject commit 3199c7eb4c5b23e3d696df2ebd00beac951b28e5 +Subproject commit bda8685cf5605674dd4513aa16635c80dac0b78f