Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-11-10 05:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor Steam Link support files

Browse source
This commit is contained in:
Cameron Gutman 2019-03-22 22:51:08 -07:00
parent b78a7971d9
commit 2bf3f1b94b
9 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/app.pro
View file

@ -205,14 +205,16 @@ libvdpau {
SOURCES += streaming/video/ffmpeg-renderers/vdpau.cpp SOURCES += streaming/video/ffmpeg-renderers/vdpau.cpp
HEADERS += streaming/video/ffmpeg-renderers/vdpau.h HEADERS += streaming/video/ffmpeg-renderers/vdpau.h
} }
config_SLVideo { config_SL {
message(SLVideo decoder/renderer selected) message(Steam Link build configuration selected)
DEFINES += HAVE_SLVIDEO DEFINES += STEAM_LINK HAVE_SLVIDEO
LIBS += -lSLVideo LIBS += -lSLVideo
SOURCES += streaming/video/sl.cpp SOURCES += \
HEADERS += streaming/video/sl.h streaming/video/slvid.cpp
HEADERS += \
streaming/video/slvid.h
} }
win32:!winrt { win32:!winrt {
message(DXVA2 renderer selected) message(DXVA2 renderer selected)

4
app/main.cpp
View file

@ -307,7 +307,7 @@ int main(int argc, char *argv[])
// Register custom metatypes for use in signals // Register custom metatypes for use in signals
qRegisterMetaType<NvApp>("NvApp"); qRegisterMetaType<NvApp>("NvApp");
#ifdef HAVE_SLVIDEO #ifdef STEAM_LINK
// Steam Link requires that we initialize video before creating our // Steam Link requires that we initialize video before creating our
// QGuiApplication in order to configure the framebuffer correctly. // QGuiApplication in order to configure the framebuffer correctly.
if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) { if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
@ -331,7 +331,7 @@ int main(int argc, char *argv[])
app.setPalette(QPalette(Qt::lightGray)); app.setPalette(QPalette(Qt::lightGray));
#endif #endif
#ifdef HAVE_SLVIDEO #ifdef STEAM_LINK
// Qt 5.9 from the Steam Link SDK is not able to load any fonts // Qt 5.9 from the Steam Link SDK is not able to load any fonts
// since the Steam Link doesn't include any of the ones it looks // since the Steam Link doesn't include any of the ones it looks
// for. We know it has NotoSans so we will explicitly ask for that. // for. We know it has NotoSans so we will explicitly ask for that.

2
app/streaming/session.cpp
View file

@ -11,7 +11,7 @@
#endif #endif
#ifdef HAVE_SLVIDEO #ifdef HAVE_SLVIDEO
#include "video/sl.h" #include "video/slvid.h"
#endif #endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32

2
app/streaming/video/sl.cpp → app/streaming/video/slvid.cpp
View file

@ -1,4 +1,4 @@
#include "sl.h" #include "slvid.h"
SLVideoDecoder::SLVideoDecoder(bool) SLVideoDecoder::SLVideoDecoder(bool)
: m_VideoContext(nullptr), : m_VideoContext(nullptr),

0
app/streaming/video/sl.h → app/streaming/video/slvid.h
View file

3
config.tests/SL/SL.pro Normal file
View file

@ -0,0 +1,3 @@
SOURCES = main.cpp
LIBS += -lSLVideo -lSLAudio

2
config.tests/SLVideo/main.cpp → config.tests/SL/main.cpp
View file

@ -1,7 +1,9 @@
#include <SLVideo.h> #include <SLVideo.h>
#include <SLAudio.h>
int main() int main()
{ {
SLVideo_CreateContext(); SLVideo_CreateContext();
SLAudio_CreateContext();
return 0; return 0;
} }

3
config.tests/SLVideo/SLVideo.pro
View file

@ -1,3 +0,0 @@
SOURCES = main.cpp
LIBS += -lSLVideo

2
moonlight-qt.pro
View file

@ -21,4 +21,4 @@ CONFIG += debug_and_release
# Run our compile tests # Run our compile tests
load(configure) load(configure)
qtCompileTest(SLVideo) qtCompileTest(SL)