Perform the merge

diff --git a/zukebox_server/src/services/playlist/zukebox_playlist.py b/zukebox_server/src/services/playlist/zukebox_playlist.py
index c243870..ff55464 100644 (file)
--- a/zukebox_server/src/services/playlist/zukebox_playlist.py
+++ b/zukebox_server/src/services/playlist/zukebox_playlist.py
@@ -1,16 +1,9 @@
 
-<<<<<<< services:zukebox_server/src/services/playlist/zukebox_playlist.py
 import os
-=======
-import dbus.service
-import os
-pjoin = os.path.join
->>>>>>> HEAD~0:zukebox_server/src/services/playlist/zukebox_playlist.py
 
 from brisa.core import log
 from brisa.upnp.device import Service, ServiceController
 
-<<<<<<< services:zukebox_server/src/services/playlist/zukebox_playlist.py
 pjoin = os.path.join
 
 class PlayListOutBoundExcept(Exception):
@@ -19,8 +12,6 @@ class PlayListOutBoundExcept(Exception):
 
 
 
-=======
->>>>>>> HEAD~0:zukebox_server/src/services/playlist/zukebox_playlist.py
 class PlayList(Service):
     """Class PlayList
     Introduction
@@ -30,7 +21,6 @@ class PlayList(Service):
 
     service_type = "urn:schemas-upnp-org:service:PlayList:1"
     service_name = "PlayList"
-<<<<<<< services:zukebox_server/src/services/playlist/zukebox_playlist.py
 
     def __init__(self, positions=10, xml_path):
         scpd_path = pjoin(xml_path, "zukebox-playlist-scpd.xml")
@@ -54,36 +44,12 @@ class PlayListControl(ServiceController):
         self.current_uri = None
         self.current_uri_metadata = None
 
-=======
-
-    def __init__(self, xml_path, positions=10):
-        scpd_path = pjoin(xml_path, "zukebox-playlist-scpd.xml")
-        Service.__init__(self, self.service_name, self.service_type, "", scpd_path, PlayListControl(positions, self.service_type))
-
-    def get_playlist(self):
-        return self.control_controller.get_playlist()
-
-class PlayListControl(ServiceController):
-
-    def __init__(self, positions, serv_type):
-        ServiceController.__init__(self, serv_type)
-        self.list = []
-        self.current = 0
-        self.prev = self.current
-        self.next = None
-        self.from_name = None
-        self.to_name = None
-        self.current_uri = None
-        self.current_uri_metadata = None
-
->>>>>>> HEAD~0:zukebox_server/src/services/playlist/zukebox_playlist.py
     def soap_IsLocked(self, *args, **kwargs):
         locked = True
         if not len(self.list) == self.positions:
             locked = False
         rt = {"Locked": locked}
         return {"IsLockedResponse": rt}
-<<<<<<< services:zukebox_server/src/services/playlist/zukebox_playlist.py
 
     def soap_IsAvailble(self, *args, **kwargs):
         availble = False
@@ -91,7 +57,6 @@ class PlayListControl(ServiceController):
             availble = True
         rt = {"Availble": availble}
         return {"IsAvailbleResponse": rt}
-=======
 
     def soap_IsAvailble(self, *args, **kwargs):
         availble = False
@@ -100,8 +65,6 @@ class PlayListControl(ServiceController):
         rt = {"Availble": availble}
         return {"IsAvailbleResponse": rt}
 
->>>>>>> HEAD~0:zukebox_server/src/services/playlist/zukebox_playlist.py
-
     def soap_Append(self, *args, **kwargs):
         """Put a object in the playlist
         """