From a4b3f7a7c73bafa7ccd5fdef3776184bc7bc9fea Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Thu, 29 Feb 2024 17:21:46 +0800
Subject: [PATCH] ENH: use Bambu_StartStreamEx for agora tunnel

Change-Id: I5c28dea49d267bf7ff967d0982dd83555899c8c4
Jira: none
---
 src/slic3r/GUI/Printer/BambuTunnel.h         | 6 +++++-
 src/slic3r/GUI/Printer/PrinterFileSystem.cpp | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/slic3r/GUI/Printer/BambuTunnel.h b/src/slic3r/GUI/Printer/BambuTunnel.h
index bd00bdce9..f578fa0ca 100644
--- a/src/slic3r/GUI/Printer/BambuTunnel.h
+++ b/src/slic3r/GUI/Printer/BambuTunnel.h
@@ -19,6 +19,8 @@
 
 #ifdef __cplusplus
 extern "C" {
+#else
+#include <stdbool.h>
 #endif // __cplusplus
 
 #ifdef _WIN32
@@ -117,7 +119,9 @@ BAMBU_EXPORT void BAMBU_FUNC(Bambu_SetLogger)(Bambu_Tunnel tunnel, Logger logger
 
 BAMBU_EXPORT int BAMBU_FUNC(Bambu_Open)(Bambu_Tunnel tunnel);
 
-BAMBU_EXPORT int BAMBU_FUNC(Bambu_StartStream)(Bambu_Tunnel tunnel, int video);
+BAMBU_EXPORT int BAMBU_FUNC(Bambu_StartStream)(Bambu_Tunnel tunnel, bool video);
+
+BAMBU_EXPORT int BAMBU_FUNC(Bambu_StartStreamEx)(Bambu_Tunnel tunnel, int type);
 
 BAMBU_EXPORT int BAMBU_FUNC(Bambu_GetStreamCount)(Bambu_Tunnel tunnel);
 
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
index 7151475e2..70251a420 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -1219,7 +1219,7 @@ void PrinterFileSystem::Reconnect(boost::unique_lock<boost::mutex> &l, int resul
     if (m_session.tunnel) {
         auto tunnel = m_session.tunnel;
         m_session.tunnel = nullptr;
-        wxLogMessage("PrinterFileSystem::Reconnect close");
+        wxLogMessage("PrinterFileSystem::Reconnect close %d", result);
         l.unlock();
         Bambu_Close(tunnel);
         Bambu_Destroy(tunnel);
@@ -1269,7 +1269,11 @@ void PrinterFileSystem::Reconnect(boost::unique_lock<boost::mutex> &l, int resul
                 ret = Bambu_Open(tunnel);
             }
             if (ret == 0)
-                ret = Bambu_StartStream(tunnel, false);
+                do {
+                    ret = Bambu_StartStreamEx 
+                        ? Bambu_StartStreamEx(tunnel, CTRL_TYPE)
+                        : Bambu_StartStream(tunnel, false);
+                } while (ret == Bambu_would_block);
             l.lock();
             if (ret == 0) {
                 m_session.tunnel = tunnel;
@@ -1353,6 +1357,7 @@ StaticBambuLib &StaticBambuLib::get()
     GET_FUNC(Bambu_Create);
     GET_FUNC(Bambu_Open);
     GET_FUNC(Bambu_StartStream);
+    GET_FUNC(Bambu_StartStreamEx);
     GET_FUNC(Bambu_GetStreamCount);
     GET_FUNC(Bambu_GetStreamInfo);
     GET_FUNC(Bambu_SendMessage);