Skip to content

Commit 74f719a

Browse files
committed
Implemented clearCache argument in Audio creation
1 parent 87c1d45 commit 74f719a

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

api/AltV.Net.CApi/Libraries/ClientLibrary.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public unsafe interface IClientLibrary
112112
public delegate* unmanaged[Cdecl]<nint, nint, nint, int*, nint> Core_Client_FileRead { get; }
113113
public delegate* unmanaged[Cdecl]<nint, nint, byte> Core_CopyToClipboard { get; }
114114
public delegate* unmanaged[Cdecl]<nint, uint, nint, nint, uint*, nint> Core_CreateAttachedOutput { get; }
115-
public delegate* unmanaged[Cdecl]<nint, nint, float, byte, nint, nint, uint*, nint> Core_CreateAudio { get; }
115+
public delegate* unmanaged[Cdecl]<nint, nint, float, byte, byte, nint, nint, uint*, nint> Core_CreateAudio { get; }
116116
public delegate* unmanaged[Cdecl]<nint, uint, nint, uint*, nint> Core_CreateAudioFilter { get; }
117117
public delegate* unmanaged[Cdecl]<nint, byte, Vector3, Vector3, float, float, Rgba, Rgba, uint, nint, uint*, nint> Core_CreateCheckpoint { get; }
118118
public delegate* unmanaged[Cdecl]<nint, uint, nint, uint*, nint> Core_CreateFrontendOutput { get; }
@@ -989,7 +989,7 @@ public unsafe class ClientLibrary : IClientLibrary
989989
public delegate* unmanaged[Cdecl]<nint, nint, nint, int*, nint> Core_Client_FileRead { get; }
990990
public delegate* unmanaged[Cdecl]<nint, nint, byte> Core_CopyToClipboard { get; }
991991
public delegate* unmanaged[Cdecl]<nint, uint, nint, nint, uint*, nint> Core_CreateAttachedOutput { get; }
992-
public delegate* unmanaged[Cdecl]<nint, nint, float, byte, nint, nint, uint*, nint> Core_CreateAudio { get; }
992+
public delegate* unmanaged[Cdecl]<nint, nint, float, byte, byte, nint, nint, uint*, nint> Core_CreateAudio { get; }
993993
public delegate* unmanaged[Cdecl]<nint, uint, nint, uint*, nint> Core_CreateAudioFilter { get; }
994994
public delegate* unmanaged[Cdecl]<nint, byte, Vector3, Vector3, float, float, Rgba, Rgba, uint, nint, uint*, nint> Core_CreateCheckpoint { get; }
995995
public delegate* unmanaged[Cdecl]<nint, uint, nint, uint*, nint> Core_CreateFrontendOutput { get; }
@@ -1963,8 +1963,8 @@ public unsafe class ClientLibrary : IClientLibrary
19631963
private static byte Core_CopyToClipboardFallback(nint _core, nint _value) => throw new Exceptions.OutdatedSdkException("Core_CopyToClipboard", "Core_CopyToClipboard SDK method is outdated. Please update your module nuget");
19641964
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateAttachedOutputDelegate(nint _core, uint _categoryHash, nint _entity, nint _resource, uint* _id);
19651965
private static nint Core_CreateAttachedOutputFallback(nint _core, uint _categoryHash, nint _entity, nint _resource, uint* _id) => throw new Exceptions.OutdatedSdkException("Core_CreateAttachedOutput", "Core_CreateAttachedOutput SDK method is outdated. Please update your module nuget");
1966-
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateAudioDelegate(nint _core, nint _source, float _volume, byte _isRadio, nint _basePath, nint _resource, uint* _id);
1967-
private static nint Core_CreateAudioFallback(nint _core, nint _source, float _volume, byte _isRadio, nint _basePath, nint _resource, uint* _id) => throw new Exceptions.OutdatedSdkException("Core_CreateAudio", "Core_CreateAudio SDK method is outdated. Please update your module nuget");
1966+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateAudioDelegate(nint _core, nint _source, float _volume, byte _isRadio, byte _clearCache, nint _basePath, nint _resource, uint* _id);
1967+
private static nint Core_CreateAudioFallback(nint _core, nint _source, float _volume, byte _isRadio, byte _clearCache, nint _basePath, nint _resource, uint* _id) => throw new Exceptions.OutdatedSdkException("Core_CreateAudio", "Core_CreateAudio SDK method is outdated. Please update your module nuget");
19681968
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateAudioFilterDelegate(nint _core, uint _hash, nint _resource, uint* _id);
19691969
private static nint Core_CreateAudioFilterFallback(nint _core, uint _hash, nint _resource, uint* _id) => throw new Exceptions.OutdatedSdkException("Core_CreateAudioFilter", "Core_CreateAudioFilter SDK method is outdated. Please update your module nuget");
19701970
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate nint Core_CreateCheckpointDelegate(nint _core, byte _type, Vector3 _pos, Vector3 _nextPos, float _radius, float _height, Rgba _color, Rgba _iconColor, uint _streamingDistance, nint _resource, uint* _id);
@@ -3512,7 +3512,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
35123512
public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
35133513
{
35143514
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
3515-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 5248804555507714941UL) Outdated = true;
3515+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10237860134860447738UL) Outdated = true;
35163516
Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);
35173517
Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);
35183518
Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);
@@ -3615,7 +3615,7 @@ public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
36153615
Core_Client_FileRead = (delegate* unmanaged[Cdecl]<nint, nint, nint, int*, nint>) GetUnmanagedPtr<Core_Client_FileReadDelegate>(funcTable, 6889820282703247958UL, Core_Client_FileReadFallback);
36163616
Core_CopyToClipboard = (delegate* unmanaged[Cdecl]<nint, nint, byte>) GetUnmanagedPtr<Core_CopyToClipboardDelegate>(funcTable, 5818638619878077112UL, Core_CopyToClipboardFallback);
36173617
Core_CreateAttachedOutput = (delegate* unmanaged[Cdecl]<nint, uint, nint, nint, uint*, nint>) GetUnmanagedPtr<Core_CreateAttachedOutputDelegate>(funcTable, 406446736374670243UL, Core_CreateAttachedOutputFallback);
3618-
Core_CreateAudio = (delegate* unmanaged[Cdecl]<nint, nint, float, byte, nint, nint, uint*, nint>) GetUnmanagedPtr<Core_CreateAudioDelegate>(funcTable, 3103686312946243295UL, Core_CreateAudioFallback);
3618+
Core_CreateAudio = (delegate* unmanaged[Cdecl]<nint, nint, float, byte, byte, nint, nint, uint*, nint>) GetUnmanagedPtr<Core_CreateAudioDelegate>(funcTable, 3650111499085703859UL, Core_CreateAudioFallback);
36193619
Core_CreateAudioFilter = (delegate* unmanaged[Cdecl]<nint, uint, nint, uint*, nint>) GetUnmanagedPtr<Core_CreateAudioFilterDelegate>(funcTable, 7795522738595486135UL, Core_CreateAudioFilterFallback);
36203620
Core_CreateCheckpoint = (delegate* unmanaged[Cdecl]<nint, byte, Vector3, Vector3, float, float, Rgba, Rgba, uint, nint, uint*, nint>) GetUnmanagedPtr<Core_CreateCheckpointDelegate>(funcTable, 11816472825532824083UL, Core_CreateCheckpointFallback);
36213621
Core_CreateFrontendOutput = (delegate* unmanaged[Cdecl]<nint, uint, nint, uint*, nint>) GetUnmanagedPtr<Core_CreateFrontendOutputDelegate>(funcTable, 12349543411758954921UL, Core_CreateFrontendOutputFallback);

