Changeset 1884

Timestamp:

16/11/08 18:44:29 (8 weeks ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11166

Message:

Replaced the Twisted RPC calls with the kaa rpc

Location:

freevo

Files:

• freevo_config.py (modified) (3 diffs)
• src/encodingcore.py (modified) (3 diffs)
• src/helpers/encodingserver.py (modified) (9 diffs)
• src/helpers/recordserver.py (modified) (3 diffs)
• src/plugins/idlebar/encoding.py (modified) (6 diffs)
• src/plugins/idlebar/transcode.py (modified) (12 diffs)
• src/video/encodingclient.py (modified) (6 diffs)
• src/video/plugins/dvdbackup.py (modified) (11 diffs)
• src/video/plugins/reencode.py (modified) (10 diffs)
• src/www/htdocs/encoding_web.rpy (modified) (21 diffs)

freevo/freevo_config.py

@@ -381 +381 @@
     (5.26,
      """ Added VIDEO_AUTOJOIN_REGEX to allow joining video files based on a regular expression
-     Renamed USE_NETWORK to SYS_USE_NETWORK 
+     Renamed USE_NETWORK to SYS_USE_NETWORK
      Renamed USE_SDL_KEYBOARD to SYS_USE_KEYBOARD
      Added SYS_USE_JOYSTICK to allow a joystick device to be used
      Added DEBUG_BENCHMARKING can be used to time and trace function calls
      Added DEBUG_BENCHMARKCALL can be used to print the arguments and results of function calls
-     Removed MPLAYER_AUDIO_CACHE_KB, MPLAYER_AUDIO_CACHE_MIN_PERCENT and MPLAYER_AUDIO_NETWORK_OPTS, it broke detach 
+     Removed MPLAYER_AUDIO_CACHE_KB, MPLAYER_AUDIO_CACHE_MIN_PERCENT and MPLAYER_AUDIO_NETWORK_OPTS, it broke detach
      """),
 ]
@@ -2094 +2094 @@
 WWW_PAGES = [
     #   Label                      Title                                  Page
-    (_('Home'),                 _('Home'),                               'index.rpy'), 
-    (_('TV Guide'),             _('View TV Listings'),                   'guide.rpy'), 
-    (_('Scheduled Recordings'), _('View Scheduled Recordings'),          'record.rpy'), 
-    (_('Favorites'),            _('View Favorites'),                     'favorites.rpy'), 
-    (_('Media Library'),        _('View Media Library'),                 'library.rpy'), 
-    (_('Manual Recording'),     _('Schedule a Manual Recording'),        'manualrecord.rpy'), 
-    (_('Search'),               _('Advanced Search Page'),               'search.rpy'), 
+    (_('Home'),                 _('Home'),                               'index.rpy'),
+    (_('TV Guide'),             _('View TV Listings'),                   'guide.rpy'),
+    (_('Scheduled Recordings'), _('View Scheduled Recordings'),          'record.rpy'),
+    (_('Favorites'),            _('View Favorites'),                     'favorites.rpy'),
+    (_('Media Library'),        _('View Media Library'),                 'library.rpy'),
+    (_('Manual Recording'),     _('Schedule a Manual Recording'),        'manualrecord.rpy'),
+    (_('Search'),               _('Advanced Search Page'),               'search.rpy'),
     (_('Help'),                 _('View Online Help and Documentation'), 'help/')
 ]
@@ -2148 +2148 @@
 ENCODINGSERVER_GID = 0
 
+
 ENCODINGSERVER_IP   = 'localhost'
-ENCODINGSERVER_PORT = 6666
+ENCODINGSERVER_PORT = 18002
+ENCODINGSERVER_SECRET = 'secret2'
 
 # ======================================================================

freevo/src/encodingcore.py

@@ -279 +279 @@
         start=0
         if timeslice[0]:
