Changeset 511

Timestamp:

12/01/06 22:07:53 (2 years ago)

Author:

nicfit

Message:

remote control support using dbus

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/etc/mesk-0.3.0.ebuild (added)
• trunk/scripts/mesk-remote.in (deleted)
• trunk/src/dbus_service.py (modified) (2 diffs)
• trunk/src/main.py (modified) (9 diffs)
• trunk/src/main_window.py (modified) (6 diffs)

trunk/configure.ac

@@ -18 +18 @@
-AC_PREREQ([2.57])
-
-2.99
+3.0
-PACKAGE_CODENAME="The Sword"
-AC_SUBST([PACKAGE_CODENAME])

trunk/src/dbus_service.py

@@ -20 +20 @@
-import gobject
-import dbus, dbus.service, dbus.glib
+import mesk
-
-OBJ_PATH  = '/net/nicfit/mesk/MeskApp'
@@ -28 +29 @@
-    '''A dbus service object for Mesk'''
-
-
-
+
+
+
+
-
-    @dbus.service.method(INTERFACE)
-hello_world
-return "hello world"
+stop
+self._audio_control.stop()
-
+    @dbus.service.method(INTERFACE)
+    def play(self):
+        self._audio_control.play()
+
+    @dbus.service.method(INTERFACE)
+    def pause(self):
+        self._audio_control.pause()
+
+    @dbus.service.method(INTERFACE)
+    def pause(self):
+        self._audio_control.pause()
+
+    @dbus.service.method(INTERFACE)
+    def prev(self):
+        self._audio_control.prev()
+
+    @dbus.service.method(INTERFACE)
+    def next(self):
+        self._audio_control.next()
+

trunk/src/main.py

