Skip to content

Commit 80b707a

Browse files
yamachuyamachu
authored
Update submodule (#157)
* Update submodule * make generate * 関数名やEnumの名前が変わったことへの追従
1 parent 413af2f commit 80b707a

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

‎binding/voicevox_core

Submodule voicevox_core updated 124 files

‎src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/ResultCode.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public enum ResultCode : int
4141
/// </summary>
4242
RESULT_RUN_MODEL_ERROR = 8,
4343
/// <summary>
44-
/// コンテキストラベル出力に失敗した
44+
/// 入力テキストの解析に失敗した
4545
/// </summary>
46-
RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
46+
RESULT_ANALYZE_TEXT_ERROR = 11,
4747
/// <summary>
4848
/// 無効なutf8文字列が入力された
4949
/// </summary>
@@ -124,7 +124,7 @@ internal static ResultCode FromNative(this VoicevoxResultCode code)
124124
VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR => ResultCode.RESULT_STYLE_NOT_FOUND_ERROR,
125125
VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR => ResultCode.RESULT_MODEL_NOT_FOUND_ERROR,
126126
VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR => ResultCode.RESULT_RUN_MODEL_ERROR,
127-
VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
127+
VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR => ResultCode.RESULT_ANALYZE_TEXT_ERROR,
128128
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR => ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR,
129129
VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR => ResultCode.RESULT_PARSE_KANA_ERROR,
130130
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR => ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR,
@@ -157,7 +157,7 @@ internal static VoicevoxResultCode ToNative(this ResultCode code)
157157
ResultCode.RESULT_STYLE_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR,
158158
ResultCode.RESULT_MODEL_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR,
159159
ResultCode.RESULT_RUN_MODEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR,
160-
ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
160+
ResultCode.RESULT_ANALYZE_TEXT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR,
161161
ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR,
162162
ResultCode.RESULT_PARSE_KANA_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR,
163163
ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR,

‎src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,16 @@ internal static unsafe partial class CoreUnsafe
217217
internal static extern byte* voicevox_voice_model_file_create_metas_json(VoicevoxVoiceModelFile* model);
218218

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

231231
/// <summary>
232232
/// ::VoicevoxSynthesizer を&lt;b&gt;構築&lt;/b&gt;(_construct_)する。
@@ -891,7 +891,7 @@ internal enum VoicevoxResultCode : int
891891
VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR = 6,
892892
VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR = 7,
893893
VOICEVOX_RESULT_RUN_MODEL_ERROR = 8,
894-
VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
894+
VOICEVOX_RESULT_ANALYZE_TEXT_ERROR = 11,
895895
VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR = 12,
896896
VOICEVOX_RESULT_PARSE_KANA_ERROR = 13,
897897
VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR = 14,

‎src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected override bool ReleaseHandle()
1919
{
2020
unsafe
2121
{
22-
CoreUnsafe.voicevox_voice_model_file_close((VoicevoxVoiceModelFile*)handle.ToPointer());
22+
CoreUnsafe.voicevox_voice_model_file_delete((VoicevoxVoiceModelFile*)handle.ToPointer());
2323
handle = IntPtr.Zero;
2424
}
2525
return true;

‎src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public enum ResultCode : int
4141
/// </summary>
4242
RESULT_RUN_MODEL_ERROR = 8,
4343
/// <summary>
44-
/// コンテキストラベル出力に失敗した
44+
/// 入力テキストの解析に失敗した
4545
/// </summary>
46-
RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
46+
RESULT_ANALYZE_TEXT_ERROR = 11,
4747
/// <summary>
4848
/// 無効なutf8文字列が入力された
4949
/// </summary>
@@ -124,7 +124,7 @@ internal static ResultCode FromNative(this VoicevoxResultCode code)
124124
VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR => ResultCode.RESULT_STYLE_NOT_FOUND_ERROR,
125125
VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR => ResultCode.RESULT_MODEL_NOT_FOUND_ERROR,
126126
VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR => ResultCode.RESULT_RUN_MODEL_ERROR,
127-
VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
127+
VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR => ResultCode.RESULT_ANALYZE_TEXT_ERROR,
128128
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR => ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR,
129129
VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR => ResultCode.RESULT_PARSE_KANA_ERROR,
130130
VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR => ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR,
@@ -157,7 +157,7 @@ internal static VoicevoxResultCode ToNative(this ResultCode code)
157157
ResultCode.RESULT_STYLE_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR,
158158
ResultCode.RESULT_MODEL_NOT_FOUND_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR,
159159
ResultCode.RESULT_RUN_MODEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_RUN_MODEL_ERROR,
160-
ResultCode.RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR,
160+
ResultCode.RESULT_ANALYZE_TEXT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_ANALYZE_TEXT_ERROR,
161161
ResultCode.RESULT_INVALID_UTF8_INPUT_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR,
162162
ResultCode.RESULT_PARSE_KANA_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_PARSE_KANA_ERROR,
163163
ResultCode.RESULT_INVALID_AUDIO_QUERY_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR,

‎src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,16 @@ internal static unsafe partial class CoreUnsafe
217217
internal static extern byte* voicevox_voice_model_file_create_metas_json(VoicevoxVoiceModelFile* model);
218218

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

231231
/// <summary>
232232
/// ::VoicevoxSynthesizer を&lt;b&gt;構築&lt;/b&gt;(_construct_)する。
@@ -891,7 +891,7 @@ internal enum VoicevoxResultCode : int
891891
VOICEVOX_RESULT_STYLE_NOT_FOUND_ERROR = 6,
892892
VOICEVOX_RESULT_MODEL_NOT_FOUND_ERROR = 7,
893893
VOICEVOX_RESULT_RUN_MODEL_ERROR = 8,
894-
VOICEVOX_RESULT_EXTRACT_FULL_CONTEXT_LABEL_ERROR = 11,
894+
VOICEVOX_RESULT_ANALYZE_TEXT_ERROR = 11,
895895
VOICEVOX_RESULT_INVALID_UTF8_INPUT_ERROR = 12,
896896
VOICEVOX_RESULT_PARSE_KANA_ERROR = 13,
897897
VOICEVOX_RESULT_INVALID_AUDIO_QUERY_ERROR = 14,

‎src/VoicevoxCoreSharp.Core/VoiceModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected override bool ReleaseHandle()
1919
{
2020
unsafe
2121
{
22-
CoreUnsafe.voicevox_voice_model_file_close((VoicevoxVoiceModelFile*)handle.ToPointer());
22+
CoreUnsafe.voicevox_voice_model_file_delete((VoicevoxVoiceModelFile*)handle.ToPointer());
2323
handle = IntPtr.Zero;
2424
}
2525
return true;

‎src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<VoicevoxOnnxRuntimeVersion>1.17.3</VoicevoxOnnxRuntimeVersion>
4-
<VoicevoxCoreCommitHash>ef66cc2958a143ff45ceb46e8ba84f91898d66bc</VoicevoxCoreCommitHash>
4+
<VoicevoxCoreCommitHash>23813b146f9da43004ff9cbf4350da6067d38558</VoicevoxCoreCommitHash>
55
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)