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

FIX: pass error from gstreamer to wxMediaCtrl 

Change-Id: If275d0ebeb7089f67ad366811dc48009b86af564
This commit is contained in:
chunmao.guo 2023-07-12 15:26:25 +08:00 committed by Lane.Wei
parent 34ba0612c4
commit 02f2e51c2e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Printer/gstbambusrc.c
View File

@ -365,14 +365,16 @@ gst_bambusrc_start (GstBaseSrc * bsrc)
return FALSE; return FALSE;
} }
int rv = 0;
BAMBULIB(Bambu_SetLogger)(src->tnl, _log, (void *)src); BAMBULIB(Bambu_SetLogger)(src->tnl, _log, (void *)src);
if (BAMBULIB(Bambu_Open)(src->tnl) != Bambu_success) { if ((rv = BAMBULIB(Bambu_Open)(src->tnl)) != Bambu_success) {
BAMBULIB(Bambu_Destroy)(src->tnl); BAMBULIB(Bambu_Destroy)(src->tnl);
src->tnl = NULL; src->tnl = NULL;
gst_bambu_last_error = rv;
return FALSE; return FALSE;
} }
int rv, n = 0; int n = 0;
while ((rv = BAMBULIB(Bambu_StartStream)(src->tnl, 1 /* video */)) == Bambu_would_block) { while ((rv = BAMBULIB(Bambu_StartStream)(src->tnl, 1 /* video */)) == Bambu_would_block) {
usleep(100000); usleep(100000);
} }

2
src/slic3r/GUI/wxMediaCtrl2.cpp
View File

@ -177,7 +177,7 @@ void wxMediaCtrl2::Stop()
} }
#ifdef __LINUX__ #ifdef __LINUX__
extern int gst_bambu_last_error; extern "C" int gst_bambu_last_error;
#endif #endif
int wxMediaCtrl2::GetLastError() const int wxMediaCtrl2::GetLastError() const