Merge lp:~philip.scott/audience/inhibit-screen into lp:~audience-members/audience/trunk

[Felipe Escoto]

Inhibit screen lock during playback

Added a class that takes care of inhibiting the screen.

The same interface could also be used for sending play/pause when the screen locks, buy maybe this should be done elsewhere (Indicator-sound?) and for all players at once

I've found that even if you inhibited the screen, it would only prevent it from locking and not suspending. So now we are simulating user activity every 2 mins

Fixes:
https://bugs.launchpad.net/audience/+bug/1596752
https://bugs.launchpad.net/audience/+bug/1445780

[Corentin Noël (tintou)]

does this code superseed the one in http://bazaar.launchpad.net/~audience-members/audience/trunk/view/head:/src/Widgets/PlayerPage.vala#L404 ? If so it can be removed with this branch

review: Needs Information

[Danielle Foré (danrabbit)]

afaict, this works as intended

review: Approve (testing)

[Corentin Noël (tintou)]

There is a small header issue

review: Needs Fixing

[lp:~philip.scott/audience/inhibit-screen]

596. By Felipe Escoto on 2016-07-19

 Inhibit screen during playback

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-04-06 05:40:05 +0000
+++ src/CMakeLists.txt	2016-07-19 11:59:25 +0000
@@ -76,6 +76,7 @@
     Widgets/PlaylistPopover.vala
     Widgets/WelcomePage.vala
     Widgets/PlayerPage.vala
+    Services/Inhibitor.vala
   PACKAGES
     ${VALA_DEPS}
   OPTIONS

=== added directory 'src/Services'
=== added file 'src/Services/Inhibitor.vala'
--- src/Services/Inhibitor.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Inhibitor.vala	2016-07-19 11:59:25 +0000
@@ -0,0 +1,102 @@
+/*-
+ * Copyright (c) 2016 elementary LLC. (https://elementary.io)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+[DBus (name = "org.freedesktop.ScreenSaver")]
+public interface ScreenSaverIface : Object {
+    public abstract uint32 Inhibit (string app_name, string reason) throws Error;
+    public abstract void UnInhibit (uint32 cookie) throws Error;
+    public abstract void SimulateUserActivity () throws Error;
+}
+
+public class Audience.Services.Inhibitor :  Object {
+    private const string IFACE = "org.freedesktop.ScreenSaver";
+    private const string IFACE_PATH = "/ScreenSaver";
+
+    private static Inhibitor? instance = null;
+
+    private uint32? inhibit_cookie = null;
+
+    private ScreenSaverIface? screensaver_iface = null;
+
+    private bool inhibited = false;
+    private bool simulator_started = false;
+
+    private Inhibitor () {
+        try {
+            screensaver_iface = Bus.get_proxy_sync (BusType.SESSION, IFACE, IFACE_PATH, DBusProxyFlags.NONE);
+        } catch (Error e) {
+            error ("Could not start screensaver interface: %s", e.message);
+        }
+    }
+
+    public static Inhibitor get_instance () {
+        if (instance == null) {
+            instance = new Audience.Services.Inhibitor ();
+        }
+
+        return instance;
+    }
+
+    public void inhibit () {
+        if (screensaver_iface != null && !inhibited) {
+            try {
+                inhibited = true;
+                inhibit_cookie = screensaver_iface.Inhibit ("Audience", "Playing movie");
+                simulate_activity ();
+                debug ("Inhibiting screen");
+            } catch (Error e) {
+                error ("Could not inhibit screen: %s", e.message);
+            }
+        }
+    }
+
+    public void uninhibit () {
+        if (screensaver_iface != null && inhibited) {//&& inhibit_cookie != null) {
+            try {
+                inhibited = false;
+                screensaver_iface.UnInhibit (inhibit_cookie);
+                debug ("Uninhibiting screen");
+            } catch (Error e) {
+                error ("Could not uninhibit screen: %s", e.message);
+            }
+        }
+    }
+
+   /* 
+    * Inhibit currently does not block a suspend from ocurring,
+    * so we simulate user activity every 2 mins to prevent it
+    */
+    private void simulate_activity () {
+        if (simulator_started) return;
+        
+        simulator_started = true;
+        Timeout.add_full (Priority.DEFAULT, 120000, ()=> {
+            if (inhibited) {
+                try {
+                    debug ("Simulating activity");
+                    screensaver_iface.SimulateUserActivity ();
+                } catch (Error e) {
+                    error ("Could not simulate user activity: %s", e.message);
+                }
+            } else {
+                simulator_started = false;
+            }
+            
+            return inhibited;
+        });
+    }
+}

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2016-03-19 19:19:13 +0000
+++ src/Widgets/PlayerPage.vala	2016-07-19 11:59:25 +0000
@@ -22,9 +22,6 @@
         private GnomeMediaKeys mediakeys;
         private ClutterGst.Playback playback;
 
-        public GnomeSessionManager session_manager;
-        uint32 inhibit_cookie;
-
         private bool mouse_primary_down = false;
 
         public bool repeat {
@@ -69,9 +66,6 @@
             events |= Gdk.EventMask.KEY_RELEASE_MASK;
             playback = new ClutterGst.Playback ();
             playback.set_seek_flags (ClutterGst.SeekFlags.ACCURATE);
-            playback.notify["playing"].connect (() => {
-                inhibit_session (playback.playing);
-            });
 
             clutter = new GtkClutter.Embed ();
             stage = (Clutter.Stage)clutter.get_stage ();
@@ -194,6 +188,7 @@
                     settings.last_stopped = playback.progress;
 
                 get_playlist_widget ().save_playlist ();
+                Audience.Services.Inhibitor.get_instance ().uninhibit ();
             });
 
             //end
@@ -228,6 +223,14 @@
                     var cursor = new Gdk.Cursor.for_display (display, Gdk.CursorType.BLANK_CURSOR);
                     window.set_cursor (cursor);
                 }
+            });        
+
+            notify["playing"].connect (() => {
+                if (playing) {
+                    Audience.Services.Inhibitor.get_instance ().inhibit ();
+                } else {
+                    Audience.Services.Inhibitor.get_instance ().uninhibit ();
+                }
             });
 
             add (clutter);
@@ -258,6 +261,8 @@
             /*subtitles/audio tracks*/
             bottom_bar.preferences_popover.setup_text ();
             bottom_bar.preferences_popover.setup_audio ();
+            
+            Audience.Services.Inhibitor.get_instance ().inhibit ();
         }
 
         public string get_played_uri () {
@@ -395,37 +400,5 @@
 
             return false;
         }
-
-        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);
-            }
-        }
     }
 }