From 3c12148668ac70366ec48af2c61777db744eba66 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Fri, 14 Jun 2013 07:34:47 +0200
Subject: cocoa_common: remove play/pause VOCTRL functions

Make VOCTRL_RESTORE_SCREENSAVER / VOCTRL_KILL_SCREENSAVER use the power
management functions directly.
---
 video/out/cocoa_common.h |  2 --
 video/out/cocoa_common.m | 14 ++------------
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'video')

diff --git a/video/out/cocoa_common.h b/video/out/cocoa_common.h
index f6af87f3b7..081c43d2ce 100644
--- a/video/out/cocoa_common.h
+++ b/video/out/cocoa_common.h
@@ -39,8 +39,6 @@ void vo_cocoa_swap_buffers(struct vo *vo);
 int vo_cocoa_check_events(struct vo *vo);
 void vo_cocoa_fullscreen(struct vo *vo);
 void vo_cocoa_ontop(struct vo *vo);
-void vo_cocoa_pause(struct vo *vo);
-void vo_cocoa_resume(struct vo *vo);
 int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg);
 
 void vo_cocoa_register_resize_callback(struct vo *vo,
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 01ccc34d98..83586387b9 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -184,16 +184,6 @@ void vo_cocoa_uninit(struct vo *vo)
     });
 }
 
-void vo_cocoa_pause(struct vo *vo)
-{
-    enable_power_management(vo);
-}
-
-void vo_cocoa_resume(struct vo *vo)
-{
-    disable_power_management(vo);
-}
-
 void vo_cocoa_register_resize_callback(struct vo *vo,
                                        void (*cb)(struct vo *vo, int w, int h))
 {
@@ -556,10 +546,10 @@ int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg)
         return VO_TRUE;
     }
     case VOCTRL_RESTORE_SCREENSAVER:
-        vo_cocoa_pause(vo);
+        enable_power_management(vo);
         return VO_TRUE;
     case VOCTRL_KILL_SCREENSAVER:
-        vo_cocoa_resume(vo);
+        disable_power_management(vo);
         return VO_TRUE;
     }
     return VO_NOTIMPL;
-- 
cgit v1.2.3