1 files changed, 0 insertions, 39 deletions

diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 9b326674dc..40228903b9 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -527,30 +527,6 @@ static void vo_x11_get_bounding_monitors(struct vo_x11_state *x11, long b[4])
     XFree(screens);
 }
 
-static void *screensaver_thread(void *arg)
-{
-    struct vo_x11_state *x11 = arg;
-
-    for (;;) {
-        sem_wait(&x11->screensaver_sem);
-        // don't queue multiple wakeups
-        while (!sem_trywait(&x11->screensaver_sem)) {}
-
-        if (atomic_load(&x11->screensaver_terminate))
-            break;
-
-        char *args[] = {"xdg-screensaver", "reset", NULL};
-        int status = mp_subprocess(args, NULL, NULL, mp_devnull, mp_devnull, &(char*){0});
-        if (status) {
-            MP_VERBOSE(x11, "Disabling screensaver failed (%d). Make sure the "
-                            "xdg-screensaver script is installed.\n", status);
-            break;
-        }
-    }
-
-    return NULL;
-}
-
 int vo_x11_init(struct vo *vo)
 {
     char *dispName;
@@ -572,13 +548,6 @@ int vo_x11_init(struct vo *vo)
     x11->opts = x11->opts_cache->opts;
     vo->x11 = x11;
 
-    sem_init(&x11->screensaver_sem, 0, 0);
-    if (pthread_create(&x11->screensaver_thread, NULL, screensaver_thread, x11)) {
-        sem_destroy(&x11->screensaver_sem);
-        goto error;
-    }
-    x11->screensaver_thread_running = true;
-
     x11_error_output = x11->log;
     XSetErrorHandler(x11_errorhandler);
 
@@ -808,13 +777,6 @@ void vo_x11_uninit(struct vo *vo)
         XCloseDisplay(x11->display);
     }
 
-    if (x11->screensaver_thread_running) {
-        atomic_store(&x11->screensaver_terminate, true);
-        sem_post(&x11->screensaver_sem);
-        pthread_join(x11->screensaver_thread, NULL);
-        sem_destroy(&x11->screensaver_sem);
-    }
-
     if (x11->wakeup_pipe[0] >= 0) {
         close(x11->wakeup_pipe[0]);
         close(x11->wakeup_pipe[1]);
@@ -2013,7 +1975,6 @@ static void xscreensaver_heartbeat(struct vo_x11_state *x11)
         (time - x11->screensaver_time_last) >= 10)
     {
         x11->screensaver_time_last = time;
-        sem_post(&x11->screensaver_sem);
         XResetScreenSaver(x11->display);
     }
 }