mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 02:41:17 +00:00
Merge branch 'feat/printer-agent-infra' of https://github.com/OrcaSlicer/OrcaSlicer into feat/printer-agent-infra
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user