From a9219531c2e286f65b3a1d137f61b72987b960b1 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 23 May 2021 05:12:53 +0200 Subject: Only use x11egl mpv option when running wayland. Disable video disk cache, use mpv default instead --- src/VideoPlayer.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/VideoPlayer.cpp') diff --git a/src/VideoPlayer.cpp b/src/VideoPlayer.cpp index fd5ba79..9dbbe85 100644 --- a/src/VideoPlayer.cpp +++ b/src/VideoPlayer.cpp @@ -1,6 +1,7 @@ #include "../include/VideoPlayer.hpp" #include "../include/Storage.hpp" #include "../include/Program.hpp" +#include "../include/Utils.hpp" #include #include #include @@ -97,9 +98,9 @@ namespace QuickMedia { wid_arg += parent_window_str; std::string input_conf = "--input-conf=" + resource_root + "input.conf"; - Path video_cache_dir = get_cache_dir().join("video"); - create_directory_recursive(video_cache_dir); - std::string cache_dir = "--cache-dir=" + video_cache_dir.data; + //Path video_cache_dir = get_cache_dir().join("video"); + //create_directory_recursive(video_cache_dir); + //std::string cache_dir = "--cache-dir=" + video_cache_dir.data; Path mpv_watch_later_dir = get_storage_dir().join("mpv").join("watch_later"); create_directory_recursive(mpv_watch_later_dir); @@ -121,19 +122,23 @@ namespace QuickMedia { "--no-terminal", "--save-position-on-quit=yes", "--profile=pseudo-gui", // For gui when playing audio, requires a version of mpv that isn't ancient - cache_dir.c_str(), + //cache_dir.c_str(), watch_later_dir.c_str(), - "--cache-on-disk=yes", + //"--cache-on-disk=yes", ytdl_format.c_str(), // TODO: Disable hr seek on low power devices? "--hr-seek=yes", - "--gpu-context=x11egl", "--cookies", cookies_file_arg.c_str(), input_conf.c_str(), wid_arg.c_str() }); + if(is_running_wayland()) { + args.push_back("--gpu-context=x11egl"); + fprintf(stderr, "Wayland detected. Launching mpv in x11egl mode\n"); + } + if(keep_open) args.push_back("--keep-open=yes"); -- cgit v1.2.3