Merge lp:~donadigo/audience/gtk-application-inhibit into lp:~audience-members/audience/trunk

[Adam Bieńkowski]

* Use Gtk.Application.inhibit API instead of a custom one

This branch fixes bug #1656441: "Use Gtk.Application.inhibit".

Instead of creating an entire new class for managing inhibition, we just call Gtk.Application.inhibit, which supports different types of inhibiting and also ensures that in the future we can e.g: implement org.freedesktop.portal.Desktop interface for a custom inhibit behaviour.

[lp:~donadigo/audience/gtk-application-inhibit]

718. By Adam Bieńkowski on 2017-01-14

Make reason translatable

[Felipe Escoto (philip.scott)]

Gtk.Inhibit doesn't seem to work under either pantheon or gnome shell. On both desktop environments the display still turns off :/

At least for now, the current method will have to stay

review: Disapprove

Unmerged revisions

718. By Adam Bieńkowski on 2017-01-14

Make reason translatable

717. By Adam Bieńkowski on 2017-01-14

Remove debug line change

716. By Adam Bieńkowski on 2017-01-14

Use mainwindow from app instance

715. By Adam Bieńkowski on 2017-01-14

Use Gtk.Application.inhibit API

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-02 23:59:41 +0000
+++ src/CMakeLists.txt	2017-01-14 18:26:31 +0000
@@ -66,7 +66,6 @@
     Widgets/Library/LibraryItem.vala
     Widgets/Library/EpisodesPage.vala
 
-    Services/Inhibitor.vala
     Services/DirictoryMonitoring.vala
     Services/LibraryManager.vala
     Services/Thubnailer.vala

=== removed file 'src/Services/Inhibitor.vala'
--- src/Services/Inhibitor.vala	2016-07-19 11:56:12 +0000
+++ src/Services/Inhibitor.vala	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/*-
- * 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/Player/PlayerPage.vala'
--- src/Widgets/Player/PlayerPage.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Player/PlayerPage.vala	2017-01-14 18:26:31 +0000
@@ -22,6 +22,8 @@
         private GnomeMediaKeys mediakeys;
         private ClutterGst.Playback playback;
 
+        private static uint inhibit_cookie = 0;
+
         private bool mouse_primary_down = false;
 
         public bool repeat {
@@ -192,7 +194,6 @@
                     settings.last_stopped = playback.progress;
 
                 get_playlist_widget ().save_playlist ();
-                Audience.Services.Inhibitor.get_instance ().uninhibit ();
             });
 
             //end
@@ -231,9 +232,9 @@
 
             notify["playing"].connect (() => {
                 if (playing) {
-                    Audience.Services.Inhibitor.get_instance ().inhibit ();
+                   inhibit ();
                 } else {
-                    Audience.Services.Inhibitor.get_instance ().uninhibit ();
+                    uninhibit ();
                 }
             });
 
@@ -264,7 +265,7 @@
 
             bottom_bar.preferences_popover.is_setup = false;
 
-            Audience.Services.Inhibitor.get_instance ().inhibit ();
+            inhibit ();
             settings.current_video = uri;
         }
 
@@ -366,6 +367,26 @@
             return false;
         }
 
+        private void inhibit () {
+            if (inhibit_cookie != 0) {
+                return;
+            }
+
+            var app = App.get_instance ();
+            inhibit_cookie = app.inhibit (app.mainwindow,
+                                        Gtk.ApplicationInhibitFlags.SUSPEND | Gtk.ApplicationInhibitFlags.IDLE,
+                                        _("Playing movie"));
+        }
+
+        private void uninhibit () {
+            if (inhibit_cookie == 0) {
+                return;
+            }
+
+            App.get_instance ().uninhibit (inhibit_cookie);
+            inhibit_cookie = 0;
+        }
+
         public bool update_pointer_position (double y, int window_height) {
             App.get_instance ().mainwindow.get_window ().set_cursor (null);