Skip to content

Commit 4b8b356

Browse files
committed
fixed バグ
1 parent 49c5230 commit 4b8b356

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed

source/CeVIOAIProxy/CeVIOAIProxy.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<AssemblyOriginatorKeyFile>CeVIOAIProxy.pfx</AssemblyOriginatorKeyFile>
1212
<Authors>anoyetta</Authors>
1313
<Copyright>(c) 2021 anoyetta</Copyright>
14-
<AssemblyVersion>1.2.0.1</AssemblyVersion>
14+
<AssemblyVersion>1.2.0.2</AssemblyVersion>
1515
<PackageIcon>share.ico</PackageIcon>
1616
<PackageIconUrl />
1717
<PackageProjectUrl>https://github.com/anoyetta/CeVIOAIProxy</PackageProjectUrl>
1818
<RepositoryUrl>https://github.com/anoyetta/CeVIOAIProxy.git</RepositoryUrl>
1919
<RepositoryType>GitHub</RepositoryType>
2020
<Version>1.2.0.1</Version>
2121
<StartupObject>CeVIOAIProxy.App</StartupObject>
22-
<FileVersion>1.2.0.1</FileVersion>
22+
<FileVersion>1.2.0.2</FileVersion>
2323
</PropertyGroup>
2424

2525
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,37 @@
11
using System;
22

3-
namespace CeVIOAIProxy.Servers
3+
namespace FNF.Utility
44
{
5+
/// <summary>
6+
/// .NET Remotingのためのクラス。(本クラスの内容を変更してしまうと通信できなくなってしまいます)
7+
/// </summary>
58
public class BouyomiChanRemoting : MarshalByRefObject
69
{
710
public async void AddTalkTask(string sTalkText)
811
{
9-
await CeVIO.SpeakAsync(sTalkText);
12+
await CeVIOAIProxy.CeVIO.SpeakAsync(sTalkText);
1013
}
1114

1215
public async void AddTalkTask(string sTalkText, int iSpeed, int iVolume, int vType)
1316
{
14-
await CeVIO.SpeakAsync(sTalkText);
17+
await CeVIOAIProxy.CeVIO.SpeakAsync(sTalkText);
1518
}
1619

1720
public async void AddTalkTask(string sTalkText, int iSpeed, int iTone, int iVolume, int vType)
1821
{
19-
await CeVIO.SpeakAsync(sTalkText);
22+
await CeVIOAIProxy.CeVIO.SpeakAsync(sTalkText);
2023
}
2124

2225
public int AddTalkTask2(string sTalkText)
2326
{
24-
throw null;
27+
CeVIOAIProxy.CeVIO.SpeakAsync(sTalkText).Wait();
28+
return 0;
2529
}
2630

2731
public int AddTalkTask2(string sTalkText, int iSpeed, int iTone, int iVolume, int vType)
2832
{
29-
throw null;
33+
CeVIOAIProxy.CeVIO.SpeakAsync(sTalkText).Wait();
34+
return 0;
3035
}
3136

3237
public void ClearTalkTasks()
@@ -37,9 +42,14 @@ public void SkipTalkTask()
3742
{
3843
}
3944

40-
public int TalkTaskCount { get { throw null; } }
41-
public int NowTaskId { get { throw null; } }
42-
public bool NowPlaying { get { throw null; } }
43-
public bool Pause { get { throw null; } set { } }
45+
public int TalkTaskCount => 0;
46+
public int NowTaskId => 0;
47+
public bool NowPlaying => false;
48+
49+
public bool Pause
50+
{
51+
get => true;
52+
set { }
53+
}
4454
}
4555
}

source/CeVIOAIProxy/Servers/IpcRemotingServerController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public bool IsAvailable
3333
}
3434

3535
private IpcRemotingServer ipcServer;
36-
private BouyomiChanRemoting ipcRemoteObject;
36+
private FNF.Utility.BouyomiChanRemoting ipcRemoteObject;
3737

3838
public async void Open()
3939
{
@@ -42,7 +42,7 @@ await Task.Run(() =>
4242
lock (this)
4343
{
4444
this.ipcServer = new IpcRemotingServer(Config.Instance.IPCChannelName);
45-
this.ipcRemoteObject = new BouyomiChanRemoting();
45+
this.ipcRemoteObject = new FNF.Utility.BouyomiChanRemoting();
4646
this.ipcServer.RegisterRemotingObject(this.ipcRemoteObject, "Remoting");
4747

4848
Dispatcher.CurrentDispatcher.Invoke(() =>

0 commit comments

Comments
 (0)