Refactor Steam Link support files

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

View file

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

View file

@ -307,7 +307,7 @@ int main(int argc, char *argv[])
// Register custom metatypes for use in signals
qRegisterMetaType<NvApp>("NvApp");
#ifdef HAVE_SLVIDEO
#ifdef STEAM_LINK
// Steam Link requires that we initialize video before creating our
// QGuiApplication in order to configure the framebuffer correctly.
if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
@ -331,7 +331,7 @@ int main(int argc, char *argv[])
app.setPalette(QPalette(Qt::lightGray));
#endif
#ifdef HAVE_SLVIDEO
#ifdef STEAM_LINK
// 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
// for. We know it has NotoSans so we will explicitly ask for that.

View file

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

View file

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

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

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

View file

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

View file

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

View file

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