api/AltV.Net.CApi/Libraries/ServerLibrary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1852,7 +1852,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
18521852
public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
18531853
{
18541854
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1855-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 5248804555507714941UL) Outdated = true;
1855+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10237860134860447738UL) Outdated = true;
18561856
BaseObject_DeleteSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<BaseObject_DeleteSyncedMetaDataDelegate>(funcTable, 8228424877092269355UL, BaseObject_DeleteSyncedMetaDataFallback);
18571857
BaseObject_SetMultipleSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void>) GetUnmanagedPtr<BaseObject_SetMultipleSyncedMetaDataDelegate>(funcTable, 1390762125822890831UL, BaseObject_SetMultipleSyncedMetaDataFallback);
18581858
BaseObject_SetSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, nint, void>) GetUnmanagedPtr<BaseObject_SetSyncedMetaDataDelegate>(funcTable, 8002999088966424231UL, BaseObject_SetSyncedMetaDataFallback);

api/AltV.Net.CApi/Libraries/SharedLibrary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
16041604
public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
16051605
{
16061606
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1607-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 5248804555507714941UL) Outdated = true;
1607+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10237860134860447738UL) Outdated = true;
16081608
Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
16091609
AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
16101610
AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);

api/AltV.Net.Client/Alt.Create.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public partial class Alt
1616
public static IWebView CreateWebView(string url, bool isOverlay = false, Vector2? pos = null, Vector2? size = null) => Core.CreateWebView(url, isOverlay, pos, size);
1717
public static IWebView CreateWebView(string url, uint propHash, string targetTexture) => Core.CreateWebView(url, propHash, targetTexture);
1818
public static IRmlDocument CreateRmlDocument(string url) => Core.CreateRmlDocument(url);
19-
public static IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "") => Core.CreateAudio(source, volume, isRadio, basePath);
19+
public static IAudio CreateAudio(string source, float volume, bool isRadio = false, bool clearCache = true, string basePath = "") => Core.CreateAudio(source, volume, isRadio, clearCache, basePath);
2020
public static IAudioFilter CreateAudioFilter(uint hash) => Core.CreateAudioFilter(hash);
2121
public static IAudioOutputFrontend CreateAudioOutputFrontend(uint categoryHash) => Core.CreateAudioOutputFrontend(categoryHash);
2222
public static IAudioOutputWorld CreateAudioOutputWorld(uint categoryHash, Position pos) => Core.CreateAudioOutputWorld(categoryHash, pos);

