Refactor Steam Link support files

pepe6500 · Mar 23, 2019 · 2bf3f1b · 2bf3f1b
1 parent b78a797
commit 2bf3f1b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 13 deletions.
diff --git 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
@@ -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.

diff --git 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 → app/streaming/video/slvid.cpp b/app/streaming/video/sl.cpp → 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 → app/streaming/video/slvid.h b/app/streaming/video/sl.h → app/streaming/video/slvid.h
diff --git a/config.tests/SL/SL.pro b/config.tests/SL/SL.pro
@@ -0,0 +1,3 @@
+SOURCES = main.cpp
+LIBS += -lSLVideo -lSLAudio
+
diff --git a/config.tests/SLVideo/main.cpp → config.tests/SL/main.cpp b/config.tests/SLVideo/main.cpp → config.tests/SL/main.cpp
@@ -1,7 +1,9 @@
 #include <SLVideo.h>
+#include <SLAudio.h>
 
 int main()
 {
     SLVideo_CreateContext();
+    SLAudio_CreateContext();
     return 0;
 }
diff --git a/config.tests/SLVideo/SLVideo.pro b/config.tests/SLVideo/SLVideo.pro
diff --git 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)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		SOURCES = main.cpp
		LIBS += -lSLVideo -lSLAudio