juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 19:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: call Bambu source deinit

Browse Source 
Change-Id: I7b96056aabe7a894c66fcaf61e24f783f5a1e217
Jira: STUDIO-7666
(cherry picked from commit 9f85798a0bc8d02b3f0a30fd42934f58b48e67e9)
This commit is contained in:
chunmao.guo
2024-10-16 10:21:47 +08:00
committed by Noisyfox
parent f2022f431b
commit ef5463f9fe
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/GUI_App.cpp
View File

@@ -157,6 +157,7 @@ namespace pt = boost::property_tree;
struct StaticBambuLib struct StaticBambuLib
{ {
static void reset(); static void reset();
static void release();
}; };
namespace Slic3r { namespace Slic3r {
@@ -1898,6 +1899,8 @@ GUI_App::~GUI_App()
delete preset_updater; delete preset_updater;
} }
StaticBambuLib::release();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(": exit"); BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(": exit");
} }

5
src/slic3r/GUI/MediaPlayCtrl.cpp
View File

@@ -691,10 +691,7 @@ void MediaPlayCtrl::media_proc()
continue; continue;
} }
lock.unlock(); lock.unlock();
if (url.IsEmpty()) { if (url == "<stop>") {
break;
}
else if (url == "<stop>") {
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: start stop"; BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: start stop";
m_media_ctrl->Stop(); m_media_ctrl->Stop();
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end stop"; BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end stop";

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

@@ -69,6 +69,7 @@ struct StaticBambuLib : BambuLib {
static StaticBambuLib &get(BambuLib * copy = nullptr); static StaticBambuLib &get(BambuLib * copy = nullptr);
static int Fake_Bambu_Create(Bambu_Tunnel*, char const*) { return -2; } static int Fake_Bambu_Create(Bambu_Tunnel*, char const*) { return -2; }
static void reset(); static void reset();
static void release();
private: private:
std::vector<BambuLib *> copies_; std::vector<BambuLib *> copies_;
}; };
@@ -1641,6 +1642,7 @@ StaticBambuLib &StaticBambuLib::get(BambuLib *copy)
GET_FUNC(Bambu_Destroy); GET_FUNC(Bambu_Destroy);
GET_FUNC(Bambu_SetLogger); GET_FUNC(Bambu_SetLogger);
GET_FUNC(Bambu_FreeLogMsg); GET_FUNC(Bambu_FreeLogMsg);
GET_FUNC(Bambu_Deinit);
if (!lib.Bambu_Create) { if (!lib.Bambu_Create) {
lib.Bambu_Create = Fake_Bambu_Create; lib.Bambu_Create = Fake_Bambu_Create;
@@ -1658,6 +1660,12 @@ void StaticBambuLib::reset()
*c = lib; *c = lib;
} }
void StaticBambuLib::release()
{
if (auto f = get().Bambu_Deinit)
f();
}
extern "C" BambuLib *bambulib_get() { extern "C" BambuLib *bambulib_get() {
return &StaticBambuLib::get(); return &StaticBambuLib::get();
} }