-            self.timeslice_mencoder += [ '-ss', str(timeslice[0])]
+            self.timeslice_mencoder += ['-ss', str(timeslice[0])]
             start = timeslice[0]
         if timeslice[1]:
@@ -309 +309 @@
         _debug_('setVideoCodec(self, vcodec=%s, tgtsize=%s, multipass=%s, vbitrate=%s)' % \
             (vcodec, tgtsize, multipass, vbitrate))
-        #safety checks first
         if vcodec not in self.encodingopts.getVideoCodecList():
-            return 'Unknown video codec'
+            return 'Unknown video codec %r' % vcodec
 
         self.vcodec = vcodec
@@ -325 +324 @@
     def setAudioCodec(self, acodec, abrate=128):
         """Set audio codec & bitrate"""
-        #safety first
         if acodec not in self.encodingopts.getAudioCodecList():
-            return 'Unknown audio codec'
+            return 'Unknown audio codec %r' % acodec
 
         self.acodec = acodec

freevo/src/helpers/encodingserver.py

@@ -28 +28 @@
 
 import sys, string, random, time, os, re, pwd, stat, tempfile
+
+import kaa
+import kaa.rpc
 import config
 from util import vfs
@@ -47 +50 @@
         print e
 
-from twisted.web import xmlrpc, server
-from twisted.internet import reactor
-from util.marmalade import jellyToXML, unjellyFromXML
 import time, random, sys, os
 import logging
@@ -56 +56 @@
 from encodingcore import EncodingJob, EncodingQueue, EncodingOptions
 
-#some data
 __author__ = 'den_RDC (rdc@kokosnoot.com)'
 __revision__ = '$Rev$'
@@ -64 +63 @@
 DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or config.DEBUG
 
-jam = jellyToXML
-unjam = unjellyFromXML
-
-
-class EncodingServer(xmlrpc.XMLRPC):
+
+class EncodingServer:
     def __init__(self, debug=False, allowNone=False):
         """ Initialise the EncodingServer class """
         _debug_('EncodingServer.__init__(debug=%r, allowNone=%r)' % (debug, allowNone), 2)
-        try:
-            xmlrpc.XMLRPC.__init__(self, allowNone)
-        except TypeError:
-            xmlrpc.XMLRPC.__init__(self)
         self.debug = debug
         self.jobs = {}
@@ -83 +75 @@
 
 
-    def xmlrpc_echotest(self, blah):
-        """ Using Twisted check the connection """
-        _debug_('xmlrpc_echotest(blah=%r)' % (blah), 2)
-        return (True, 'EncodingServer::echotest: %s' % blah)
-
-
-    def xmlrpc_initEncodeJob(self, source, output, friendlyname='', chapter=None, rmsource=False):
-        """ Using Twisted initialise an encoding job """
-        _debug_('xmlrpc_initEncodeJob(source=%r, output=%r, friendlyname=%r, chapter=%r, rmsource=%s)' % \
-            (source, output, friendlyname, chapter, rmsource), 1)
+    @kaa.rpc.expose('ping')
+    def _pingtest(self):
+        _debug_('pingtest()', 2)
+        return True
+
+    @kaa.rpc.expose('getContainerCAP')
+    def _getContainerCAP(self):
+        """ get the container capabilities """
+        return (True, EncodingOptions.getContainerList(self.encodingopts))
+
+
+    @kaa.rpc.expose('getVideoCodecCAP')
+    def _getVideoCodecCAP(self):
+        """ get the video capabilities """
+        return (True, EncodingOptions.getVideoCodecList(self.encodingopts))
+
+
+    @kaa.rpc.expose('getAudioCodecCAP')
+    def _getAudioCodecCAP(self):
+        """ get the audio capabilities """
+        return (True, EncodingOptions.getAudioCodecList(self.encodingopts))
+
+
+    @kaa.rpc.expose('getVideoFiltersCAP')
+    def _getVideoFiltersCAP(self):
+        """ get the video filter capabilities """
+        return (True, EncodingOptions.getVideoFiltersList(self.encodingopts))
+
+
+    @kaa.rpc.expose('initEncodingJob')
+    def _initEncodingJob(self, source, output, friendlyname='', chapter=None, rmsource=False):
+        """
+        Initialise an encoding job
+        @param source: source file to encode
+        @param output: output file to encode
+        @param friendlyname: encoding job title
+        @param chapter: chapter number to encode
+        @param rmsource: remove the source after successful encoding
+        @returns: tuple of success status and job identifier
+        """
         #safety checks
         if not (source or output):
