diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index a645e3a752..db80915ddc 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -389,7 +389,12 @@ if(NOT OPENSSL_FOUND) set(OPENSSL_PKG dep_OpenSSL) endif() -include(DataChannel/DataChannel.cmake) +find_package(LibDataChannel QUIET) +set(DATACHANNEL_PKG "") +if (NOT LibDataChannel_FOUND) + include(DataChannel/DataChannel.cmake) + set(DATACHANNEL_PKG dep_DataChannel) +endif() # we don't want to load a "wrong" openssl when loading curl # so, just don't even bother @@ -463,7 +468,7 @@ set(_dep_list dep_wxInspector dep_FFMPEG dep_Assimp - dep_DataChannel + ${DATACHANNEL_PKG} ) if (MSVC) diff --git a/src/slic3r/GUI/WebMediaController.cpp b/src/slic3r/GUI/WebMediaController.cpp index 378d83b650..cf4580771b 100644 --- a/src/slic3r/GUI/WebMediaController.cpp +++ b/src/slic3r/GUI/WebMediaController.cpp @@ -68,19 +68,4 @@ void WebMediaController::Stop() m_webview->Stop(); } -// wxMediaState WebMediaController::GetState() -// { -// return wxMediaState{}; -// } - -// int WebMediaController::GetLastError() const -// { -// return 0; -// } - -// wxSize WebMediaController::GetVideoSize() const -// { -// return wxSize{}; -// } - }} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/WebMediaController.hpp b/src/slic3r/GUI/WebMediaController.hpp index cdbee33cc3..f5aad23992 100644 --- a/src/slic3r/GUI/WebMediaController.hpp +++ b/src/slic3r/GUI/WebMediaController.hpp @@ -11,7 +11,7 @@ namespace Slic3r { namespace GUI { class WebMediaController : public IMediaController { public: - explicit WebMediaController(wxWebView *webview); + explicit WebMediaController(wxWebView* webview); void Load(wxURI url) override; @@ -21,14 +21,8 @@ public: void Stop() override; - // wxMediaState GetState() override; - - // int GetLastError() const override; - - // wxSize GetVideoSize() const override; - private: - wxWebView * m_webview; + wxWebView* m_webview; std::string m_url; CameraStreamMode m_stream_mode = CameraStreamMode::http; };