From f5de0aac96621b584bdb5fd1ca5916529d219b0a Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 16 Sep 2012 20:53:04 +0200 Subject: cocoa_common: use IOKit to perform power management This allows to remove the call to the deprecated `UpdateSystemActivity`. The additional benefit is power management is disabled only if the video is really playing. A paused video will not stop the system from idling. --- libvo/vo_opengl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libvo/vo_opengl.c') diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c index b6f2ddd811..7f400ce62c 100644 --- a/libvo/vo_opengl.c +++ b/libvo/vo_opengl.c @@ -1941,6 +1941,16 @@ static int control(struct vo *vo, uint32_t request, void *data) break; p->glctx->ontop(vo); return VO_TRUE; + case VOCTRL_PAUSE: + if (!p->glctx->pause) + break; + p->glctx->pause(vo); + return VO_TRUE; + case VOCTRL_RESUME: + if (!p->glctx->resume) + break; + p->glctx->resume(vo); + return VO_TRUE; case VOCTRL_FULLSCREEN: p->glctx->fullscreen(vo); resize(p); -- cgit v1.2.3 From 2cad0e35f63a62e175195395a750d97f8e49de98 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 23 Oct 2012 00:08:59 +0200 Subject: vo_opengl: fix help output typo --- libvo/vo_opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libvo/vo_opengl.c') diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c index 7f400ce62c..edaa04a547 100644 --- a/libvo/vo_opengl.c +++ b/libvo/vo_opengl.c @@ -2527,7 +2527,7 @@ static const char help_text[] = " assumed to be in sRGB.\n" " pbo\n" " Enable use of PBOs. This is faster, but can sometimes lead to\n" -" sparodic and temporary image corruption.\n" +" sporadic and temporary image corruption.\n" " dither-depth=\n" " Positive non-zero values select the target bit depth.\n" " -1: Disable any dithering done by mpv.\n" -- cgit v1.2.3