-            return (False, 'EncodingServer::initEncodeJob:  no source or output given')
+            return (False, '%s.initEncodeJob: no source or output given' % (self.__class__,))
 
         # generate a 'random' idnr based on the time in p2.3, int() can return long
@@ -109 +131 @@
         if self.jobs[idnr].finishedanalyze and self.jobs[idnr].failed:
             _debug_('Analysis failed')
-            return (False,10)
+            return (False, 10)
 
         _debug_('Initialized job %s (idnr: %s)' % (friendlyname, idnr), DINFO)
-
         return (True, idnr)
 
 
-    def xmlrpc_getContainerCAP(self):
-        """ Using Twisted get the container capabilities """
-        _debug_('xmlrpc_getContainerCAP()' , 2)
-        return EncodingOptions.getContainerList( self.encodingopts)
-
-
-    def xmlrpc_setContainer(self, idnr, container):
-        """ Using Twisted set the container """
-        _debug_('xmlrpc_setContainer(idnr=%r, container=%r)' % (idnr, container), 2)
+    @kaa.rpc.expose('setContainer')
+    def _setContainer(self, idnr, container):
+        """ set the container """
         status = self.jobs[idnr].setContainer(container)
-
         if not status:
             return (True, 'EncodingServer::setContainer: OK')
-        else:
-            return (False, 'EncodingServer::setContainer: %s' % status)
-
-
-    def xmlrpc_setTimeslice(self,idnr,timeslice):
-        _debug_('xmlrpc_setTimeslice(self, %s, %s)' % (idnr, timeslice), 3)
+        return (False, 'EncodingServer::setContainer: %s' % status)
+
+
+    @kaa.rpc.expose('setVideoCodec')
+    def _setVideoCodec(self, idnr, vcodec, tgtsize, multipass=False, vbitrate=0, altprofile=None):
+        """ set the video codec """
+        _debug_('_setVideoCodec(idnr=%r, vcodec=%r, tgtsize=%r, multipass=%r, vbitrate==%r)' % \
+            (idnr, vcodec, tgtsize, multipass, vbitrate), 1)
+        if not (vcodec or (tgtsize and vbitrate)):
+            return (False, 'EncodingServer::setVideoCodec: no codec or target size given')
+
+        status = self.jobs[idnr].setVideoCodec(vcodec, tgtsize, multipass, vbitrate, altprofile)
+        if not status:
+            return (True, 'EncodingServer::setVideoCodec: OK')
+        return (False, 'EncodingServer::setVideoCodec: %s' % status)
+
+
+    @kaa.rpc.expose('setAudioCodec')
+    def _setAudioCodec(self, idnr, acodec, abrate):
+        """ set the audio codec """
+        _debug_('_setAudioCodec(idnr=%r, acodec=%r, abrate=%r)' % (idnr, acodec, abrate), 2)
+        if not (acodec or abrate):
+            return (False, 'EncodingServer::setAudioCodec: no codec or bitrate given')
+
+        status = self.jobs[idnr].setAudioCodec(acodec, abrate)
+        if not status:
+            return (True, 'EncodingServer::setAudioCodec: OK')
+        return (False, 'EncodingServer::setAudioCodec: %s' % status)
+
+
+    @kaa.rpc.expose('setVideoFilters')
+    def _setVideoFilters(self, idnr, filters):
+        """ set the video filter list """
+        if not filters:
+            return (False, 'EncodingServer::setVideoFilters: no filter given')
+
+        status = self.jobs[idnr].setVideoFilters(filters)
+        if not status:
+            return (True, 'EncodingServer::setVideoFilters: OK')
+        return (False, 'EncodingServer::setVideoFilters: %s' % status)
+
+
+    @kaa.rpc.expose('setTimeslice')
+    def _setTimeslice(self,idnr,timeslice):
+        _debug_('_setTimeslice(self, %s, %s)' % (idnr, timeslice), 3)
         status = self.jobs[idnr].setTimeslice(timeslice)
         if not status:
             return (True, 'EncodingServer::setTimeslice: OK')
