diff --git a/app/app.pro b/app/app.pro index 35d9d76e..7d5514a9 100644 --- a/app/app.pro +++ b/app/app.pro @@ -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) diff --git a/app/main.cpp b/app/main.cpp index 71a32b14..bb213657 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -307,7 +307,7 @@ int main(int argc, char *argv[]) // Register custom metatypes for use in signals qRegisterMetaType("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. diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp index 5046d18b..c31ca946 100644 --- a/app/streaming/session.cpp +++ b/app/streaming/session.cpp @@ -11,7 +11,7 @@ #endif #ifdef HAVE_SLVIDEO -#include "video/sl.h" +#include "video/slvid.h" #endif #ifdef Q_OS_WIN32 diff --git a/app/streaming/video/sl.cpp b/app/streaming/video/slvid.cpp similarity index 99% rename from app/streaming/video/sl.cpp rename to app/streaming/video/slvid.cpp index cbcfb737..642f49df 100644 --- a/app/streaming/video/sl.cpp +++ b/app/streaming/video/slvid.cpp @@ -1,4 +1,4 @@ -#include "sl.h" +#include "slvid.h" SLVideoDecoder::SLVideoDecoder(bool) : m_VideoContext(nullptr), diff --git a/app/streaming/video/sl.h b/app/streaming/video/slvid.h similarity index 100% rename from app/streaming/video/sl.h rename to app/streaming/video/slvid.h diff --git a/config.tests/SL/SL.pro b/config.tests/SL/SL.pro new file mode 100644 index 00000000..6879158c --- /dev/null +++ b/config.tests/SL/SL.pro @@ -0,0 +1,3 @@ +SOURCES = main.cpp +LIBS += -lSLVideo -lSLAudio + diff --git a/config.tests/SLVideo/main.cpp b/config.tests/SL/main.cpp similarity index 61% rename from config.tests/SLVideo/main.cpp rename to config.tests/SL/main.cpp index 0387b337..995cf62f 100644 --- a/config.tests/SLVideo/main.cpp +++ b/config.tests/SL/main.cpp @@ -1,7 +1,9 @@ #include +#include int main() { SLVideo_CreateContext(); + SLAudio_CreateContext(); return 0; } diff --git a/config.tests/SLVideo/SLVideo.pro b/config.tests/SLVideo/SLVideo.pro deleted file mode 100644 index a2851c4c..00000000 --- a/config.tests/SLVideo/SLVideo.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = main.cpp -LIBS += -lSLVideo - diff --git a/moonlight-qt.pro b/moonlight-qt.pro index 2dfe732c..74b4c063 100644 --- a/moonlight-qt.pro +++ b/moonlight-qt.pro @@ -21,4 +21,4 @@ CONFIG += debug_and_release # Run our compile tests load(configure) -qtCompileTest(SLVideo) +qtCompileTest(SL)