diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-08-20 09:11:07 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-08-20 09:11:07 +0200 |
| commit | a82007dd1ec8178589adc9dac89dcc42117812ce (patch) | |
| tree | 52b33c5acc778e80bedc6388923be520c1990ad2 /video/out/x11_common.h | |
| parent | 2d78705b7370f3ea51c7a66428c7efea5a778caa (diff) | |
| download | mpv-a82007dd1ec8178589adc9dac89dcc42117812ce.tar.bz2 mpv-a82007dd1ec8178589adc9dac89dcc42117812ce.tar.xz | |
Revert "x11: use xdg-screensaver suspend/resume"
This reverts commit 6694048272619b7f91d161c040b818ff63e65279.
Diffstat (limited to 'video/out/x11_common.h')
| -rw-r--r-- | video/out/x11_common.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/video/out/x11_common.h b/video/out/x11_common.h index b2f6336d25..e69640cc64 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -24,6 +24,9 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> +#include "osdep/atomic.h" +#include "osdep/semaphore.h" + #include "common/common.h" struct vo; @@ -63,13 +66,11 @@ struct vo_x11_state { bool screensaver_enabled; bool dpms_touched; - - long screensaver_thread_window; + double screensaver_time_last; pthread_t screensaver_thread; - pthread_mutex_t screensaver_thread_lock; - pthread_cond_t screensaver_thread_wakeup; bool screensaver_thread_running; - bool screensaver_thread_suspend; + sem_t screensaver_sem; + atomic_bool screensaver_terminate; XIM xim; XIC xic; |