-        else:
-            return (False, 'EncodingServer::setTimeslice: %s' % status)
-
-
-    def xmlrpc_getVideoCodecCAP(self):
-        """ Using Twisted get the video capabilities """
-        _debug_('xmlrpc_getVideoCodecCAP()', 2)
-        return EncodingOptions.getVideoCodecList(self.encodingopts)
-
-
-    def xmlrpc_setVideoCodec(self, idnr, vcodec, tgtsize, multipass=False, vbitrate=0, altprofile=None):
-        """ Using Twisted set the video codec """
-        _debug_('xmlrpc_setVideoCodec(idnr=%r, vcodec=%r, tgtsize=%r, multipass=%r, vbitrate==%r)' % \
-            (idnr, vcodec, tgtsize, multipass, vbitrate), 1)
-        #safety checks
-        if not (vcodec or (tgtsize and vbitrate)):
-            return (False, 'EncodingServer::setVideoCodec:  no codec or target size given')
-
-        status = self.jobs[idnr].setVideoCodec(vcodec, tgtsize, multipass, vbitrate, altprofile)
-
-        if not status:
-            return (True, 'EncodingServer::setVideoCodec: OK')
-        else:
-            return (False, 'EncodingServer::setVideoCodec: %s' % status)
-
-
-    def xmlrpc_getAudioCodecCAP(self):
-        """ Using Twisted get the audio capabilities """
-        _debug_('xmlrpc_getAudioCodecCAP()', 2)
-        return EncodingOptions.getAudioCodecList(self.encodingopts)
-
-
-    def xmlrpc_setAudioCodec(self, idnr, acodec, abrate):
-        """ Using Twisted set the audio codec """
-        _debug_('xmlrpc_setAudioCodec(idnr=%r, acodec=%r, abrate=%r)' % (idnr, acodec, abrate), 2)
-        #safety checks
-        if not (acodec or abrate):
-            return (False, 'EncodingServer::setAudioCodec:  no codec or bitrate given')
-
-        status = self.jobs[idnr].setAudioCodec(acodec, abrate)
-
-        if not status:
-            return (True, 'EncodingServer::setAudioCodec: OK')
-        else:
-            return (False, 'EncodingServer::setAudioCodec: %s' % status)
-
-
-    def xmlrpc_setVideoRes(self, idnr, videores ):
-        """ Using Twisted set the video resolution """
-        _debug_('xmlrpc_setAudioCodec(idnr=%r, videores=%r)' % (idnr, videores ), 2)
-        #safety checks
+        return (False, 'EncodingServer::setTimeslice: %s' % status)
+
+
+    @kaa.rpc.expose('setVideoRes')
+    def _setVideoRes(self, idnr, videores ):
+        """ set the video resolution """
+        _debug_('_setAudioCodec(idnr=%r, videores=%r)' % (idnr, videores ), 2)
         if not (videores):
-            return (False, 'EncodingServer::setVideoRes:  no video resolution given')
+            return (False, 'EncodingServer::setVideoRes: no video resolution given')
 
         status = self.jobs[idnr].setVideoRes( videores)
-
         if not status:
             return (True, 'EncodingServer::setVideoRes: OK')
