moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-18 02:22:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make OverlayManager own the overlay color setting

Browse Source
This commit is contained in:
Cameron Gutman 2019-02-12 20:39:10 -08:00
parent d077c6450f
commit 5788fa7204
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/streaming/video/ffmpeg-renderers/dxva2.cpp
View File

@ -921,12 +921,13 @@ void DXVA2Renderer::renderFrameAtVsync(AVFrame *frame)
if (m_OverlayFont != nullptr) { if (m_OverlayFont != nullptr) {
if (Session::get()->getOverlayManager().isOverlayEnabled(Overlay::OverlayDebug)) { if (Session::get()->getOverlayManager().isOverlayEnabled(Overlay::OverlayDebug)) {
SDL_Color color = Session::get()->getOverlayManager().getOverlayColor(Overlay::OverlayDebug);
m_OverlayFont->DrawTextA(nullptr, m_OverlayFont->DrawTextA(nullptr,
Session::get()->getOverlayManager().getOverlayText(Overlay::OverlayDebug), Session::get()->getOverlayManager().getOverlayText(Overlay::OverlayDebug),
-1, -1,
&sample.DstRect, &sample.DstRect,
DT_LEFT | DT_NOCLIP, DT_LEFT | DT_NOCLIP,
D3DCOLOR_ARGB(255, 255, 255, 255)); D3DCOLOR_ARGB(color.a, color.r, color.g, color.b));
} }
} }

7
app/streaming/video/overlaymanager.cpp
View File

@ -6,6 +6,8 @@ OverlayManager::OverlayManager() :
m_Renderer(nullptr) m_Renderer(nullptr)
{ {
memset(m_Overlays, 0, sizeof(m_Overlays)); memset(m_Overlays, 0, sizeof(m_Overlays));
m_Overlays[OverlayType::OverlayDebug].color = {0xFF, 0xFF, 0xFF, 0xFF};
} }
bool OverlayManager::isOverlayEnabled(OverlayType type) bool OverlayManager::isOverlayEnabled(OverlayType type)
@ -44,6 +46,11 @@ void OverlayManager::setOverlayState(OverlayType type, bool enabled)
} }
} }
SDL_Color OverlayManager::getOverlayColor(OverlayType type)
{
return m_Overlays[type].color;
}
void OverlayManager::setOverlayRenderer(IOverlayRenderer* renderer) void OverlayManager::setOverlayRenderer(IOverlayRenderer* renderer)
{ {
m_Renderer = renderer; m_Renderer = renderer;

4
app/streaming/video/overlaymanager.h
View File

@ -2,6 +2,8 @@
#include <QString> #include <QString>
#include <SDL.h>
namespace Overlay { namespace Overlay {
enum OverlayType { enum OverlayType {
@ -28,11 +30,13 @@ public:
char* getOverlayText(OverlayType type); char* getOverlayText(OverlayType type);
void setOverlayTextUpdated(OverlayType type); void setOverlayTextUpdated(OverlayType type);
void setOverlayState(OverlayType type, bool enabled); void setOverlayState(OverlayType type, bool enabled);
SDL_Color getOverlayColor(OverlayType type);
void setOverlayRenderer(IOverlayRenderer* renderer); void setOverlayRenderer(IOverlayRenderer* renderer);
struct { struct {
bool enabled; bool enabled;
SDL_Color color;
char text[512]; char text[512];
} m_Overlays[OverlayMax]; } m_Overlays[OverlayMax];
IOverlayRenderer* m_Renderer; IOverlayRenderer* m_Renderer;