Merge lp:~vikoadi/audience/inhibit-to-playerpage into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

move screenlocking prevention to playerpage

move screenlocking prevention to playerpage

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2015-10-31 19:47:46 +0000
+++ src/Widgets/PlayerPage.vala	2015-11-01 17:29:49 +0000
@@ -17,6 +17,9 @@
         private GtkClutter.Actor bottom_actor;
         private GnomeMediaKeys             mediakeys;
 
+        public GnomeSessionManager session_manager;
+        uint32 inhibit_cookie;
+
         private bool mouse_primary_down = false;
         private bool fullscreened = false;
 
@@ -36,7 +39,10 @@
 
         public PlayerPage () {
             video_player = new Widgets.VideoPlayer();
-            video_player.notify["playing"].connect (() => {bottom_bar.toggle_play_pause ();});
+            video_player.notify["playing"].connect (() => {
+                bottom_bar.toggle_play_pause ();
+                inhibit_session (video_player.playing);
+            });
 
             clutter = new GtkClutter.Embed ();
             stage = (Clutter.Stage)clutter.get_stage ();
@@ -523,5 +529,36 @@
                 Idle.add (update_aspect_ratio);
         }
 
+        X.Display dpy;
+        int timeout = -1;
+        int interval;
+        int prefer_blanking;
+        int allow_exposures;
+        void inhibit_session (bool inhibit) {
+            debug ("set inhibit to " + (inhibit ? "true" : "false"));
+            //TODO: Remove X Dependency!
+            //store the default values for setting back
+
+            if (dpy == null)
+                dpy = new X.Display ();
+
+            if (timeout == -1)
+                dpy.get_screensaver (out timeout, out interval, out prefer_blanking, out allow_exposures);
+
+            dpy.set_screensaver (inhibit ? 0 : timeout, interval, prefer_blanking, allow_exposures);
+
+            //prevent screenlocking in Gnome 3 using org.gnome.SessionManager
+            try {
+                session_manager = Bus.get_proxy_sync (BusType.SESSION,
+                        "org.gnome.SessionManager", "/org/gnome/SessionManager");
+                if (inhibit) {
+                    inhibit_cookie = session_manager.Inhibit ("audience", 0, "Playing Video using Audience", 12);
+                } else {
+                    session_manager.Uninhibit (inhibit_cookie);
+                }
+            } catch (Error e) {
+                warning (e.message);
+            }
+        }
     }
 }

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2015-09-21 18:11:20 +0000
+++ src/Widgets/VideoPlayer.vala	2015-11-01 17:29:49 +0000
@@ -58,8 +58,6 @@
                 if (value == playing)
                     return;
 
-                set_screensaver (!value);
-                set_screenlock (!value);
                 playbin.set_state (value ? Gst.State.PLAYING : Gst.State.PAUSED);
                 _playing = value;
             }
@@ -181,9 +179,6 @@
         public uint video_width { get; private set; }
         public uint video_height { get; private set; }
 
-        public GnomeSessionManager session_manager;
-        uint32 inhibit_cookie;
-
         public signal void ended ();
         public signal void toggle_side_pane (bool show);
         public signal void text_tags_changed ();
@@ -445,34 +440,6 @@
             dlg.destroy ();
         }
 
-        //TODO: Remove X Dependency!
-        //store the default values for setting back
-        X.Display dpy; int timeout = -1; int interval; int prefer_blanking; int allow_exposures;
-        void set_screensaver (bool enable) {
-            if (dpy == null)
-                dpy = new X.Display ();
-
-            if (timeout == -1)
-                dpy.get_screensaver (out timeout, out interval, out prefer_blanking, out allow_exposures);
-
-            dpy.set_screensaver (enable ? timeout : 0, interval, prefer_blanking, allow_exposures);
-        }
-
-        //prevent screenlocking in Gnome 3 using org.gnome.SessionManager
-        void set_screenlock (bool enable) {
-            try {
-                session_manager = Bus.get_proxy_sync (BusType.SESSION,
-                        "org.gnome.SessionManager", "/org/gnome/SessionManager");
-                if (enable) {
-                    session_manager.Uninhibit (inhibit_cookie);
-                } else {
-                    inhibit_cookie = session_manager.Inhibit ("audience", 0, "Playing Video using Audience", 12);
-                }
-            } catch (Error e) {
-                warning (e.message);
-            }
-        }
-
         public void seek_jump_seconds (int seconds) {
             int64 position;
             playbin.query_position (Gst.Format.TIME, out position);