-        else:
-            return (False, 'EncodingServer::setVideoRes: %s' % status)
-
-
-    def xmlrpc_setNumThreads(self, idnr, numthreads ):
-        """ Using Twisted set the number of threads """
-        _debug_('xmlrpc_setAudioCodec(idnr=%r, numthreads=%r)' % (idnr, numthreads ), 2)
+        return (False, 'EncodingServer::setVideoRes: %s' % status)
+
+
+    @kaa.rpc.expose('setNumThreads')
+    def _setNumThreads(self, idnr, numthreads ):
+        """ set the number of threads """
+        _debug_('_setAudioCodec(idnr=%r, numthreads=%r)' % (idnr, numthreads ), 2)
         #safety checks
         if not (numthreads):
-            return (False, 'EncodingServer::setNumThreads:  no number given')
+            return (False, 'EncodingServer::setNumThreads: no number given')
 
         status = self.jobs[idnr].setNumThreads( numthreads)
-
         if not status:
             return (True, 'EncodingServer::setNumThreads: OK')
-        else:
-            return (False, 'EncodingServer::setNumThreads: %s' % status)
-
-
-    def xmlrpc_getVideoFiltersCAP(self):
-        """ Using Twisted get the video filter capabilities """
-        _debug_('xmlrpc_getVideoFiltersCAP()', 2)
-        return EncodingOptions.getVideoFiltersList(self.encodingopts)
-
-
-    def xmlrpc_setVideoFilters(self, idnr, filters):
-        """ Using Twisted set the video filter list """
-        _debug_('xmlrpc_setVideoFilters(idnr, filters)', 2)
-        #safety checks
-        if not filters:
-            return (False, 'EncodingServer::setAudioCodec:  no codec or bitrate given')
-
-        status = self.jobs[idnr].setVideoFilters(unjam(filters))
-
-        if not status:
-            return (True, 'EncodingServer::setVideoFilters: OK')
-        else:
-            return (False, 'EncodingServer::setVideoFilters: %s' % status)
-
-
-    def xmlrpc_queueIt(self, idnr, now=False):
-        """ Using Twisted queue a job to run """
-        _debug_('xmlrpc_queueIt(idnr=%r, now=%r)' % (idnr, now), 2)
+        return (False, 'EncodingServer::setNumThreads: %s' % status)
+
+
+    @kaa.rpc.expose('listJobs')
+    def _listJobs(self):
+        """ List the current jobs """
+        _debug_('_listJobs()', 2)
+        jlist = self.queue.listJobs()
+        return (True, jlist)
+
+
+    @kaa.rpc.expose('queueIt')
+    def _queueIt(self, idnr, now=False):
+        """ queue a job to run """
+        _debug_('_queueIt(idnr=%r, now=%r)' % (idnr, now), 2)
         self.queue.addEncodingJob(self.jobs[idnr])
         del self.jobs[idnr]
@@ -247 +241 @@
 
 
-    def xmlrpc_getProgress(self):
-        """ Using Twisted get the progress status of the current job """
-        _debug_('xmlrpc_getProgress()', 2)
+    @kaa.rpc.expose('startQueue')
+    def _startQueue(self):
+        """ start the job queue """
+        _debug_('_startQueue()', 2)
+        self.queue.startQueue()
+        return (True, 'EncodingServer::startqueue: OK')
+
+
+    @kaa.rpc.expose('getProgress')
+    def _getProgress(self):
+        """ get the progress status of the current job """
+        _debug_('_getProgress()', 2)
         prog = self.queue.getProgress()
         if type(prog) is str:
             return (False, 'EncodingServer::getProgress: %s' % prog)
