#include <vlc_common.h>
#include <vlc_vout_window.h>
+#include <vlc_modules.h>
#include "inhibit.h"
#include <libvlc.h>
type = "vout window hwnd";
window->handle.hwnd = NULL;
break;
+#endif
+#ifdef __APPLE__
+ case VOUT_WINDOW_TYPE_NSOBJECT:
+ type = "vout window nsobject";
+ window->handle.nsobject = NULL;
+ break;
#endif
case VOUT_WINDOW_TYPE_XID:
type = "vout window xid";
window->handle.xid = 0;
- window->x11_display = NULL;
+ window->display.x11 = NULL;
break;
default:
assert(0);
}
/* Hook for screensaver inhibition */
- if (cfg->type == VOUT_WINDOW_TYPE_XID) {
+ if ( var_InheritBool( obj, "disable-screensaver" ) && cfg->type == VOUT_WINDOW_TYPE_XID) {
w->inhibit = vlc_inhibit_Create (VLC_OBJECT (window),
window->handle.xid);
if (w->inhibit != NULL)