Changeset 512

Timestamp:

12/01/06 23:05:56 (2 years ago)

Author:

nicfit

Message:

More dbus goodness

Files:

• trunk/src/audio_control.py (modified) (1 diff)
• trunk/src/dbus_service.py (modified) (1 diff)
• trunk/src/main.py (modified) (4 diffs)

trunk/src/audio_control.py

@@ -309 +309 @@
-    def set_volume(self, v):
-        '''Volume is value between 0.0 and 1.0'''
-
-
-
+
+
+
+
+
+
-        self._volume = v
-        self._gst_bin.set_property('volume', v)

trunk/src/dbus_service.py

@@ -58 +58 @@
-        self._audio_control.next()
-
+    @dbus.service.method(INTERFACE)
+    def get_state(self):
+        if self._audio_control.is_playing():
+            return 'playing'
+        elif self._audio_control.is_paused():
+            return 'paused'
+        else:
+            return 'stopped'
+
+    @dbus.service.method(INTERFACE)
+    def play_pause(self):
+        if self._audio_control.is_playing():
+            self._audio_control.pause()
+        else:
+            self._audio_control.play()
+
+    @dbus.service.method(INTERFACE)
+    def vol_up(self, n):
+        self._audio_control.set_volume(self._audio_control.get_volume() + n)
+
+    @dbus.service.method(INTERFACE)
+    def vol_down(self, n):
+        self._audio_control.set_volume(self._audio_control.get_volume() - n)
+

trunk/src/main.py

@@ -64 +64 @@
-        # Handle remote control options
-        for arg in sys.argv[1:]:
+            eq = arg.find('=')
+            if eq >= 0:
+                arg = arg[:eq]
-            if arg in self.cmd_line.remote_control_opts:
-                try:
@@ -69 +72 @@
-                except Exception, ex:
-                    mesk.log.error('Dbus error: %s' % str(ex))
-5
+2
-
-        if self.remote_control:
@@ -222 +225 @@
-        elif cmd in ['--next']:
-            self.remote_control.next()
+        elif cmd in ['--get-state']:
+            print self.remote_control.get_state()
+        elif cmd in ['--play-pause']:
+            self.remote_control.play_pause()
+        elif cmd in ['--vol-up', '--vol-down']:
+            if self.opts.vol_up:
+                self.remote_control.vol_up(self.opts.vol_up)
+            else:
+                self.remote_control.vol_down(self.opts.vol_down)
-        else:
-            assert(False) # This should not happen
@@ -255 +267 @@
-        rc_opts.add_option('--pause', action='store_true', dest='pause',
-                           default=False, help=_('Pauses playback'))
+        rc_opts.add_option('--play-pause', action='store_true',
+                           dest='play_pause',
+                           default=False, help=_('Pauses playback if currently '
+                                                 'playing, otherwise playback '
+                                                 'is started.'))
-        rc_opts.add_option('--prev', action='store_true', dest='prev',
-                           default=False, help=_('Previous track'))
-        rc_opts.add_option('--next', action='store_true', dest='next',
-                           default=False, help=_('Next track'))
+        rc_opts.add_option('--vol-up', action='store', dest='vol_up',
+                           type=float, default=0, metavar='N',
+                           help=_('Increase the volume by N% '
+                                  '(0.0 <= n <= 1.0)'))
+        rc_opts.add_option('--vol-down', action='store', dest='vol_down',
+                           type=float, default=0, metavar='N',
+                           help=_('Decrease the volume by N%'
+                                  '(0.0 <= n <= 1.0)'))
+        rc_opts.add_option('--get-state', action='store_true', dest='get_state',
+                           default=False, help=_('Returns the current state of '
+                                                 'the audio player (stopped, '
+                                                 'playing, paused).'))
-        self.add_option_group(rc_opts)
-