Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodule #157

Merged
merged 3 commits into from
Jan 28, 2025
Merged

Update submodule #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4528327
Update submodule
yamachu Jan 28, 2025
326b103
make generate
yamachu Jan 28, 2025
e4ba9ac
関数名やEnumの名前が変わったことへの追従
yamachu Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binding/voicevox_core
Open in desktop
Submodule voicevox_core updated 124 files
8 changes: 4 additions & 4 deletions ...eSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/ResultCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public enum ResultCode : int
/// </summary>
RESULT_RUN_MODEL_ERROR = 8,
/// <summary>
/// コンテキストラベル出力に失敗した
/// 入力テキストの解析に失敗した
/// </summary>
RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
RESULT_ANALYZE_TEXT_ERROR = 11,
/// <summary>
/// 無効なutf8文字列が入力された
/// </summary>
Expand Down Expand Up @@ -124,7 +124,7 @@ internal static ResultCode FromNative(this VoicevoxResultCode code)
VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR => ResultCode.RESULT_STYLE_NOT_FOUND_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR => ResultCode.RESULT_MODEL_NOT_FOUND_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR => ResultCode.RESULT_RUN_MODEL_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR => ResultCode.RESULT_ANALYZE_TEXT_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR => ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR => ResultCode.RESULT_PARSE_KANA_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR => ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR,
Expand Down Expand Up @@ -157,7 +157,7 @@ internal static VoicevoxResultCode ToNative(this ResultCode code)
ResultCode.RESULT_STYLE_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR,
ResultCode.RESULT_MODEL_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR,
ResultCode.RESULT_RUN_MODEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR,
ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
ResultCode.RESULT_ANALYZE_TEXT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR,
ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR,
ResultCode.RESULT_PARSE_KANA_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR,
ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR,
Expand Down
8 changes: 4 additions & 4 deletions ...rp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ internal static unsafe partial class CoreUnsafe
internal static extern byte* voicevox_voice_model_file_create_metas_json(VoicevoxVoiceModelFile* model);

