Changeset 1889

Timestamp:

16/11/08 19:01:50 (8 weeks ago)

Author:

duncan

svm:headrev:

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

Message:

Replaced the Twisted RPC calls with the kaa rpc

Files:

• freevo/src/video/plugins/reencode-old.py (modified) (11 diffs)

freevo/src/video/plugins/reencode-old.py

@@ -37 +37 @@
 import os
 import config
-from video.encodingclient import *
+from video.encodingclient import EncodingClientActions
 from gui.AlertBox import AlertBox
 from gui.PopupBox import PopupBox
@@ -53 +53 @@
         _debug_('reencode-old.PluginInterface.__init__(self)')
         plugin.ItemPlugin.__init__(self)
+        self.server = EncodingClientActions()
 
 
@@ -100 +101 @@
         box.show()
 
-        (status, resp) = initEncodeJob(self.source, self.filename, self.title)
+        (status, resp) = self.server.initEncodeJob(self.source, self.filename, self.title)
         print 'initEncodeJob:status:', status, ' resp:', resp
 
@@ -112 +113 @@
 
         #ask for possible containers and set the first one (should be avi), we will get a list
-        (status, resp) = getContainerCAP(idnr)
+        (status, resp) = self.server.getContainerCAP(idnr)
         print 'getContainerCAP:status:', status, ' resp:', resp
 
@@ -121 +122 @@
         container = resp[contnr]
 
-        (status, resp) = setContainer(idnr, container)
+        (status, resp) = self.server.setContainer(idnr, container)
         print 'setContainer:status:', status, ' resp:', resp
 
@@ -129 +130 @@
 
         #ask for possible videocodec and set the first one (should be mpeg4), we will get a list
-        (status, resp) = getVideoCodecCAP(idnr)
+        (status, resp) = self.server.getVideoCodecCAP(idnr)
         print 'getVideoCodecCAP:status:', status, ' resp:', resp
 
@@ -138 +139 @@
         vcodec = resp[vcodecnr]
 
-        (status, resp) = setVideoCodec(idnr, vcodec, tgtsize, mpass, vbitrate)
+        (status, resp) = self.server.setVideoCodec(idnr, vcodec, tgtsize, mpass, vbitrate)
         print 'setVideoCodec:status:', status, ' resp:', resp
 
@@ -148 +149 @@
         #Audiocodec call isn't necessary atm, it defaults to 128 kbit mp3, but this might change in the future
         #so we play safe
-        (status, resp) = getAudioCodecCAP(idnr)
+        (status, resp) = self.server.getAudioCodecCAP(idnr)
         print 'getAudioCodecCAP:status:', status, ' resp:', resp
 
@@ -157 +158 @@
         acodec = resp[audionr]
 
-        (status, resp) = setAudioCodec(idnr, acodec, 128)
+        (status, resp) = self.server.setAudioCodec(idnr, acodec, 128)
         print 'setAudioCodec:status:', status, ' resp:', resp
 
@@ -164 +165 @@
             return
 
-        (status, resp) = getVideoFiltersCAP(idnr)
+        (status, resp) = self.server.getVideoFiltersCAP(idnr)
         print 'getVideoFiltersCAP:status:', status, ' resp:', resp
 
@@ -172 +173 @@
 
         #vfilters=resp[vfilter]
-        #(status, resp) = setVideoFilters(idnr, vfilters)
+        #(status, resp) = self.server.setVideoFilters(idnr, vfilters)
         #print 'setVideoFilter:status:', status, ' resp:', resp
 
         #And finally, qeue and start the job
-        (status, resp) = queueIt(idnr, True)
+        (status, resp) = self.server.queueIt(idnr, True)
         print 'queueIt:status:', status, ' resp:', resp