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

FIX: video error message when lan ip missing 

Change-Id: I5adaa89e2631a4e7853d806a53f41da927cc0ea7
This commit is contained in:
chunmao.guo 2022-11-08 13:36:28 +08:00 committed by Lane.Wei
parent 9c57c808fa
commit e44e1c1f19
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ void MediaPlayCtrl::Play()
m_button_play->SetIcon("media_stop"); m_button_play->SetIcon("media_stop");
SetStatus(_L("Initializing...")); SetStatus(_L("Initializing..."));
if (!m_lan_ip.empty()) { if (!m_lan_ip.empty() && !m_lan_passwd.empty()) {
m_url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd; m_url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd;
m_last_state = MEDIASTATE_LOADING; m_last_state = MEDIASTATE_LOADING;
SetStatus(_L("Loading...")); SetStatus(_L("Loading..."));
@ -172,7 +172,9 @@ void MediaPlayCtrl::Play()
if (!m_tutk_support) { // not support tutk if (!m_tutk_support) { // not support tutk
Stop(); Stop();
SetStatus(_L("Initialize failed (Not supported without remote video tunnel)!")); SetStatus(m_lan_ip.empty()
? _L("Initialize failed (Missing LAN ip of printer)!")
: _L("Initialize failed (Not supported by printer)!"));
return; return;
} }
@ -335,7 +337,13 @@ void MediaPlayCtrl::ToggleStream()
agent->get_camera_url(m_machine, [this, m = m_machine](std::string url) { agent->get_camera_url(m_machine, [this, m = m_machine](std::string url) {
BOOST_LOG_TRIVIAL(info) << "camera_url: " << url; BOOST_LOG_TRIVIAL(info) << "camera_url: " << url;
CallAfter([this, m, url] { CallAfter([this, m, url] {
if (m != m_machine || url.empty()) return; if (m != m_machine) return;
if (url.empty() || !boost::algorithm::starts_with(url, "bambu:///")) {
MessageDialog(this, wxString::Format(_L("Virtual camera initialize failed (%s)!"), url.empty() ? _L("Network unreachable") : from_u8(url)), _L("Information"),
wxICON_INFORMATION)
.ShowModal();
return;
}
std::string file_url = data_dir() + "/cameratools/url.txt"; std::string file_url = data_dir() + "/cameratools/url.txt";
boost::nowide::ofstream file(file_url); boost::nowide::ofstream file(file_url);
auto url2 = encode_path((url + "&device=" + m).c_str()); auto url2 = encode_path((url + "&device=" + m).c_str());

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

@ -50,9 +50,10 @@ void wxMediaCtrl2::Load(wxURI url)
} }
{ {
wxRegKey key1(wxRegKey::HKCR, L"CLSID\\" CLSID_BAMBU_SOURCE L"\\InProcServer32"); wxRegKey key1(wxRegKey::HKCR, L"CLSID\\" CLSID_BAMBU_SOURCE L"\\InProcServer32");
wxString path = key1.QueryDefaultValue(); wxString path = key1.Exists() ? key1.QueryDefaultValue() : wxString{};
wxRegKey key2(wxRegKey::HKCR, "bambu"); wxRegKey key2(wxRegKey::HKCR, "bambu");
wxString clsid; wxString clsid;
if (key2.Exists())
key2.QueryRawValue("Source Filter", clsid); key2.QueryRawValue("Source Filter", clsid);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": clsid %1% path %2%") % clsid % path; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": clsid %1% path %2%") % clsid % path;