Merge pull request #42 from ua0lnj/master

Do not set x11 env with drm output. Version 1.7.2.
vdr-projects · Jul 11, 2024 · 89eb133 · 89eb133
2 parents fc8c70b + afa1d2a
commit 89eb133
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/config.c b/config.c
@@ -65,12 +65,6 @@ vector<string> cMpvPluginConfig::ExplodeString(string Input)
 int cMpvPluginConfig::ProcessArgs(int argc, char *const argv[])
 {
   char *s;
-  if ((s = getenv("DISPLAY")))
-  {
-    X11Display = s;
-  }
-  else
-    setenv("DISPLAY", X11Display.c_str(), 1);
 
   for (;;)
   {
@@ -134,6 +128,13 @@ int cMpvPluginConfig::ProcessArgs(int argc, char *const argv[])
     esyslog("[mpv]: unhandled argument '%s'\n", argv[optind++]);
   }
 
+  if ((s = getenv("DISPLAY")))
+  {
+    X11Display = s;
+  }
+  else if (strcmp(GpuCtx.c_str(),"drm") && strcmp(VideoOut.c_str(),"drm"))
+    setenv("DISPLAY", X11Display.c_str(), 1);
+
   //convert the playlist extension string to a vector
   PlaylistExtensions = ExplodeString(PlayListExtString);
 

diff --git a/mpv.c b/mpv.c
@@ -19,7 +19,7 @@
 #include "menu_options.h"
 #include "mpv_service.h"
 
-static const char *VERSION = "1.7.1"
+static const char *VERSION = "1.7.2"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif