Merge lp:~mcg/pithos/disablescreensaver into lp:~kevin-mehall/pithos/trunk

[Matthew Gregg]

This is another plugin I used in Rhythmbox and wanted to have available in Pithos. It will inhibit the Gnome screensaver while Pithos is playing and uninhibit while paused.

[Kevin Mehall (kevin-mehall)]

Thanks for your patch.

Can you give me an example of the use case? Since Pithos is audio-only, I don't think we need to keep the screen on as would a video app. The closest I can think of is if you wanted to keep the computer from going to sleep if you're listening to Pithos while doing non-computer work, but then it might be nice to allow the display to sleep and just inhibit power management in case you're on battery.

review: Needs Information

[Matthew Gregg (mcg)]

My personal use case is a combination of my previous plugin and this one. If Pithos is running and playing music I don't want my screensaver starting and if it does start(because I have locked my screen manually), to have the music pause. This is so I can have music while am working at the machine and not stopped if I walk away for a bit, but can still manually lock the screen and have the music pause. I would also use this plugin to implement a "party mode" when I want Pithos full screen and screensaver disabled. Now that you mention power management, true, you may not want to enable this on battery(I would since I would almost always manually lock screen or pause playback when I walk away from my laptop) and actually I am not sure this will stop the power manager from shutting down the display even with the screensaver disabled. Do they work independently with power manager trumping screensaver??

Unmerged revisions

143. By Matthew Gregg on 2010-10-27

Adding plugin to (un)inhibit gnome screensaver while pithos is playing

=== modified file '.bzrignore'
--- .bzrignore	2010-07-22 23:56:13 +0000
+++ .bzrignore	2010-10-27 00:42:57 +0000
@@ -1,2 +1,3 @@
 pithos/libpiano/piano.py
 pithos/libpiano/piano_wrap.c
+debug_config

=== modified file 'data/ui/PreferencesPithosDialog.ui'
--- data/ui/PreferencesPithosDialog.ui	2010-10-13 15:43:55 +0000
+++ data/ui/PreferencesPithosDialog.ui	2010-10-27 00:42:57 +0000
@@ -18,7 +18,7 @@
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
-            <property name="n_rows">12</property>
+            <property name="n_rows">13</property>
             <property name="n_columns">3</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
@@ -151,6 +151,22 @@
               </packing>
             </child>
             <child>
+              <object class="GtkCheckButton" id="checkbutton_disablescreensaver">
+                <property name="label" translatable="yes">Disable screensaver while playing</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">10</property>
+                <property name="bottom_attach">11</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;small&gt;&lt;a href='http://pandora.com'&gt;Create an account at pandora.com&lt;/a&gt;&lt;/small&gt;</property>
@@ -215,8 +231,8 @@
               </object>
               <packing>
                 <property name="right_attach">3</property>
-                <property name="top_attach">10</property>
-                <property name="bottom_attach">11</property>
+                <property name="top_attach">11</property>
+                <property name="bottom_attach">12</property>
               </packing>
             </child>
             <child>
@@ -229,8 +245,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">3</property>
-                <property name="top_attach">11</property>
-                <property name="bottom_attach">12</property>
+                <property name="top_attach">12</property>
+                <property name="bottom_attach">13</property>
               </packing>
             </child>
             <child>

=== modified file 'pithos/PreferencesPithosDialog.py'
--- pithos/PreferencesPithosDialog.py	2010-10-16 22:15:11 +0000
+++ pithos/PreferencesPithosDialog.py	2010-10-27 00:42:57 +0000
@@ -76,6 +76,7 @@
             "lastfm_key": False,
             "enable_mediakeys":True,
             "enable_screensaverpause":False,
+            "enable_disablescreensaver":False,
             "volume": 1.0,
         }
         
@@ -106,6 +107,7 @@
         self.builder.get_object('prefs_proxy').set_text(self.__preferences["proxy"])
         self.builder.get_object('checkbutton_notify').set_active(self.__preferences["notify"])
         self.builder.get_object('checkbutton_screensaverpause').set_active(self.__preferences["enable_screensaverpause"])
+        self.builder.get_object('checkbutton_disablescreensaver').set_active(self.__preferences["enable_disablescreensaver"])
         self.builder.get_object('checkbutton_icon').set_active(self.__preferences["show_icon"])
         
         self.lastfm_auth = LastFmAuth(self.__preferences, "lastfm_key", self.builder.get_object('lastfm_btn'))
@@ -120,6 +122,7 @@
         self.__preferences["proxy"] = self.builder.get_object('prefs_proxy').get_text()
         self.__preferences["notify"] = self.builder.get_object('checkbutton_notify').get_active()
         self.__preferences["enable_screensaverpause"] = self.builder.get_object('checkbutton_screensaverpause').get_active()
+        self.__preferences["enable_disablescreensaver"] = self.builder.get_object('checkbutton_disablescreensaver').get_active()
         self.__preferences["show_icon"] = self.builder.get_object('checkbutton_icon').get_active()
         
         self.save()

=== added file 'pithos/plugins/disable_screensaver.py'
--- pithos/plugins/disable_screensaver.py	1970-01-01 00:00:00 +0000
+++ pithos/plugins/disable_screensaver.py	2010-10-27 00:42:57 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; -*-
+### BEGIN LICENSE
+# Copyright (C) 2010 Kevin Mehall <[e-mail]>
+#This program is free software: you can redistribute it and/or modify it 
+#under the terms of the GNU General Public License version 3, as published 
+#by the Free Software Foundation.
+#
+#This program is distributed in the hope that it will be useful, but 
+#WITHOUT ANY WARRANTY; without even the implied warranties of 
+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#PURPOSE.  See the GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License along 
+#with this program.  If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+from pithos.plugin import PithosPlugin
+import dbus
+import logging
+
+
+class DisableScreenSaverPlugin(PithosPlugin):
+    preference = 'enable_disablescreensaver'
+    
+    def bind_session_bus(self):
+        try:
+            self.session_bus = dbus.SessionBus()
+            self.screensaver = self.session_bus.get_object("org.gnome.ScreenSaver","/org/gnome/ScreenSaver")
+            logging.info("bus connected")
+            return True
+        except dbus.DBusException:
+            return False
+        
+    def on_enable(self):
+        self.bind_session_bus() or logging.error("Could not bind session bus")
+        self.state_callback_handle = self.window.connect("play-state-changed", self.play_state_changed)
+
+    def on_disable(self):
+        self.uninhibit_screensaver() or logging.error("Could not unhibit screensaver")
+        self.state_callback_handle = None
+
+    def inhibit_screensaver(self):
+        try:
+            self.cookie = self.screensaver.Inhibit('Pithos', 'Disabled by Pithos')
+            logging.info("Inhibiting screensaver")
+            return True
+        except dbus.DBusException:
+            return False
+
+    def uninhibit_screensaver(self):
+        try:
+            if hasattr(self, 'cookie'):
+                logging.info("Uninhibiting screensaver")
+                self.screensaver.UnInhibit(self.cookie)
+            return True
+        except dbus.DBusException:
+            return False
+
+    def play_state_changed(self, window, playing):
+        """ inhibit screensaver on play, uninhibit on pause """
+        if playing:
+            self.inhibit_screensaver() or logging.error("Could not connect events")
+        if not playing:
+            self.uninhibit_screensaver() or logging.error("Could not unhibit screensaver")