diff --git a/libspeechd.so b/libspeechd.so deleted file mode 120000 index 4880363..0000000 --- a/libspeechd.so +++ /dev/null @@ -1 +0,0 @@ -libspeechd.so.2.6.0 \ No newline at end of file diff --git a/libspeechd.so.2 b/libspeechd.so.2 deleted file mode 120000 index 4880363..0000000 --- a/libspeechd.so.2 +++ /dev/null @@ -1 +0,0 @@ -libspeechd.so.2.6.0 \ No newline at end of file diff --git a/libspeechd.so.2.6.0 b/libspeechd.so.2.6.0 deleted file mode 100755 index e0b3b35..0000000 Binary files a/libspeechd.so.2.6.0 and /dev/null differ diff --git a/stardew-access/ModEntry.cs b/stardew-access/ModEntry.cs index 150d7cc..879f724 100644 --- a/stardew-access/ModEntry.cs +++ b/stardew-access/ModEntry.cs @@ -9,6 +9,16 @@ using System.Runtime.InteropServices; namespace stardew_access { + public struct GoString + { + public string msg; + public long len; + public GoString(string msg, long len) + { + this.msg = msg; + this.len = len; + } + } public class MainClass : Mod { @@ -31,6 +41,17 @@ namespace stardew_access get{return _modHelper;} } + [DllImport("libspeechdwrapper.so")] + private static extern void Initialize(); + + + [DllImport("libspeechdwrapper.so")] + private static extern void Speak(GoString text, bool interrupt); + + + [DllImport("libspeechdwrapper.so")] + private static extern void Close(); + /********* ** Public methods *********/ @@ -63,6 +84,13 @@ namespace stardew_access #endregion + Initialize(); + string text = "Testing"; + Speak(new GoString(text,text.Length), false); + Close(); + + + helper.Events.Input.ButtonPressed += this.OnButtonPressed; helper.Events.GameLoop.UpdateTicked += this.onUpdateTicked; } diff --git a/stardew-access/ScreenReader.cs b/stardew-access/ScreenReader.cs index f0360fd..f63ce14 100644 --- a/stardew-access/ScreenReader.cs +++ b/stardew-access/ScreenReader.cs @@ -1,7 +1,6 @@ using AccessibleOutput; using StardewModdingAPI; using System.Runtime.InteropServices; -using IronPython.Hosting; namespace stardew_access { @@ -13,7 +12,6 @@ namespace stardew_access /// Initializes the screen reader. public void InitializeScreenReader() { - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return; diff --git a/stardew-access/manifest.json b/stardew-access/manifest.json index 76ce6cc..a9dcc84 100644 --- a/stardew-access/manifest.json +++ b/stardew-access/manifest.json @@ -1,7 +1,7 @@ { "Name": "Stardew Access", "Author": "Mohammad Shoaib", - "Version": "1.0.18-beta", + "Version": "1.0.19-beta", "Description": "An accessibility mod with screen reader support!", "UniqueID": "shoaib.stardewaccess", "EntryDll": "stardew-access.dll", diff --git a/stardew-access/stardew-access.csproj b/stardew-access/stardew-access.csproj index e324c22..78532e0 100644 --- a/stardew-access/stardew-access.csproj +++ b/stardew-access/stardew-access.csproj @@ -13,7 +13,6 @@ -