Implemented hierarchy suggested by Martin S.

Implemented new BaseService constructors.
Moved LockdownClient to lockdown.pxi.
Implemented more of the afc interface.

1 files changed, 2 insertions, 7 deletions

diff --git a/cython/screenshotr.pxi b/cython/screenshotr.pxi
index 92d95b9..d3a896f 100644
--- a/cython/screenshotr.pxi
+++ b/cython/screenshotr.pxi
@@ -28,18 +28,13 @@ cdef class ScreenshotrError(BaseError):
         BaseError.__init__(self, *args, **kwargs)
 
 cdef class ScreenshotrClient(Base):
+    __service_name__ = "com.apple.mobile.screenshotr"
     cdef screenshotr_client_t _c_client
 
-    def __cinit__(self, iDevice device not None, LockdownClient lockdown=None, *args, **kwargs):
+    def __cinit__(self, iDevice device not None, int port, *args, **kwargs):
         cdef:
             iDevice dev = device
-            LockdownClient lckd
             screenshotr_error_t err
-        if lockdown is None:
-            lckd = LockdownClient(dev)
-        else:
-            lckd = lockdown
-        port = lckd.start_service("com.apple.mobile.screenshotr")
         err = screenshotr_client_new(dev._c_dev, port, &self._c_client)
         self.handle_error(err)