chaos/VideoPlayer
1
0
Fork 0
Code Activity

Add backwards compat for pre 1.18 mpv.

Browse source
This commit is contained in:
namedkitten 2020-04-26 02:15:27 +01:00
parent 1b5495573e
commit 4685489580
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -38,6 +38,11 @@ execute_process(
include_directories(${CMAKE_BINARY_DIR}/spdlog/include) include_directories(${CMAKE_BINARY_DIR}/spdlog/include)
if(MPV_VERSION VERSION_GREATER_EQUAL "1.28.0")
set(SOURCES ${SOURCES} src/Backends/MPV/MPVBackend.cpp)
else()
add_definitions(-DDISABLE_MPV_RENDER_API)
endif()
if(X11_FOUND AND Xext_FOUND) if(X11_FOUND AND Xext_FOUND)
@ -56,8 +61,8 @@ set(SOURCES
src/logger.cpp src/logger.cpp
src/qmldebugger.cpp src/qmldebugger.cpp
src/Backends/MPVCommon/MPVCommon.cpp src/Backends/MPVCommon/MPVCommon.cpp
src/Backends/MPV/MPVBackend.cpp
src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp
${SOURCES}
) )
find_program(CCACHE_FOUND cache) find_program(CCACHE_FOUND cache)

7
src/main.cpp
View file

@ -16,7 +16,9 @@
#include <exception> #include <exception>
#include <iosfwd> #include <iosfwd>
#include <memory> #include <memory>
#ifndef DISABLE_MPV_RENDER_API
#include "Backends/MPV/MPVBackend.hpp" #include "Backends/MPV/MPVBackend.hpp"
#endif
#include "Backends/MPVNoFBO/MPVNoFBOBackend.hpp" #include "Backends/MPVNoFBO/MPVNoFBOBackend.hpp"
#include "Process.h" #include "Process.h"
#include "ThumbnailCache.h" #include "ThumbnailCache.h"
@ -151,12 +153,15 @@ main(int argc, char* argv[])
qmlRegisterType<UtilsClass>("player", 1, 0, "Utils"); qmlRegisterType<UtilsClass>("player", 1, 0, "Utils");
#ifndef DISABLE_MPV_RENDER_API
if (settings.value("Backend/fbo", true).toBool()) { if (settings.value("Backend/fbo", true).toBool()) {
qmlRegisterType<MPVBackend>("player", 1, 0, "PlayerBackend"); qmlRegisterType<MPVBackend>("player", 1, 0, "PlayerBackend");
} else { } else {
qmlRegisterType<MPVNoFBOBackend>("player", 1, 0, "PlayerBackend"); qmlRegisterType<MPVNoFBOBackend>("player", 1, 0, "PlayerBackend");
} }
#else
qmlRegisterType<MPVNoFBOBackend>("player", 1, 0, "PlayerBackend");
#endif
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
launcherLogger->info("Loading player..."); launcherLogger->info("Loading player...");