[vlc-commits] macosx: limit the screensaver blocking to video playback

Felix Paul Kühne git at videolan.org
Tue Feb 21 17:11:15 CET 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Feb 20 13:41:57 2012 +0100| [d08c46d99f0aed9de4114ca72e39fbec65ab8980] | committer: Felix Paul Kühne

macosx: limit the screensaver blocking to video playback
(cherry picked from commit 1bf204696fad551de5b46f7624feb66c0dfc3d34)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d08c46d99f0aed9de4114ca72e39fbec65ab8980
---

 modules/gui/macosx/intf.m |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 5f006e9..35cc378 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1454,7 +1454,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
     p_input = pl_CurrentInput( p_intf );
     if( p_input )
     {
-        if( var_GetInteger( p_input, "state" ) == PLAYING_S )
+        if( var_GetInteger( p_input, "state" ) == PLAYING_S && [self activeVideoPlayback] )
             UpdateSystemActivity( UsrActivity );
         vlc_object_release( p_input );
     }



More information about the vlc-commits mailing list