api/AltV.Net.Client/Core.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,24 +424,24 @@ public ICheckpoint CreateCheckpoint(CheckpointType type, Vector3 pos, Vector3 ne
424424
return PoolManager.Checkpoint.Create(this, ptr, id);
425425
}
426426

427-
public IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, string basePath = "")
427+
public IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, bool clearCache = true, string basePath = "")
428428
{
429429
unsafe
430430
{
431431
uint pId = default;
432432
var sourcePtr = MemoryUtils.StringToHGlobalUtf8(source);
433433
var basePathPtr = MemoryUtils.StringToHGlobalUtf8(basePath);
434-
var ptr = Library.Client.Core_CreateAudio(NativePointer, sourcePtr, volume, isRadio ?(byte)1:(byte)0, basePathPtr, Resource.NativePointer, &pId);
434+
var ptr = Library.Client.Core_CreateAudio(NativePointer, sourcePtr, volume, isRadio ? (byte)1 : (byte)0, clearCache ? (byte)1 : (byte)0, basePathPtr, Resource.NativePointer, &pId);
435435
id = pId;
436436
Marshal.FreeHGlobal(basePathPtr);
437437
Marshal.FreeHGlobal(sourcePtr);
438438
return ptr;
439439
}
440440
}
441441

442-
public IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "")
442+
public IAudio CreateAudio(string source, float volume, bool isRadio = false, bool clearCache = true, string basePath = "")
443443
{
444-
var ptr = CreateAudioPtr(out var id, source, volume, isRadio, basePath);
444+
var ptr = CreateAudioPtr(out var id, source, volume, isRadio, clearCache, basePath);
445445
if (ptr == IntPtr.Zero) return null;
446446
return PoolManager.Audio.Create(this, ptr, id);
447447
}

api/AltV.Net.Client/ICore.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public interface ICore : ISharedCore
135135
void ClearTimer(uint id);
136136
IntPtr CreateCheckpointPtr(out uint id, CheckpointType type, Vector3 pos, Vector3 nextPos, float radius, float height, Rgba color, Rgba iconColor, uint streamingDistance);
137137
ICheckpoint CreateCheckpoint(CheckpointType type, Vector3 pos, Vector3 nextPos, float radius, float height, Rgba color, Rgba iconColor, uint streamingDistance);
138-
IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, string basePath = "");
139-
IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "");
138+
IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, bool clearCache = true, string basePath = "");
139+
IAudio CreateAudio(string source, float volume, bool isRadio = false, bool clearCache = true, string basePath = "");
140140

141141
IntPtr CreateAudioFilterPtr(out uint id, uint hash);
142142
IntPtr CreateFrontendOutputPtr(out uint id, uint categoryHash);

runtime

0 commit comments

Comments
 (0)