Change ready signal to fire when cef calls OnAfterCreated

Voltstro-Studios · Oct 20, 2024 · 0c29ef9 · 0c29ef9
1 parent 7379df0
commit 0c29ef9
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 2 deletions.
diff --git a/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs b/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs
@@ -951,6 +951,17 @@ public void Resize(Resolution newResolution)
             logger.Debug($"Resized to {newResolution}.");
         }
 
+        /// <summary>
+        ///     Mutes browser audio
+        /// </summary>
+        /// <param name="muted"></param>
+        public void AudioMute(bool muted)
+        {
+            CheckIfIsReadyAndConnected();
+
+            communicationsManager.AudioMute(muted);
+        }
+
         [DebuggerStepThrough]
         private void CheckIfIsReadyAndConnected()
         {

diff --git a/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs b/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs
@@ -197,6 +197,11 @@ public void Resize(Resolution resolution)
             ExecuteTask(() => engineProxy.Resize(resolution));
         }
 
+        public void AudioMute(bool muted)
+        {
+            ExecuteTask(() => engineProxy.AudioMute(muted));
+        }
+
         public void Connect()
         {
             ipcClient.Connect();

diff --git a/src/UnityWebBrowser.Engine.Cef/Main/Core/CefEngineControlsManager.cs b/src/UnityWebBrowser.Engine.Cef/Main/Core/CefEngineControlsManager.cs
@@ -329,6 +329,11 @@ public void Resize(Resolution resolution)
         cefClient.Resize(resolution);
     }
 
+    public void AudioMute(bool muted)
+    {
+        cefClient.AudioMute(muted);
+    }
+
     #endregion
 
     #region Destroy

diff --git a/src/UnityWebBrowser.Engine.Cef/Main/Core/UwbCefEngineEntry.cs b/src/UnityWebBrowser.Engine.Cef/Main/Core/UwbCefEngineEntry.cs
@@ -30,7 +30,7 @@ protected override void EntryPoint(LaunchArguments launchArguments, string[] arg
         cefEngineControlsManager.Init(ClientControlsActions, PopupManager);
 
         SetupIpc(cefEngineControlsManager, launchArguments);
-        Ready();
+        //Ready();
 
         //Calling run message loop will cause the main thread to lock (what we want)
         CefRuntime.RunMessageLoop();

diff --git a/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefClient.cs b/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefClient.cs
@@ -9,6 +9,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using Microsoft.Extensions.Logging;
+using UnityWebBrowser.Engine.Cef.Core;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Js;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Messages;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Popups;
@@ -81,6 +82,7 @@ public UwbCefClient(
         {
             browser = cefBrowser;
             browserHost = cefBrowser.GetHost();
+            ClientControls.Ready();
         };
         displayHandler = new UwbCefDisplayHandler(this, mainLogger, browserConsoleLogger);
         requestHandler = new UwbCefRequestHandler(proxySettings, ignoreSslErrors, ignoreSslErrorsDomains);
@@ -414,6 +416,11 @@ public void Resize(Resolution resolution)
         browserHost.WasResized();
     }
 
+    public void AudioMute(bool muted)
+    {
+        browserHost.SetAudioMuted(muted);
+    }
+
     #endregion
 
     #region Messages

diff --git a/src/UnityWebBrowser.UnityProject/Assets/Scripts/UWBPrjDebugUI.cs b/src/UnityWebBrowser.UnityProject/Assets/Scripts/UWBPrjDebugUI.cs
@@ -68,6 +68,9 @@ public sealed class UWBPrjDebugUI : MonoBehaviour
 
         //Zoom
         private double zoomLevel = double.MinValue;
+
+        //Audio
+        private bool audioMuted = false;
 
         private void Awake()
         {
@@ -134,7 +137,7 @@ private void OnClientConnected()
 
             hasConnected = true;
         }
-
+        
         private void Update()
         {
             if(webBrowserUIBasic.browserClient.HasDisposed || !hasConnected)
@@ -195,6 +198,11 @@ private void OnImGuiLayout(UImGui.UImGui uImGui)
 
                     //Buttons for getting details
                     {
+                        if(ImGui.Checkbox("Audio Mute", ref audioMuted))
+                            webBrowserUIBasic.browserClient.AudioMute(audioMuted);
+
+                        ImGui.SameLine();
+
                         if (ImGui.Button("Get Scroll Pos"))
                             Debug.Log(webBrowserUIBasic.browserClient.GetScrollPosition());
 

diff --git a/src/VoltstroStudios.UnityWebBrowser.Shared/Core/IEngineControls.cs b/src/VoltstroStudios.UnityWebBrowser.Shared/Core/IEngineControls.cs
@@ -114,4 +114,10 @@ internal interface IEngineControls
     /// </summary>
     /// <param name="resolution"></param>
     public void Resize(Resolution resolution);
+
+    /// <summary>
+    ///     Mutes browser audio
+    /// </summary>
+    /// <param name="muted"></param>
+    public void AudioMute(bool muted);
 }