-        return (True, jam(prog))
-
-
-    def xmlrpc_startQueue(self):
-        """ Using Twisted start the job queue """
-        _debug_('xmlrpc_startQueue()', 2)
-        self.queue.startQueue()
-        return (True, 'EncodingServer::startqueue: OK')
-
-
-    def xmlrpc_listJobs(self):
-        """ List the current jobs """
-        _debug_('xmlrpc_listJobs()', 2)
-        jlist = self.queue.listJobs()
-        return (True, jam(jlist))
+        return (True, prog)
 
 
@@ -274 +263 @@
     _debug_('main()', 2)
     global DEBUG
-    tmppath = tempfile.mkdtemp(prefix = 'encodeserver')
+    tmppath = tempfile.mkdtemp(prefix = 'encodeserver-')
     os.chdir(tmppath)
 
@@ -283 +272 @@
         encodingcore.DEBUG = debug
     _debug_('main: DEBUG=%s' % DEBUG, DINFO)
-    es = EncodingServer(debug=debug, allowNone=True)
-    reactor.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es))
-    reactor.run()
+    socket = ('', config.ENCODINGSERVER_PORT)
+    secret = config.ENCODINGSERVER_SECRET
+    _debug_('socket=%r, secret=%r' % (socket, secret))
+
+    encodingserver = EncodingServer(debug=debug, allowNone=True)
+    try:
+        rpc = kaa.rpc.Server(socket, secret)
+    except Exception:
+        raise
+
+    rpc.connect(encodingserver)
+
+    _debug_('kaa.main starting')
+    kaa.main.run()
+    _debug_('kaa.main finished')
 
 

freevo/src/helpers/recordserver.py

@@ -69 +69 @@
 from video.commdetectclient import connectionTest as commdetectConnectionTest
 
-from video.encodingclient import initEncodeJob
-from video.encodingclient import queueIt as queueEncodeJob
-from video.encodingclient import listJobs as listEncodeJobs
-from video.encodingclient import connectionTest as encodeConnectionTest
-from video.encodingclient import setContainer, setVideoCodec, setAudioCodec, setVideoRes, setNumThreads, setVideoFilters
+from video.encodingclient import EncodingClientActions
 
 import tv.record_types
@@ -143 +139 @@
         self.schedule = ScheduledRecordings()
         self.updateFavoritesSchedule()
+        self.es = EncodingClientActions()
 
 
@@ -1360 +1357 @@
                         _debug_('commdetect server not running', DINFO)
                 if config.TV_REENCODE:
-                    (result, response) = encodeConnectionTest('connection test')
+                    (result, response) = self.es.ping('connection test')
                     if result:
                         source = prog.filename
                         output = prog.filename
                         multipass = config.REENCODE_NUMPASSES > 1
-                        
-                        (status, resp) = initEncodeJob(source, output, prog.title, None, config.TV_REENCODE_REMOVE_SOURCE)
+
+                        (status, resp) = self.es.initEncodeJob(source, output, prog.title, None,
+                            config.TV_REENCODE_REMOVE_SOURCE)
                         _debug_('initEncodeJob:status:%s resp:%s' % (status, resp))
 
                         idnr = resp
 
-                        (status, resp) = setContainer(idnr, config.REENCODE_CONTAINER)
+                        (status, resp) = self.es.setContainer(idnr, config.REENCODE_CONTAINER)
                         _debug_('setContainer:status:%s resp:%s' % (status, resp))
 
