diff --git a/Core/FamilyBasicDataRecorder.h b/Core/FamilyBasicDataRecorder.h index 509a8033..23d17863 100644 --- a/Core/FamilyBasicDataRecorder.h +++ b/Core/FamilyBasicDataRecorder.h @@ -30,11 +30,19 @@ protected: } } - bool IsRawString() + bool IsRawString() override { return true; } + void InternalSetStateFromInput() override + { + if(_fileData.size() > 0) { + SetTextState(Base64::Encode(_fileData)); + _fileData.clear(); + } + } + public: FamilyBasicDataRecorder() : BaseControlDevice(BaseControlDevice::ExpDevicePort2) { @@ -47,15 +55,7 @@ public: } } - void InternalSetStateFromInput() - { - if(_fileData.size() > 0) { - SetTextState(Base64::Encode(_fileData)); - _fileData.clear(); - } - } - - void OnAfterSetState() + void OnAfterSetState() override { if(_state.State.size() > 0) { _data = Base64::Decode(GetTextState()); diff --git a/Linux/SdlRenderer.h b/Linux/SdlRenderer.h index ee7d02f4..352f1a01 100755 --- a/Linux/SdlRenderer.h +++ b/Linux/SdlRenderer.h @@ -52,18 +52,18 @@ private: void DrawPauseScreen(); - float MeasureString(std::wstring text); - bool ContainsCharacter(wchar_t character); + float MeasureString(std::wstring text) override; + bool ContainsCharacter(wchar_t character) override; public: SdlRenderer(void* windowHandle); virtual ~SdlRenderer(); - void UpdateFrame(void *frameBuffer, uint32_t width, uint32_t height); - void Render(); - void Reset(); + void UpdateFrame(void *frameBuffer, uint32_t width, uint32_t height) override; + void Render() override; + void Reset() override; - void DrawString(std::wstring message, int x, int y, uint8_t r = 255, uint8_t g = 255, uint8_t b = 255, uint8_t opacity = 255); + void DrawString(std::wstring message, int x, int y, uint8_t r = 255, uint8_t g = 255, uint8_t b = 255, uint8_t opacity = 255) override; void SetFullscreenMode(bool fullscreen, void* windowHandle, uint32_t monitorWidth, uint32_t monitorHeight) override; }; \ No newline at end of file