X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=zukebox_server%2Fsrc%2Fserver%2Fzb_server.py;h=8fda553baca8caf7c5f2f6a2845d83792a3acabf;hb=3dd322c46c92da8c989c0157c23b9dcce71aaf74;hp=0dbed0cab58c612d6eaba0699b5eb87907c26d55;hpb=1695fb8f15d58bf430c23b2ab4cf3cfd5ec0d333;p=zukebox diff --git a/zukebox_server/src/server/zb_server.py b/zukebox_server/src/server/zb_server.py index 0dbed0c..8fda553 100644 --- a/zukebox_server/src/server/zb_server.py +++ b/zukebox_server/src/server/zb_server.py @@ -39,8 +39,8 @@ class ZukeBoxServer(ZIface, dbus.service.Object): """ DBUS_SERVICE_NAME = "br.org.zagaia" - DBUS_OBJ_PATH = "/br/org/zagaia/ZukeBox" - DBUS_IFACE = "br.org.zagaia.ZukeBox" + DBUS_OBJ_PATH = "/br/org/zagaia/zukebox/ZukeBoxServer" + DBUS_IFACE = "br.org.zagaia.zukebox.ZukeBoxServer" plugins_folder = config.get_parameter("zukebox_server", "plugins") plugins_module_path = "zukebox_server.plugins" @@ -71,7 +71,7 @@ class ZukeBoxServer(ZIface, dbus.service.Object): self.device = Device('urn:schemas-upnp-org:device:ZukeBoxServer:1', self.server_name, force_listen_url=self.listen_url, - manufacturer="Zagaia Laboratory and INdT Brazil", + manufacturer="Zagaia Laboratory", manufacturer_url=project_page, model_description=model_description, model_name=model_name, model_number=serial_no, @@ -93,7 +93,8 @@ class ZukeBoxServer(ZIface, dbus.service.Object): """Start the ZukeBox Server""" self._create_device() self._create_services() - self.cds.control_controller.plugin_manager.plugins_instances["audio_library"].do_scan() + #pm = self.cds.control_controller.plugin_manager + #pm.plugins_instances["audio_library"].do_scan() self.device.start() reactor.add_after_stop_func(self.device.stop) reactor.main()