@@ -27 +27 @@
-        '''Constructor'''
-
-XXX 
+
-        # at this point.
-        def handle_gst_option():
@@ -49 +49 @@
-                        handle_gst_option() # This will not return
-
+        gtk.window_set_auto_startup_notification(False)
+
+        # Parse command line
-        self.cmd_line = OptionParser()
-        (self.opts, self.args) = self.cmd_line.parse_args()
-
+
+
+
-
-    def run(self):
+        import mesk
+
+        remote_status = 0
+        # Handle remote control options
+        for arg in sys.argv[1:]:
+            if arg in self.cmd_line.remote_control_opts:
+                try:
+                    remote_status |= self._remote_control(arg)
+                except Exception, ex:
+                    mesk.log.error('Dbus error: %s' % str(ex))
+                    return 5
+
+        if self.remote_control:
+            return remote_status
+
+        # Init GUI
-        self._init()
-
-        # Main window
-        from main_window import MainWindow
-
+self.profile
-        self.main_window.show()
-        gtk.gdk.notify_startup_complete()
@@ -75 +96 @@
-        # Shutdown
-        mesk.config.save(self.config_file)
-        mesk.plugin.shutdown()
-        return 0
-
-    def _init(self):
-        import mesk
-        # Load configuration
-
-
+
-            self.config_file = '%s/config.%s' % (mesk.MESK_DIR,
-                                                 self.opts.profile)
@@ -102 +120 @@
-                sys.exit(1)
-            mesk.log.set_logging_level(lvl)
+
-        if self.opts.profile:
-            mesk.log.verbose('Using profile: %s' % self.opts.profile)
@@ -114 +133 @@
-        mesk.config.set(mesk.CONFIG_MAIN, 'version', mesk.info.APP_VERSION)
-
-
+glade 
-        import gtk.glade
-        gtk.glade.bindtextdomain('mesk', mesk.i18n.DIR)
@@ -136 +155 @@
-        else:
-            mesk.log.debug('Enabling Gnome session management')
-
+"foo",# 
-                               mesk.info.APP_VERSION)
-            cli = gnome.ui.master_client()
@@ -149 +168 @@
-                cli.set_restart_command(len(argv), argv)
-
-        # Initialize Dbus, if possible
-        try:
-            import dbus, dbus.service
-        except ImportError:
-            self.DBUS_SUPPORT = False
-            self.mesk_dbus = None
-            mesk.log.warning("Not able to load DBus, support is disabled")
-        else:
-            import dbus_service
-            self.DBUS_SUPPORT = True
-            session_bus = dbus.SessionBus()
-            name = dbus.service.BusName(dbus_service.SERVICE, bus=session_bus)
-            self.mesk_dbus = dbus_service.MeskDbusService(name)
-            mesk.log.verbose("DBus support activated")
-
-        # Initialize plugin manager
-        import mesk.plugin
-        plugin_dir = mesk.config.get(mesk.CONFIG_MAIN, 'plugins_dir')
-        plugin_mgr = mesk.plugin.PluginMgr(plugin_dir)
-        mesk.plugin.set_manager(plugin_mgr)
-
-    def _migrate_config(self, old_version, my_version):
-        import mesk.log, mesk.playlist
@@ -203 +201 @@
-                    mesk.config.remove_section(sect)
-                mesk.config.set(mesk.CONFIG_MAIN, 'playlists', 'Playlist')
+
+    def _remote_control(self, cmd):
+        if self.remote_control is None:
+            import dbus
+            import dbus_service  # This is a local module
+            session_bus = dbus.SessionBus()
+            self.remote_control = \
+                dbus.Interface(session_bus.get_object(dbus_service.SERVICE,
+                                                      dbus_service.OBJ_PATH),
+                               dbus_service.INTERFACE)
+
+        if cmd in ['--stop']:
+            self.remote_control.stop()
+        elif cmd in ['--play']:
+            self.remote_control.play()
+        elif cmd in ['--pause']:
+            self.remote_control.pause()
+        elif cmd in ['--prev']:
+            self.remote_control.prev()
+        elif cmd in ['--next']:
+            self.remote_control.next()
+        else:
+            assert(False) # This should not happen
+            return -1
+
+        return 0
-
-import optparse
@@ -219 +243 @@
-                        help=_('Start with profile NAME.'),
-                        metavar='NAME', default='')
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Developer options
-
+
+
+
+
+
+
-        debug_opts.add_option('--debug', action='store_true',
-                              dest='debug', default=False,

trunk/src/main_window.py

@@ -23 +23 @@
-
-import mesk
+import mesk.plugin
-import mesk.gtk_utils
-import mesk.window
@@ -42 +43 @@
-    DND_TARGETS = [('MESK_TAB', 0, 81)]
-
-
+
+
-        self._is_compact = False
-        self._controls = []
@@ -116 +118 @@
-
-        self.tips_window = None
+
+        # Initialize Dbus, if possible
+        try:
+            import dbus, dbus.service
+        except ImportError:
+            self.DBUS_SUPPORT = False
+            self.mesk_dbus = None
+            mesk.log.warning("Not able to load DBus, support is disabled")
+        else:
+            import dbus_service
+            self.DBUS_SUPPORT = True
+            session_bus = dbus.SessionBus()
+            name = dbus.service.BusName(dbus_service.SERVICE, bus=session_bus)
+            self.mesk_dbus = dbus_service.MeskDbusService(name, self.profile,
+                                                          self._audio_control)
+            mesk.log.verbose("DBus support activated")
+
+        # Initialize plugin manager
+        plugin_dir = mesk.config.get(mesk.CONFIG_MAIN, 'plugins_dir')
+        plugin_mgr = mesk.plugin.PluginMgr(plugin_dir)
+        mesk.plugin.set_manager(plugin_mgr)
-
-    def add_playlist_control(self, name, set_active=False):
@@ -301 +324 @@
-            self._pref_window.window.destroy()
-
+        # Shutdown plugins
+        mesk.plugin.shutdown()
+
-        # Shutdown all controls
-        playlists = []
@@ -341 +367 @@
-        x = mesk.config.getint(mesk.CONFIG_UI, 'main_window_pos_x')
-        y = mesk.config.getint(mesk.CONFIG_UI, 'main_window_pos_y')
- 
+
-        self.window.move(x, y)
-
-        width = mesk.config.getint(mesk.CONFIG_UI, 'main_window_width')
-        height = mesk.config.getint(mesk.CONFIG_UI, 'main_window_height')
- 
+
-        self.window.resize(width, height)
-
@@ -352 +378 @@
-        '''Overridden from mesk.window.Window'''
-        if mesk.config.getboolean(mesk.CONFIG_UI, 'window_hide_on_close'):
+            self._save_window_attrs()
-            self.window.hide()
-            return True