diff --git a/Assets/Cryville/Crtr/Game.cs b/Assets/Cryville/Crtr/Game.cs index 8b74bec..9366c61 100644 --- a/Assets/Cryville/Crtr/Game.cs +++ b/Assets/Cryville/Crtr/Game.cs @@ -124,9 +124,10 @@ namespace Cryville.Crtr { #error No FFmpeg search path. #endif + var audioEngineBuilder = new EngineBuilder(); #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - EngineBuilder.Engines.Add(typeof(Audio.Wasapi.MMDeviceEnumeratorWrapper)); - EngineBuilder.Engines.Add(typeof(Audio.WaveformAudio.WaveDeviceManager)); + audioEngineBuilder.Engines.Add(typeof(Audio.Wasapi.MMDeviceEnumeratorWrapper)); + audioEngineBuilder.Engines.Add(typeof(Audio.WaveformAudio.WaveDeviceManager)); #elif UNITY_ANDROID EngineBuilder.Engines.Add(typeof(Audio.AAudio.AAudioManager)); EngineBuilder.Engines.Add(typeof(Audio.OpenSLES.Engine)); @@ -135,7 +136,7 @@ namespace Cryville.Crtr { #endif while (true) { try { - AudioManager = EngineBuilder.Create(); + AudioManager = audioEngineBuilder.Create(); if (AudioManager == null) { Dialog.Show(null, "Fatal error: Cannot initialize audio engine"); MainLogger.Log(5, "Audio", "Cannot initialize audio engine"); @@ -160,7 +161,7 @@ namespace Cryville.Crtr { Dialog.Show(null, "An error occurred while trying to initialize the recommended audio engine\nTrying to use fallback audio engines"); MainLogger.Log(4, "Audio", "An error occurred when initializing the audio engine: {0}", ex); MainLogger.Log(2, "Audio", "Trying to use fallback audio engines"); - EngineBuilder.Engines.Remove(AudioManager.GetType()); + audioEngineBuilder.Engines.Remove(AudioManager.GetType()); } } diff --git a/Assets/Plugins/Android/Cryville.Audio.AAudio.dll b/Assets/Plugins/Android/Cryville.Audio.AAudio.dll index 3cb8770..02fb899 100644 Binary files a/Assets/Plugins/Android/Cryville.Audio.AAudio.dll and b/Assets/Plugins/Android/Cryville.Audio.AAudio.dll differ diff --git a/Assets/Plugins/Android/Cryville.Audio.AAudio.xml b/Assets/Plugins/Android/Cryville.Audio.AAudio.xml index 53b21fa..f9c3460 100644 --- a/Assets/Plugins/Android/Cryville.Audio.AAudio.xml +++ b/Assets/Plugins/Android/Cryville.Audio.AAudio.xml @@ -43,9 +43,6 @@ An that interacts with AAudio. - - - @@ -58,6 +55,9 @@ + + + @@ -70,6 +70,9 @@ + + + An that interacts with AAudio. @@ -109,73 +112,73 @@ - + - + - + Available since API level 29. - + Available since API level 31. - + Available since API level 32. - + Available since API level 28. - + Available since API level 28. - + Available since API level 32. - + Available since API level 31. - + Available since API level 30. - + Available since API level 28. - + Available since API level 32. - + Available since API level 28. - + Available since API level 29. - + Available since API level 32. - + Available since API level 28. - + Available since API level 28. - + Available since API level 28. - + Available since API level 32. - + Available since API level 28. - + Available since API level 32. - + Available since API level 30. - + Available since API level 30. diff --git a/Assets/Plugins/Android/Cryville.Audio.OpenSLES.dll b/Assets/Plugins/Android/Cryville.Audio.OpenSLES.dll index cdc24af..c6294df 100644 Binary files a/Assets/Plugins/Android/Cryville.Audio.OpenSLES.dll and b/Assets/Plugins/Android/Cryville.Audio.OpenSLES.dll differ diff --git a/Assets/Plugins/Android/Cryville.Audio.OpenSLES.xml b/Assets/Plugins/Android/Cryville.Audio.OpenSLES.xml index da9eb8f..0d5225d 100644 --- a/Assets/Plugins/Android/Cryville.Audio.OpenSLES.xml +++ b/Assets/Plugins/Android/Cryville.Audio.OpenSLES.xml @@ -32,17 +32,41 @@ + + + Exception occurring in OpenSL ES. + + + + + Creates an instance of the class. + + + + + Creates an instance of the class. + + The error message that explains the reason for the exception. + + + + Creates an instance of the class. + + The error message that explains the reason for the exception. + The exception that is the cause of the current exception. + + + + Creates an instance of the class with serialized data. + + The that holds the serialized object data about the exception being thrown. + The that contains contextual information about the source or destination. + An that interacts with OpenSL ES. - - - - - - @@ -55,16 +79,22 @@ + + + + + + - + @@ -102,41 +132,11 @@ - + - + - - - Exception occurring in OpenSL ES. - - - - - Creates an instance of the class. - - - - - Creates an instance of the class. - - The error message that explains the reason for the exception. - - - - Creates an instance of the class. - - The error message that explains the reason for the exception. - The exception that is the cause of the current exception. - - - - Creates an instance of the class with serialized data. - - The that holds the serialized object data about the exception being thrown. - The that contains contextual information about the source or destination. - diff --git a/Assets/Plugins/Android/Cryville.Interop.Java.dll b/Assets/Plugins/Android/Cryville.Interop.Java.dll index 7459838..eba6c45 100644 Binary files a/Assets/Plugins/Android/Cryville.Interop.Java.dll and b/Assets/Plugins/Android/Cryville.Interop.Java.dll differ diff --git a/Assets/Plugins/Android/Cryville.Interop.Java.xml b/Assets/Plugins/Android/Cryville.Interop.Java.xml index a97c42e..3e0628f 100644 --- a/Assets/Plugins/Android/Cryville.Interop.Java.xml +++ b/Assets/Plugins/Android/Cryville.Interop.Java.xml @@ -75,267 +75,6 @@ Pops off the local reference frame and frees all the local references. - - - The JNI Invocation API. - - - - - Unloads a Java VM and reclaims its resources. - - On failure. - - Any thread, whether attached or not, can invoke this function. If the current thread is attached, the VM waits until the current thread is the only non-daemon user-level Java thread. If the current thread is not attached, the VM attaches the current thread and then waits until the current thread is the only non-daemon user-level thread. - - - - - Attaches the current thread to a Java VM. - - or a structure to specify additional information. - A JNI interface. - On failure. - - Trying to attach a thread that is already attached is a no-op. - A native thread cannot be attached simultaneously to two Java VMs. - When a thread is attached to the VM, the context class loader is the bootstrap loader. - - - - - Detaches the current thread from a Java VM. - - On failure. - - All Java monitors held by this thread are released. All Java threads waiting for this thread to die are notified. - The main thread can be detached from the VM. - - - - - Gets the attached to the current thread. - - The requested JNI version. - A JNI interface, if an error occurs. - On failure, with a of if the current thread is not attached to the VM, or if the specified version is not supported. - - - - Same semantics as , but the newly-created java.lang.Thread instance is a daemon. - - A structure to specify additional information. - A JNI interface. - On failure. - - If the thread has already been attached via either or , this routine simply returns the of the current thread. In this case neither nor this routine have any effect on the daemon status of the thread. - - - - - Additional information for attaching the current thread to a Java VM. - - - - - The requested JNI version. - - - - - The name of the thread, or . - - - - - Global ref of a ThreadGroup object, or . - - - - - Creates an instance of the struct. - - The requested JNI version. - The name of the thread. - Global ref of a ThreadGroup object. - - - - Java VM manager. - - - - - Registers a Java VM. - - A Java VM. - is . - - - - All registered Java VMs. - - - - - The first VM registered. - - - - - The of the first VM registered. - - - - - Exception occurring in JNI functions. - - - - - The result code returned by the JNI function. - - - - - Creates an instance of the class with set to . - - - - - Creates an instance of the class with set to . - - The error message that explains the reason for the exception. - - - - Creates an instance of the class with set to . - - The error message that explains the reason for the exception. - The exception that is the cause of the current exception. - - - - Creates an instance of the class with set to . - - The exception that is the cause of the current exception. - - - - Creates an instance of the class. - - The result code returned by the JNI function. - - - - Creates an instance of the class. - - The result code returned by the JNI function. - The error message that explains the reason for the exception. - - - - Creates an instance of the class. - - The result code returned by the JNI function. - The error message that explains the reason for the exception. - The exception that is the cause of the current exception. - - - - Creates an instance of the class with serialized data. - - The that holds the serialized object data about the exception being thrown. - The that contains contextual information about the source or destination. - - - - - - - Checks the result code returned by a JNI function and throws a if an error occurred. - - The result code returned by a JNI function. - An error occurred. - - - - JNI native method. - - - - - The name of the native method. - - - - - The signature of the native method. - - - - - The function pointer of the native method. - - - The function pointers nominally must have the following signature: - ReturnType function(IntPtr env, IntPtr objectOrClass, ...) - - - - - Creates an instance of the struct. - - The name. - The signature. - The function pointer. - Either of the arguments is . - - - - Object reference type. - - - - - Invalid reference. - - - - - Local reference type. - - - - - Global reference type. - - - - - Weak global reference type. - - - - - Provides information on how the array buffer should be released. - - - - - Copy back the content and free the elems buffer. - - - - - Copy back the content but do not free the elems buffer. - - - - - Free the buffer without copying back the possible changes. - - The Java native interface. @@ -434,7 +173,7 @@ Whether refers to a static field. A java.lang.reflect.Field object. if fails. - + Causes a java.lang.Throwable object to be thrown. @@ -542,10 +281,10 @@ - Creates a new local reference that refers to the same object as . + Creates a new local reference that refers to the same object as . - A global or local reference. - A new local reference that refers to the same object as . if refers to null. + A global or local reference. + A new local reference that refers to the same object as . if refers to null. @@ -925,14 +664,14 @@ Returns the length (the count of Unicode characters) of a Java string. - A Java string object. + A Java string object. The length of the Java string. Returns a pointer to the array of Unicode characters of the string. - A Java string object. + A Java string object. Set to if a copy is made; or set to if no copy is made. A pointer to a Unicode string, or if the operation fails. @@ -943,7 +682,7 @@ Informs the VM that the native code no longer needs access to . - A Java string object. + A Java string object. A pointer to a Unicode string. The argument is a pointer obtained from string using . @@ -960,14 +699,14 @@ Returns the length in bytes of the modified UTF-8 representation of a string. - A Java string object. + A Java string object. Returns the UTF-8 length of the string. Returns a pointer to an array of bytes representing the string in modified UTF-8 encoding. - A Java string object. + A Java string object. Set to if a copy is made; or set to if no copy is made. A pointer to a modified UTF-8 string, or if the operation fails. @@ -978,7 +717,7 @@ Informs the VM that the native code no longer needs access to . - A Java string object. + A Java string object. A pointer to a modified UTF-8 string. The argument is a pointer derived from string using . @@ -1284,7 +1023,7 @@ Returns a pointer to the array of Unicode characters of the string. - A Java string object. + A Java string object. Set to if a copy is made; or it is set to if no copy is made. A pointer to a Unicode string, or if the operation fails. @@ -1296,7 +1035,7 @@ Informs the VM that the native code no longer needs access to . - A Java string object. + A Java string object. A pointer to a Unicode string. The argument is a pointer obtained from string using . @@ -1370,6 +1109,272 @@ Since references are typically implemented as pointers to memory data structures that can potentially be reused by any of the reference allocation services in the VM, once deleted, it is not specified what value the will return. + + + The JNI Invocation API. + + + + + Unloads a Java VM and reclaims its resources. + + On failure. + + Any thread, whether attached or not, can invoke this function. If the current thread is attached, the VM waits until the current thread is the only non-daemon user-level Java thread. If the current thread is not attached, the VM attaches the current thread and then waits until the current thread is the only non-daemon user-level thread. + + + + + Attaches the current thread to a Java VM. + + or a structure to specify additional information. + A JNI interface. + On failure. + + Trying to attach a thread that is already attached is a no-op. + A native thread cannot be attached simultaneously to two Java VMs. + When a thread is attached to the VM, the context class loader is the bootstrap loader. + + + + + Detaches the current thread from a Java VM. + + On failure. + + All Java monitors held by this thread are released. All Java threads waiting for this thread to die are notified. + The main thread can be detached from the VM. + + + + + Gets the attached to the current thread. + + The requested JNI version. + A JNI interface, if an error occurs. + On failure, with a of if the current thread is not attached to the VM, or if the specified version is not supported. + + + + Same semantics as , but the newly-created java.lang.Thread instance is a daemon. + + A structure to specify additional information. + A JNI interface. + On failure. + + If the thread has already been attached via either or , this routine simply returns the of the current thread. In this case neither nor this routine have any effect on the daemon status of the thread. + + + + + Additional information for attaching the current thread to a Java VM. + + + Creates an instance of the struct. + + The requested JNI version. + The name of the thread, or . + Global ref of a ThreadGroup object, or . + + + + Additional information for attaching the current thread to a Java VM. + + + Creates an instance of the struct. + + The requested JNI version. + The name of the thread, or . + Global ref of a ThreadGroup object, or . + + + The requested JNI version. + + + The name of the thread, or . + + + Global ref of a ThreadGroup object, or . + + + + Java VM manager. + + + + + Registers a Java VM. + + A Java VM. + is . + + + + All registered Java VMs. + + + + + The first VM registered. + + + + + The of the first VM registered. + + + + + Exception occurring in JNI functions. + + + + + The result code returned by the JNI function. + + + + + Creates an instance of the class with set to . + + + + + Creates an instance of the class with set to . + + The error message that explains the reason for the exception. + + + + Creates an instance of the class with set to . + + The error message that explains the reason for the exception. + The exception that is the cause of the current exception. + + + + Creates an instance of the class with set to . + + The exception that is the cause of the current exception. + + + + Creates an instance of the class. + + The result code returned by the JNI function. + + + + Creates an instance of the class. + + The result code returned by the JNI function. + The error message that explains the reason for the exception. + + + + Creates an instance of the class. + + The result code returned by the JNI function. + The error message that explains the reason for the exception. + The exception that is the cause of the current exception. + + + + Creates an instance of the class with serialized data. + + The that holds the serialized object data about the exception being thrown. + The that contains contextual information about the source or destination. + + + + + + + Checks the result code returned by a JNI function and throws a if an error occurred. + + The result code returned by a JNI function. + An error occurred. + + + + JNI native method. + + The name of the native method. + The signature of the native method. + The function pointer of the native method. + Either of the arguments is . + + The function pointers nominally must have the following signature: + ReturnType function(IntPtr env, IntPtr objectOrClass, ...) + + + + + JNI native method. + + The name of the native method. + The signature of the native method. + The function pointer of the native method. + Either of the arguments is . + + The function pointers nominally must have the following signature: + ReturnType function(IntPtr env, IntPtr objectOrClass, ...) + + + + The name of the native method. + + + The signature of the native method. + + + The function pointer of the native method. + + + + Object reference type. + + + + + Invalid reference. + + + + + Local reference type. + + + + + Global reference type. + + + + + Weak global reference type. + + + + + Provides information on how the array buffer should be released. + + + + + Copy back the content and free the elems buffer. + + + + + Copy back the content but do not free the elems buffer. + + + + + Free the buffer without copying back the possible changes. + + Result code returned by JNI functions. diff --git a/Assets/Plugins/Cryville.Audio.Source.Libav.dll b/Assets/Plugins/Cryville.Audio.Source.Libav.dll index 3c4ba11..63a2f36 100644 Binary files a/Assets/Plugins/Cryville.Audio.Source.Libav.dll and b/Assets/Plugins/Cryville.Audio.Source.Libav.dll differ diff --git a/Assets/Plugins/Cryville.Audio.Source.Libav.xml b/Assets/Plugins/Cryville.Audio.Source.Libav.xml index 8d52a34..baacc79 100644 --- a/Assets/Plugins/Cryville.Audio.Source.Libav.xml +++ b/Assets/Plugins/Cryville.Audio.Source.Libav.xml @@ -1,145 +1,135 @@ - - Cryville.Audio.Source.Libav - - - - - 一个使用 Libav 解流并解码音频文件的 。 - - - - - 创建一个 类的实例并加载指定的 。 - - 音频文件。 - - - - 该音频流是否已被释放。 - - - - - - - - - - - 最佳音频流的索引。 - - - - - 所有音频流的索引集。 - - - - - 选择最佳音频流作为音频源。 - - 已选择音频流。 - - - 该方法只能在 被调用前调用，后者会在设置 时被调用。 - - - - - - 选择一个音频流作为音频源。 - - 音频流的索引。 - 已选择音频流。 - - - 该方法只能在 被调用前调用，后者会在设置 时被调用。 - - - - - - 获取一个流或当前文件的时长。 - - - 流索引。如果指定 -1 则返回文件的时长。 - - 时长（秒）。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 该属性可能不准确。 - - - - - - 该属性可能不准确。 - - - - - - - - - - 该属性在调用 后可能不准确。 - - - - - - - - - - - - - - - Libav 抛出的异常。 - - - - - - - - - - - - - - - + + Cryville.Audio.Source.Libav + + + + + An that uses Libav to demux and decode audio files. + + The audio file. + + + + An that uses Libav to demux and decode audio files. + + The audio file. + + + + Whether this audio stream has been disposed. + + + + + + + + + + + + This property may be inaccurate. + + + + + + This property may be inaccurate. + + + + + + + + The index to the best audio stream. + + + + + The collection of indices to all audio streams. + + + + + Selects the best stream as the source. + + The stream has been selected. + + This method can only be called before is called, which is called while setting . + + + + + Selects a stream as the source. + + The index of the stream. + The stream has been selected. + + This method can only be called before is called, which is called while setting . + + + + + Gets the duration of a stream or the file. + + The stream index. The duration of the file is retrieved if -1 is specified. + The duration in seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The exception that is thrown by Libav. + + + + + + + + + + + + + + + diff --git a/Assets/Plugins/Cryville.Audio.dll b/Assets/Plugins/Cryville.Audio.dll index 551e3b1..696f559 100644 Binary files a/Assets/Plugins/Cryville.Audio.dll and b/Assets/Plugins/Cryville.Audio.dll differ diff --git a/Assets/Plugins/Cryville.Audio.xml b/Assets/Plugins/Cryville.Audio.xml index 444b797..421ffb2 100644 --- a/Assets/Plugins/Cryville.Audio.xml +++ b/Assets/Plugins/Cryville.Audio.xml @@ -1,767 +1,920 @@ - - Cryville.Audio - - - - - 管理与 连接的音频客户端。 - - - - - - - - 执行与释放或重置非托管资源关联的应用程序定义的任务。 - - 该方法是否由用户调用。 - - - - 客户端的设备。 - - - - - 当前连接使用的波形格式。 - - - - - 缓存大小（帧）。 - - - - - 连接的最大延迟（毫秒）。 - - - 如果 API 不提供最大延迟，则该值为 0。 - - - - - 客户端是否正在播放。 - - - - - 客户端是否被静音。 - - - - - 设备流的当前位置（秒）。 - - - - - 缓存的当前位置（秒）。 - - - - - 音频源。 - - - - - 开始传输波形数据。 - - - 如果播放时 为 ，则会输出静音。 - - - - - 暂停传输波形数据。 - - - 该方法不重置 和 。 - - - - - 音频连接的共享模式。 - - - - - 以比 模式更高的延迟为代价，与其它连接共享设备。输出的数据将被音频服务混音。 - - - - - 当前连接以低延迟独占设备。 - - 初始化独占模式下的连接需要设备支持，且该设备当前未被占用。 - - - - 音频流。 - - - - - 波形格式。 - - - - - 缓存大小（帧）。 - - - - - 音频流是否到达了数据末尾。 - - - - - 设置音频流的波形格式和缓存大小。 - - 波形格式。 - 缓存大小（帧）。 - 该方法在当前音频流上已被成功调用过一次。 - - 音频流不支持 。 - - - - - 当波形格式和缓存大小被设置时被调用。 - - - - - 获取音频流是否支持 。 - - 波形格式。 - - - - 设置当前音频流的时间。 - - - 相对于 参数的偏移（秒）。 - - - 类型的一个值，指定用于获取新时间的参考点。 - - 当前音频流的新时间（秒）。 - - - - 设置当前音频流的时长。 - - 时长（秒）。 - - - - 音频流的时长（秒）。 - - - - - 当前音频流的时间（秒）。 - - - - - 将静音填充到缓存。 - - 波形格式。 - 被填充的缓存。 - - 中开始填充处的索引（字节）。 - - 需要填充的长度（字节）。 - - - - 音频连接的数据流向。 - - - - - 无。 - - - - - 数据从软件流向硬件。 - - - - - 数据从硬件流向软件。 - - - - - 任意数据流向。 - - - - - Cryville.Audio 的推荐入口，用于创建一个 。 - - - - - 可用引擎列表。 - - - - - 创建 列表中的一个 。 - - - 第一个能够被成功创建的 。如果没有支持的引擎则返回 。 - - - - 调用该方法前，先在 中添加引擎。 - - - - - - 音频设备。 - - - - - 设备的通俗名称。 - - - - - 设备的数据流向。 - - - - - 设备的脉冲大小（帧）。 - - - - - 设备的最小缓存大小（帧）。 - - - - - 设备的默认缓存大小（帧）。 - - - - - 设备在共享模式下的默认波形格式。 - - - - 对于独占模式的流，调用 以确定可用的格式。 - - - - - - 获取设备是否支持 。 - - 指定的波形格式。 - - 设备建议的波形格式。如果设备支持 则直接返回该参数。如果设备不支持任何格式则返回 。 - - 共享模式。 - - 设备是否支持 。 - - - - - 连接到设备。 - - 波形格式。 - 连接的缓存大小（帧）。 - 连接的共享模式。 - - 一个用于与设备交互的 。 - - - - - 管理 的音频设备管理器。 - - - 如果系统不支持一个 ，尝试创建其实例时将抛出异常。 - - - - - 获取指定 的所有音频设备。 - - 数据流向。 - - - - 获取指定 的默认音频设备。 - - 数据流向。 - - - - 一个缓存数据并对其进行复用的 。 - - - - 该流不支持定位。可以通过调用 重置其时间戳。 - - - - - - 创建一个 类的实例。 - - - 被缓存的 。 - - 缓存长度（秒）。 - - - - 获取一个时间戳归零的该 的副本。 - - - 一个时间戳归零的该 的副本。 - - - 推荐配合对象池使用。 - - - - - 归零时间戳以复用该实例。 - - - 推荐配合对象池使用。 - - - - - - - - 该音频流是否已被释放。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 一个以给定函数生成波形数据的 。 - - - - - 输出波形格式的声道数。 - - - - - - - - 该音频流是否已被释放。 - - - - - - - - - - - - - - - - - 用于生成波形的函数。 - - 时间（秒）。 - 声道索引。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 一个对序列中的音频源进行混音的简单 。 - - - 使用该类可参照以下步骤： - - - 创建一个 类的实例。 - - - 通过设置 将 绑定到一个 。 - - - 调用 创建一个新的 。 - - - 调用 并将 设为 开始播放。 - - - - 播放开始前后都可以将 序列至 。参见 。 - - - 如果 被设为 ，输出将变为静音。 - - - - - - 创建一个 类的实例。 - - - 序列器的最大复音数。必须大于 0。参见 。 - - - - - 该音频流是否已被释放。 - - - - - - - - - - - - - - - - - 当前会话是否正在播放。 - - - 播放状态切换时有一个小延迟，大约是 减去 。 - - - - - - - - 相对于当前位置的偏移。 - - 必须为 。 - - - - 该流只能从当前位置开始向后定位，因此， 必须为非负数，且 必须为 。 - - - - - - - - - - - 该流只能从当前位置开始向后定位。参见 。 - - - - - - - - - - - - - - 虽然该流支持定位，但是不支持设置该属性，否则会抛出 。该流只能从当前位置开始向后定位。参见 。 - - - - - - - - - - - - - - - 复音数，当前正在播放的音频源数量。 - - - - - 最大复音数，可以同时播放音频源的最大数量。 - - - - - 当前正在播放的 。 - - - - - 停止当前会话，创建一个新的 将其替换。 - - - 创建前必须先绑定 。 - - - - - 的会话。 - - - - - 将 序列至指定的 。 - - 时间（秒）。 - 音频源。 - - - 如果 小于当前时间， 将被立刻播放。 - - - 如果正在播放的音频源数量超过了 ， 将被丢弃。 - - 即使序列器被释放了，仍然可以序列音频源，虽然不会有任何效果。 - - - - - 一个生成单调声调的 。 - - - - - 声调类型。 - - - - - 波形频率。 - - - - - 波形振幅。 - - - - - - - - 声调类型。 - - - - - 正弦波。 - - - - - 锯齿波。 - - - - - 方波。 - - - - - 波形格式。 - - - - - 声道数。 - - - - - 采样率（每秒每频道样本数，即每秒帧数）。 - - - - - 样本格式。 - - - - - 每样本位数。 - - - - - 每帧字节数。 - - - - - 每秒字节数。 - - - - - 默认波形格式。 - - - - - 获取对齐的缓存大小。 - - 需要的缓存大小（字节）。 - 结果被向下还是向上取整。 - 对齐的缓存大小（字节）。 - - - - - - - - - - - - - - - - - - - - - - 样本格式。 - - - - - 无效样本格式。 - - - - - 无符号 8 位整型样本格式。 - - - - - 有符号 16 位整型样本格式。 - - - - - 有符号 24 位整型样本格式。 - - - - - 有符号 32 位整型样本格式。 - - - - - IEEE 754 单精度浮点型样本格式。 - - - - - IEEE 754 双精度浮点型样本格式。 - - - + + Cryville.Audio + + + + + Audio client that manages connection to a . + + + + + + + + Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + + Whether the method is being called by user. + + + + The device of the client. + + + + + The current wave format of the connection. + + + + + The buffer size in frames. + + + + + The maximum latency of the connection in milliseconds. + + + May be zero if the API does not provide this value. + + + + + The status of the connection. + + + + + The current position of the device stream in seconds. + + + + + The current position of the buffer in seconds. + + + + + The audio source. + + + + + Starts the wave data transmission. + + + If is while playing, the output will be silence. + + + + + Pauses the wave data transmission. + + + This method does not reset and . + + + + + Closes the connection. + + + + + Status of the . + + + + + The is open but not yet started, or paused. + + + + + The is being started. + + + + + The is started and playing. + + + + + The is being paused. + + + + + The is being closed. + + + + + The is closed. + + + + + The share mode of an audio connection. + + + + + The device is shared with other connections, at the cost of a higher latency than . The output data is mixed by the audio service. + + + + + The device is exclusive to the current connection, providing a low latency. + + To initialize an exclusive connection, the device must allow exclusive mode and must not be being used in either modes at the moment. + + + + Audio stream. + + + + + The wave format. + + + + + The buffer size in frames. + + + + + Whether if the stream has reached the end of data. + + + + + Sets the wave format and the buffer size of this audio stream. + + The wave format. + The buffer size in frames. + This method has already been called successfully once on the audio stream. + is not supported by the audio stream. + + + + Called when the wave format and the buffer size is determined. + + + + + The default wave format of the stream. + + + + + Gets whether is supported by the audio stream. + + The wave format. + + + + + + + Sets the time in frames within the current audio stream. + + An offset in frames relative to the parameter. + A value of type indicating the reference point used to obtain the new time. + The new time in frames within the current audio stream. + + + + Sets the time in seconds within the current audio stream. + + An offset in seconds relative to the parameter. + A value of type indicating the reference point used to obtain the new time. + The new time in seconds within the current audio stream. + + + + When overridden in a derived class, sets the time in seconds within the current audio stream. + + An offset in seconds relative to the parameter. + A value of type indicating the reference point used to obtain the new time. + The new time in seconds within the current audio stream. + + + + When overridden in a derived class, sets the time in frames within the current audio stream. + + An offset in frames relative to the parameter. + A value of type indicating the reference point used to obtain the new time. + The new time in frames within the current audio stream. + + + + + + + The length of the audio stream in frames. + + + + + The length of the audio stream in seconds. + + + + + + + + The time in frames within the current audio stream. + + + + + The time in seconds within the current audio stream. + + + + + + + + Reads a sequence of frames from the current stream and advances the position within the stream by the number of bytes read. + + An array of bytes. When this method returns, the buffer contains the specified byte array with the values started from replaced by the frames read from the current audio source. + The zero-based byte offset in at which to begin storing the data read from the current audio stream. + The maximum number of frames to be read from the current audio stream. + The total number of frames read into the buffer. This can be less than the number of frames requested if that many frames are not currently available, or zero (0) if is 0 or the end of the stream has been reached. + + + + Reads a sequence of frames from the current stream and advances the position within the stream by the number of bytes read. + + A reference to the buffer. When this method returns, the buffer contains the specified data replaced by the frames read from the current audio source. + The maximum number of frames to be read from the current audio stream. + The total number of frames read into the buffer. This can be less than the number of frames requested if that many frames are not currently available, or zero (0) if is 0 or the end of the stream has been reached. + + + + When overridden in a derived class, reads a sequence of frames from the current stream and advances the position within the stream by the number of bytes read. + + A reference to the buffer. When this method returns, the buffer contains the specified data replaced by the frames read from the current audio source. + The maximum number of frames to be read from the current audio stream. + The total number of frames read into the buffer. This can be less than the number of frames requested if that many frames are not currently available, or zero (0) if is 0 or the end of the stream has been reached. + + + + Fills the buffer with silence. + + The wave format. + The buffer to be filled. + The length in frames to be filled. + + + + Audio usage. + + + + + Unknown usage. + + + + + The usage is media, such as music, or movie soundtracks. + + + + + The usage is voice communications, such as telephony or VoIP. + + + + + The usage is an alarm (e.g. wake-up alarm). + + + + + The usage is notification. + + + + + The usage is telephony ringtone. + + + + + The usage is to attract the user's attention, such as a reminder or low battery warning. + + + + + The usage is for accessibility, such as with a screen reader. + + + + + The usage is driving or navigation directions. + + + + + The usage is sonification, such as with user interface sounds. + + + + + The usage is for game audio. + + + + + The data-flow direction of an audio connection. + + + + + None. + + + + + Data flows from software to hardware. + + + + + Data flows from hardware to software. + + + + + Any data-flow direction. + + + + + The recommended entry for Cryville.Audio that creates an . + + + + + The list of available engines. + + + + + Creates a in the list. + + The first that can be successfully created. if no engine is supported. + + Add engines to before calling this method. + + + + + Audio device. + + + + + The friendly name of the device. + + + + + The data-flow direction of the device. + + + + + The burst size of the device in frames. + + + + + The minimum buffer size of the device in frames. + + + + + The default buffer size of the device in frames. + + + + + The default wave format of the device for shared-mode streams. + + + For exclusive-mode streams, call to determine an eligible format. + + + + + Gets whether is supported by the device. + + The specified wave format. + A wave format suggested by the device. if it is supported. if no format is supported. + The audio usage. + The share mode. + Whether is supported. + + + + Connects to the device. + + The wave format. + The buffer size of the connection in frames. + The audio usage. + The share mode of the connection. + An for interaction with the device. + + + + Audio device manager that manages . + + + If the is not supported, an exception is thrown when trying to create an instance. + + + + + Gets all audio devices for the specified . + + The data-flow direction. + + + + Gets the default audio device for the specified . + + The data-flow direction. + + + + Represents the method that reads a sample of a specific sample format as a value. + + The pointer to the buffer to be read, advanced to the next sample when the method returns. + The sample value as a value. + + + + Represents the method that writes a sample value as a specific sample format. + + The pointer to the buffer to be written, advanced to the next sample when the method returns. + The sample value to be written. + + + + Provides a set of and methods for various sample formats. + + + + + Gets a for a sample format. + + The sample format. + A for the specified sample format. + The specified sample format is not supported. + + + + Gets a for a sample format. + + The sample format. + A for the specified sample format. + The specified sample format is not supported. + + + + An that caches data for reuse. + + + This stream is not seekable. Use to reset its timestamp to zero. + + The to be cached. + The duration of the cache in seconds. + + + + An that caches data for reuse. + + + This stream is not seekable. Use to reset its timestamp to zero. + + The to be cached. + The duration of the cache in seconds. + + + + Gets a clone of this with the timestamp reset. + + A clone of this with the timestamp reset. + + Use with object pool is recommended. + + + + + Resets the timestamp to reuse the instance. + + + Use with object pool is recommended. + + + + + + + + + + + Whether this audio stream has been disposed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + An that generates sound by a given function. + + + + + The channel count of the output format. + + + + + + + + + + + Whether this audio stream has been disposed. + + + + + + + + + + + + + + + + + + + + The function used to generate wave. + + The time position. + The channel index. + + + + + + + + + + + + + + + + + + + + + + + + + A simple that mixes sequenced audio sources. + + + To use this class, take the following steps: + + Create an instance of . + Attach the to an by setting . + Create a new by calling . + Start playback by calling and setting to . + + s can be sequenced to the both before and after playback starts. See . + If is set to , the output will become silence. + + + + + Creates an instance of the class. + + Max polyphony of the source. Must be greater than 0. See . + + + + Whether this audio stream has been disposed. + + + + + + + + + + + + + + + + + + + + + + + Whether if the current session is playing. + + + There is a tiny delay before the playback state actually toggles, which is approximately substracted by . + + + + + + + + A byte offset relative to the current position. + Must be . + + This stream can only be sought from the current position, and forward only. Thus, must be non-negative, and must be . + + + + + + + + + This stream can only be sought from the current position, and forward only. See . + + + + + + + + + + + + + + + + + The number of sources currently playing. + + + + + Max polyphony, the number of sources that can be played at the same time. + + + + + The currently playing. + + + + + Stops the current session and creates a new to replace it. + + + An must be attached to this source first. + + + + + A session for . + + + + + The time in frames within the current session. + + + + + The time in seconds within the current session. + + + + + Sequences a at the specified . + + The time in seconds. + The audio source. + + If is less than the current time, the will be played immediately. + If the number of audio sources currently playing exceeds , the will be discarded. + Audio sources can be sequenced even when the sequencer has been disposed, while it would not have any effect. + + + + + An that generates single tone. + + + + + The tone type. + + + + + The frequency of the wave. + + + + + The amplitude of the wave. + + + + + + + + Tone type. + + + + + Sine wave. + + + + + Triangle wave. + + + + + Square wave. + + + + + The wave format. + + + + + The channel count. + + + + + The sample rate (samples per channel per second, i.e. frames per second.) + + + + + The sample format. + + + + + Bit count per sample. + + + + + Bytes per frame. + + + + + Bytes per second. + + + + + The default wave format. + + + + + + + + + + + + + + + + + + + + + + + Sample format. + + + + + Invalid sample format. + + + + + Unsigned 8-bit integer sample format. + + + + + Signed 16-bit integer sample format. + + + + + Signed 24-bit integer sample format. + + + + + Signed 32-bit integer sample format. + + + + + IEEE 754 single precision floating-point sample format. + + + + + IEEE 754 double precision floating-point sample format. + + + diff --git a/Assets/Plugins/Cryville.Common.Buffers.dll b/Assets/Plugins/Cryville.Common.Buffers.dll index f2b4e2e..1a7652f 100644 Binary files a/Assets/Plugins/Cryville.Common.Buffers.dll and b/Assets/Plugins/Cryville.Common.Buffers.dll differ diff --git a/Assets/Plugins/Cryville.Common.Buffers.xml b/Assets/Plugins/Cryville.Common.Buffers.xml index 70441ff..12d1954 100644 --- a/Assets/Plugins/Cryville.Common.Buffers.xml +++ b/Assets/Plugins/Cryville.Common.Buffers.xml @@ -75,11 +75,14 @@ The category type. The type of the objects in the pool. + The categorized pool. - Creates an instance of the class. + A utility to access a categorized pool, representing a single unit that uses a shared categorized pool. + The category type. + The type of the objects in the pool. The categorized pool. @@ -136,11 +139,13 @@ A resource pool that allows reusing instances of type . The type of the objects in the pool. + The capacity of the pool. - Creates an instance of the class. + A resource pool that allows reusing instances of type . + The type of the objects in the pool. The capacity of the pool. @@ -177,11 +182,13 @@ A resource pool that allows reusing instances of type , which has a parameterless constructor. The type of the objects in the pool. + The capacity of the pool. - Creates an instance of the class. + A resource pool that allows reusing instances of type , which has a parameterless constructor. + The type of the objects in the pool. The capacity of the pool. @@ -192,7 +199,7 @@ An auto-resized array as a variable-length string used as a target that is modified frequently. - + Occurs when is called if the string is invalidated. diff --git a/Assets/Plugins/Cryville.Common.Collections.PairCollection.dll b/Assets/Plugins/Cryville.Common.Collections.PairCollection.dll index adca231..21f9e47 100644 Binary files a/Assets/Plugins/Cryville.Common.Collections.PairCollection.dll and b/Assets/Plugins/Cryville.Common.Collections.PairCollection.dll differ diff --git a/Assets/Plugins/Cryville.Common.Compat.dll b/Assets/Plugins/Cryville.Common.Compat.dll new file mode 100644 index 0000000..6b974d5 Binary files /dev/null and b/Assets/Plugins/Cryville.Common.Compat.dll differ diff --git a/Assets/Plugins/Cryville.Common.Interop.dll.meta b/Assets/Plugins/Cryville.Common.Compat.dll.meta similarity index 93% rename from Assets/Plugins/Cryville.Common.Interop.dll.meta rename to Assets/Plugins/Cryville.Common.Compat.dll.meta index 7974dc0..1d3c07b 100644 --- a/Assets/Plugins/Cryville.Common.Interop.dll.meta +++ b/Assets/Plugins/Cryville.Common.Compat.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da0f60bce5e225e4fb5bfcdc1bb64f66 +guid: 85184b92e2dc20f41a75ec58505b1444 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Cryville.Common.Compat.xml b/Assets/Plugins/Cryville.Common.Compat.xml new file mode 100644 index 0000000..80e8975 --- /dev/null +++ b/Assets/Plugins/Cryville.Common.Compat.xml @@ -0,0 +1,74 @@ + + + + Cryville.Common.Compat + + + + + Marks a property setter as external-init. + + + + + Marshals a UTF-8 string to a .NET Framework string, and vice versa. + + + This marshaler is used as a fallback as UnmanagedType.LPUTF8Str is not available before .NET Framework 4.7. + + + + + Returns an instance of the custom marshaler. + + String "cookie" parameter that can be used by the custom marshaler. + An instance of the custom marshaler. + + + + + + + + + + + + + + + + + + + Provides methods for throwing common exceptions. + + + + + Throws an if is . + + The reference type argument to validate as non-null. + The name of the parameter with which corresponds. If you omit this parameter, the name of is used. + is . + + + + Throws an exception if is or empty. + + The string argument to validate as non- and non-empty. + The name of the parameter with which corresponds. + is . + is empty. + + + + Throws an exception if is , empty, or consists only of white-space characters. + + The string argument to validate. + The name of the parameter with which corresponds. + is . + is empty or consists only of white-space characters. + + + diff --git a/Assets/Plugins/Cryville.Common.Interop.xml.meta b/Assets/Plugins/Cryville.Common.Compat.xml.meta similarity index 75% rename from Assets/Plugins/Cryville.Common.Interop.xml.meta rename to Assets/Plugins/Cryville.Common.Compat.xml.meta index b64bc24..19d7002 100644 --- a/Assets/Plugins/Cryville.Common.Interop.xml.meta +++ b/Assets/Plugins/Cryville.Common.Compat.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56d3e75e121507e40afa4831c28f514f +guid: 8a0f58b64f161c247a8cc0e2da2a5552 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/Cryville.Common.Interop.dll b/Assets/Plugins/Cryville.Common.Interop.dll deleted file mode 100644 index 8265cce..0000000 Binary files a/Assets/Plugins/Cryville.Common.Interop.dll and /dev/null differ diff --git a/Assets/Plugins/Cryville.Common.Interop.xml b/Assets/Plugins/Cryville.Common.Interop.xml deleted file mode 100644 index 742aca0..0000000 --- a/Assets/Plugins/Cryville.Common.Interop.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - Cryville.Common.Interop - - - - - Marshals a UTF-8 string to a .NET Framework string, and vice versa. - - - This marshaler is used as a fallback as UnmanagedType.LPUTF8Str does not exist before .NET Framework 4.7. - - - - - Returns an instance of the custom marshaler. - - String "cookie" parameter that can be used by the custom marshaler. - An instance of the custom marshaler. - - - - - - - - - - - - - - - - - - - Attribute used to annotate functions that will be called back from the unmanaged world. - - - - diff --git a/Assets/Plugins/Cryville.Common.Logging.dll b/Assets/Plugins/Cryville.Common.Logging.dll index 369f9bd..59183eb 100644 Binary files a/Assets/Plugins/Cryville.Common.Logging.dll and b/Assets/Plugins/Cryville.Common.Logging.dll differ diff --git a/Assets/Plugins/Cryville.Common.Reflection.dll b/Assets/Plugins/Cryville.Common.Reflection.dll index 6757a09..3f5aa37 100644 Binary files a/Assets/Plugins/Cryville.Common.Reflection.dll and b/Assets/Plugins/Cryville.Common.Reflection.dll differ diff --git a/Assets/Plugins/Cryville.Common.Reflection.xml b/Assets/Plugins/Cryville.Common.Reflection.xml index 0fa78e2..9cfe741 100644 --- a/Assets/Plugins/Cryville.Common.Reflection.xml +++ b/Assets/Plugins/Cryville.Common.Reflection.xml @@ -16,6 +16,7 @@ The attribute type. The type containing the member with the specified attribute type. The member with the specified attribute type in the specified type. when the member is not found or multiple members are found. + is . @@ -24,6 +25,7 @@ The type. The name of the member. The member. when the member is not found or multiple members are found. + is . @@ -79,6 +81,7 @@ The type. A simple name of the class. + is . @@ -86,6 +89,7 @@ The type. The namespace qualified name of the class. + is . diff --git a/Assets/Plugins/Cryville.Interop.Mono.dll b/Assets/Plugins/Cryville.Interop.Mono.dll new file mode 100644 index 0000000..3395a5c Binary files /dev/null and b/Assets/Plugins/Cryville.Interop.Mono.dll differ diff --git a/Assets/Plugins/Cryville.Interop.Mono.dll.meta b/Assets/Plugins/Cryville.Interop.Mono.dll.meta new file mode 100644 index 0000000..d6f68de --- /dev/null +++ b/Assets/Plugins/Cryville.Interop.Mono.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: b77d8642f0f45ee42a9b7fb8e6598782 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Cryville.Interop.Mono.xml b/Assets/Plugins/Cryville.Interop.Mono.xml new file mode 100644 index 0000000..6fb32f1 --- /dev/null +++ b/Assets/Plugins/Cryville.Interop.Mono.xml @@ -0,0 +1,29 @@ + + + + Cryville.Interop.Mono + + + + + Attribute used to annotate functions that will be called back from the unmanaged world. + + + + + The type of the delegate that will be calling us back. + + + + + Constructor for the MonoPInvokeCallbackAttribute. + + + + + Constructor for the MonoPInvokeCallbackAttribute. + + The type of the delegate that will be calling us back. + + + diff --git a/Assets/Plugins/Cryville.Interop.Mono.xml.meta b/Assets/Plugins/Cryville.Interop.Mono.xml.meta new file mode 100644 index 0000000..7490ea7 --- /dev/null +++ b/Assets/Plugins/Cryville.Interop.Mono.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c9e14f904ff5244ebdce8979d78fb48 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/FFmpeg.AutoGen.dll b/Assets/Plugins/FFmpeg.AutoGen.dll index cc808f3..d4d9262 100644 Binary files a/Assets/Plugins/FFmpeg.AutoGen.dll and b/Assets/Plugins/FFmpeg.AutoGen.dll differ diff --git a/Assets/Plugins/UnsafeIL.dll b/Assets/Plugins/UnsafeIL.dll index 69d9c41..caa2de4 100644 Binary files a/Assets/Plugins/UnsafeIL.dll and b/Assets/Plugins/UnsafeIL.dll differ diff --git a/Assets/Plugins/Windows/Cryville.Audio.Wasapi.dll b/Assets/Plugins/Windows/Cryville.Audio.Wasapi.dll index 0cfcf58..1881d82 100644 Binary files a/Assets/Plugins/Windows/Cryville.Audio.Wasapi.dll and b/Assets/Plugins/Windows/Cryville.Audio.Wasapi.dll differ diff --git a/Assets/Plugins/Windows/Cryville.Audio.Wasapi.xml b/Assets/Plugins/Windows/Cryville.Audio.Wasapi.xml index 649dc0b..ed8ef7d 100644 --- a/Assets/Plugins/Windows/Cryville.Audio.Wasapi.xml +++ b/Assets/Plugins/Windows/Cryville.Audio.Wasapi.xml @@ -27,6 +27,9 @@ + + + @@ -39,6 +42,9 @@ + + + An that interact with Wasapi. @@ -49,6 +55,15 @@ Creates an instance of the class. + + + + + + Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + + Whether the method is being called by user. + @@ -60,6 +75,9 @@ An that interacts with Wasapi. + + + @@ -86,10 +104,10 @@ - + - + diff --git a/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.dll b/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.dll index f7a1c10..e7723d2 100644 Binary files a/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.dll and b/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.dll differ diff --git a/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.xml b/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.xml index dac879d..1b92aa1 100644 --- a/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.xml +++ b/Assets/Plugins/Windows/Cryville.Audio.WaveformAudio.xml @@ -4,36 +4,6 @@ Cryville.Audio.WaveformAudio - - - Exception occurring in Multimedia System. - - - - - Creates an instance of the class. - - - - - Creates an instance of the class. - The error message that explains the reason for the exception. - - - - - Creates an instance of the class. - - The error message that explains the reason for the exception. - The exception that is the cause of the current exception. - - - - Creates an instance of the class with serialized data. - - The that holds the serialized object data about the exception being thrown. - The that contains contextual information about the source or destination. - An that interacts with WinMM. @@ -43,10 +13,7 @@ - - Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. - - Whether the method is being called by user. + @@ -60,6 +27,9 @@ + + + @@ -72,6 +42,9 @@ + + + An that interacts with WinMM. @@ -107,10 +80,10 @@ - + - + @@ -138,5 +111,35 @@ + + + Exception occurring in Multimedia System. + + + + + Creates an instance of the class. + + + + + Creates an instance of the class. + The error message that explains the reason for the exception. + + + + + Creates an instance of the class. + + The error message that explains the reason for the exception. + The exception that is the cause of the current exception. + + + + Creates an instance of the class with serialized data. + + The that holds the serialized object data about the exception being thrown. + The that contains contextual information about the source or destination. +