-                        (status, resp) = setVideoCodec(idnr, config.REENCODE_VIDEOCODEC, 0, multipass,
+                        (status, resp) = self.es.setVideoCodec(idnr, config.REENCODE_VIDEOCODEC, 0, multipass,
                             config.REENCODE_VIDEOBITRATE, config.REENCODE_ALTPROFILE)
                         _debug_('setVideoCodec:status:%s resp:%s' % (status, resp))
 
-                        (status, resp) = setAudioCodec(idnr, config.REENCODE_AUDIOCODEC, config.REENCODE_AUDIOBITRATE)
+                        (status, resp) = self.es.setAudioCodec(idnr, config.REENCODE_AUDIOCODEC,
+                            config.REENCODE_AUDIOBITRATE)
                         _debug_('setAudioCodec:status:%s resp:%s' % (status, resp))
 
-                        (status, resp) = setNumThreads(idnr, config.REENCODE_NUMTHREADS)
+                        (status, resp) = self.es.setNumThreads(idnr, config.REENCODE_NUMTHREADS)
                         _debug_('setNumThreads:status:%s resp:%s' % (status, resp))
 
-                        (status, resp) = setVideoRes(idnr, config.REENCODE_RESOLUTION)
+                        (status, resp) = self.es.setVideoRes(idnr, config.REENCODE_RESOLUTION)
                         _debug_('setVideoRes:status:%s resp:%s' % (status, resp))
 
-                        (status, resp) = listEncodeJobs()
-                        _debug_('listEncodeJobs:status:%s resp:%s' % (status, resp))
-
-                        (status, resp) = queueEncodeJob(idnr, True)
-                        _debug_('queueEncodeJob:status:%s resp:%s' % (status, resp))
+                        (status, resp) = self.es.listJobs()
+                        _debug_('listJobs:status:%s resp:%s' % (status, resp))
+
+                        (status, resp) = self.es.queueIt(idnr, True)
+                        _debug_('queueIt:status:%s resp:%s' % (status, resp))
                     else:
                         _debug_('encoding server not running', DINFO)

freevo/src/plugins/idlebar/encoding.py

@@ -1 +1 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# encoding.py - IdleBarplugin for showing encoding status
+# IdleBarplugin for showing encoding status
 # -----------------------------------------------------------------------
 # $Id$
@@ -30 +30 @@
 
 # python modules
-import os, sys, pygame, xmlrpclib
+import os, sys, pygame
 import time
 
@@ -68 +68 @@
         self.lastpoll  = 0
         self.plugin_name = 'video.encodingstatus'
-        server_string  = 'http://%s:%s/' % \
-                        (config.ENCODINGSERVER_IP, config.ENCODINGSERVER_PORT)
-        self.server    = xmlrpclib.Server(server_string, allow_none=1)
+        self.server    = EncodingClientActions()
 
         self.skin      = skin.get_singleton()
@@ -103 +101 @@
 
 
-    def getprogress(self):
-        _debug_('getprogress(self)', 2)
-        """Get the progress & pass information of the job currently encoding.
-
-        This call returns False if no job is currently encoding (fx the queue is not active).
-        When the queue is active, this call returns a tuple of 4 values:
-            (friendlyname, status, perc, timerem)
-
-        friendlyname is the friendlyname you assigned to the encoding job
-        status is the current status of the encoding job, represented by an integer
-            0 - Not set (this job hasn't started encoding). Never used in this context
-            1 - Audio pass in progress
-            2 - First (analyzing) video pass (only used in multipass encoding)
-            3 - Final video pass
-            4 - Postmerge (not used atm). Final merging or similar processing in progress
-        perc is the percentage completed of the current pass
-        timerem is the estimated time remaining of the current pass, formatted as a
-            human-readable string.
-        """
-
-        try:
-            (status, response) = self.server.getProgress()
-        except:
-            return (False, 'EncodingClient: connection error')
-
-        return returnFromJelly(status, response)
-
-
-    def listjobs(self):
-        _debug_('listjobs(self)', 2)
-        """Get a list with all jobs in the encoding queue and their current state
-
-        Returns a list of tuples containing all the current queued jobs. When the queue is
-        empty, an empty list is returned.
-        Each job in the list is a tuple containing 3 values
-            (idnr, friendlyname, status)
-        These values have the same meaning as the corresponding values returned by the
-            getProgress call"""
-
-        try:
-            (status, response) = self.server.listJobs()
-        except:
-            return (False, 'EncodingClient: connection error')
-
-        return returnFromJelly(status, response)
-
-