mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: use Bambu_StartStreamEx for agora tunnel 

Change-Id: I5c28dea49d267bf7ff967d0982dd83555899c8c4
Jira: none
This commit is contained in:
chunmao.guo 2024-02-29 17:21:46 +08:00 committed by Lane.Wei
parent b7ec0d4334
commit a4b3f7a7c7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Printer/BambuTunnel.h
View File

@ -19,6 +19,8 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else
#include <stdbool.h>
#endif // __cplusplus #endif // __cplusplus
#ifdef _WIN32 #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_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); BAMBU_EXPORT int BAMBU_FUNC(Bambu_GetStreamCount)(Bambu_Tunnel tunnel);

9
src/slic3r/GUI/Printer/PrinterFileSystem.cpp
View File

@ -1219,7 +1219,7 @@ void PrinterFileSystem::Reconnect(boost::unique_lock<boost::mutex> &l, int resul
if (m_session.tunnel) { if (m_session.tunnel) {
auto tunnel = m_session.tunnel; auto tunnel = m_session.tunnel;
m_session.tunnel = nullptr; m_session.tunnel = nullptr;
wxLogMessage("PrinterFileSystem::Reconnect close"); wxLogMessage("PrinterFileSystem::Reconnect close %d", result);
l.unlock(); l.unlock();
Bambu_Close(tunnel); Bambu_Close(tunnel);
Bambu_Destroy(tunnel); Bambu_Destroy(tunnel);
@ -1269,7 +1269,11 @@ void PrinterFileSystem::Reconnect(boost::unique_lock<boost::mutex> &l, int resul
ret = Bambu_Open(tunnel); ret = Bambu_Open(tunnel);
} }
if (ret == 0) 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(); l.lock();
if (ret == 0) { if (ret == 0) {
m_session.tunnel = tunnel; m_session.tunnel = tunnel;
@ -1353,6 +1357,7 @@ StaticBambuLib &StaticBambuLib::get()
GET_FUNC(Bambu_Create); GET_FUNC(Bambu_Create);
GET_FUNC(Bambu_Open); GET_FUNC(Bambu_Open);
GET_FUNC(Bambu_StartStream); GET_FUNC(Bambu_StartStream);
GET_FUNC(Bambu_StartStreamEx);
GET_FUNC(Bambu_GetStreamCount); GET_FUNC(Bambu_GetStreamCount);
GET_FUNC(Bambu_GetStreamInfo); GET_FUNC(Bambu_GetStreamInfo);
GET_FUNC(Bambu_SendMessage); GET_FUNC(Bambu_SendMessage);