/// <summary>
/// ::VoicevoxVoiceModelFile を、所有しているファイルディスクリプタを閉じた上で&lt;b&gt;破棄&lt;/b&gt;(_destruct_)する。
/// ::VoicevoxVoiceModelFile を、所有しているファイルディスクリプタを閉じた上で&lt;b&gt;破棄&lt;/b&gt;(_destruct_)する。ファイルの削除(_delete_)&lt;b&gt;ではない&lt;/b&gt;。
///
/// 破棄対象への他スレッドでのアクセスが存在する場合、それらがすべて終わるのを待ってから破棄する。
///
/// この関数の呼び出し後に破棄し終えた対象にアクセスすると、プロセスを異常終了する。
///
/// @param [in] model 破棄対象
/// </summary>
[DllImport(__DllName, EntryPoint = "voicevox_voice_model_file_close", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
internal static extern void voicevox_voice_model_file_close(VoicevoxVoiceModelFile* model);
[DllImport(__DllName, EntryPoint = "voicevox_voice_model_file_delete", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
internal static extern void voicevox_voice_model_file_delete(VoicevoxVoiceModelFile* model);

/// <summary>
/// ::VoicevoxSynthesizer を&lt;b&gt;構築&lt;/b&gt;(_construct_)する。
Expand Down Expand Up @@ -891,7 +891,7 @@ internal enum VoicevoxResultCode : int
VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR = 6,
VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR = 7,
VOICEVOX_RESULT_RUN_MODEL_ERROR = 8,
VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
VOICEVOX_RESULT_ANALYZE_TEXT_ERROR = 11,
VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR = 12,
VOICEVOX_RESULT_PARSE_KANA_ERROR = 13,
VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR = 14,
Expand Down
2 changes: 1 addition & 1 deletion ...oxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected override bool ReleaseHandle()
{
unsafe
{
CoreUnsafe.voicevox_voice_model_file_close((VoicevoxVoiceModelFile*)handle.ToPointer());
CoreUnsafe.voicevox_voice_model_file_delete((VoicevoxVoiceModelFile*)handle.ToPointer());
handle = IntPtr.Zero;
}
return true;
Expand Down
8 changes: 4 additions & 4 deletions src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public enum ResultCode : int
/// </summary>
RESULT_RUN_MODEL_ERROR = 8,
/// <summary>
/// コンテキストラベル出力に失敗した
/// 入力テキストの解析に失敗した
/// </summary>
RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
RESULT_ANALYZE_TEXT_ERROR = 11,
/// <summary>
/// 無効なutf8文字列が入力された
/// </summary>
Expand Down Expand Up @@ -124,7 +124,7 @@ internal static ResultCode FromNative(this VoicevoxResultCode code)
VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR => ResultCode.RESULT_STYLE_NOT_FOUND_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR => ResultCode.RESULT_MODEL_NOT_FOUND_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR => ResultCode.RESULT_RUN_MODEL_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR => ResultCode.RESULT_ANALYZE_TEXT_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR => ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR => ResultCode.RESULT_PARSE_KANA_ERROR,
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR => ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR,
Expand Down Expand Up @@ -157,7 +157,7 @@ internal static VoicevoxResultCode ToNative(this ResultCode code)
ResultCode.RESULT_STYLE_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR,
ResultCode.RESULT_MODEL_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR,
ResultCode.RESULT_RUN_MODEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR,
ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
ResultCode.RESULT_ANALYZE_TEXT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR,
ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR,
ResultCode.RESULT_PARSE_KANA_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR,
ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR,
Expand Down
8 changes: 4 additions & 4 deletions src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ internal static unsafe partial class CoreUnsafe
internal static extern byte* voicevox_voice_model_file_create_metas_json(VoicevoxVoiceModelFile* model);

/// <summary>
/// ::VoicevoxVoiceModelFile を、所有しているファイルディスクリプタを閉じた上で&lt;b&gt;破棄&lt;/b&gt;(_destruct_)する。
/// ::VoicevoxVoiceModelFile を、所有しているファイルディスクリプタを閉じた上で&lt;b&gt;破棄&lt;/b&gt;(_destruct_)する。ファイルの削除(_delete_)&lt;b&gt;ではない&lt;/b&gt;。
///
/// 破棄対象への他スレッドでのアクセスが存在する場合、それらがすべて終わるのを待ってから破棄する。
///
/// この関数の呼び出し後に破棄し終えた対象にアクセスすると、プロセスを異常終了する。
///
/// @param [in] model 破棄対象
/// </summary>
[DllImport(__DllName, EntryPoint = "voicevox_voice_model_file_close", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
internal static extern void voicevox_voice_model_file_close(VoicevoxVoiceModelFile* model);
[DllImport(__DllName, EntryPoint = "voicevox_voice_model_file_delete", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
internal static extern void voicevox_voice_model_file_delete(VoicevoxVoiceModelFile* model);

/// <summary>
/// ::VoicevoxSynthesizer を&lt;b&gt;構築&lt;/b&gt;(_construct_)する。
Expand Down Expand Up @@ -891,7 +891,7 @@ internal enum VoicevoxResultCode : int
VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR = 6,
VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR = 7,
VOICEVOX_RESULT_RUN_MODEL_ERROR = 8,
VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
VOICEVOX_RESULT_ANALYZE_TEXT_ERROR = 11,
VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR = 12,
VOICEVOX_RESULT_PARSE_KANA_ERROR = 13,
VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR = 14,
Expand Down
2 changes: 1 addition & 1 deletion src/VoicevoxCoreSharp.Core/VoiceModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected override bool ReleaseHandle()
{
unsafe
{
CoreUnsafe.voicevox_voice_model_file_close((VoicevoxVoiceModelFile*)handle.ToPointer());
CoreUnsafe.voicevox_voice_model_file_delete((VoicevoxVoiceModelFile*)handle.ToPointer());
handle = IntPtr.Zero;
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<VoicevoxOnnxRuntimeVersion>1.17.3</VoicevoxOnnxRuntimeVersion>
<VoicevoxCoreCommitHash>ef66cc2958a143ff45ceb46e8ba84f91898d66bc</VoicevoxCoreCommitHash>
<VoicevoxCoreCommitHash>23813b146f9da43004ff9cbf4350da6067d38558</VoicevoxCoreCommitHash>
</PropertyGroup>
</Project>
Loading