Merged

[zukebox] / zukebox_server / src / server / zukebox_server.py

diff --git a/zukebox_server/src/server/zukebox_server.py b/zukebox_server/src/server/zukebox_server.py
index b302e6e..88c6249 100644 (file)
--- a/zukebox_server/src/server/zukebox_server.py
+++ b/zukebox_server/src/server/zukebox_server.py
@@ -2,6 +2,7 @@
 from ziface import ZIface
 import dbus.service
 import dbus.mainloop.glib
+import os
 
 from brisa.core.reactors import GLib2Reactor
 reactor = GLib2Reactor()
@@ -80,6 +81,8 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
         self.cds = ContentDirectory(self.plugins_folder,
                 self.plugins_module_path)
         cm = ConnectionManagerServer()
+        xml_path = os.path.join(os.path.dirname(__file__), "xml_descriptions")
+        playlist = PlayList(xml_path)
         self.device.add_service(self.cds)
         self.device.add_service(cm)