Changeset 1891

Timestamp:

17/11/08 22:34:29 (8 weeks ago)

Author:

duncan

svm:headrev:

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

Message:

Corrected the name of initEncodingJob

Location:

freevo/src

Files:

• helpers/encodingserver.py (modified) (1 diff)
• helpers/recordserver.py (modified) (1 diff)
• video/encodingclient.py (modified) (1 diff)
• video/plugins/dvdbackup.py (modified) (1 diff)
• video/plugins/reencode-old.py (modified) (1 diff)
• video/plugins/reencode.py (modified) (1 diff)
• www/htdocs/encoding_web.rpy (modified) (1 diff)

freevo/src/helpers/encodingserver.py

@@ -117 +117 @@
         #safety checks
         if not (source or output):
-            return (False, '%s.initEncodeJob: no source or output given' % (self.__class__,))
+            return (False, '%s.initEncodingJob: no source or output given' % (self.__class__,))
 
         # generate a 'random' idnr based on the time in p2.3, int() can return long

freevo/src/helpers/recordserver.py

@@ -1363 +1363 @@
                         multipass = config.REENCODE_NUMPASSES > 1
 
-                        (status, resp) = self.es.initEncodeJob(source, output, prog.title, None,
+                        (status, resp) = self.es.initEncodingJob(source, output, prog.title, None,
                             config.TV_REENCODE_REMOVE_SOURCE)
-                        _debug_('initEncodeJob:status:%s resp:%s' % (status, resp))
+                        _debug_('initEncodingJob:status:%s resp:%s' % (status, resp))
 
                         idnr = resp

freevo/src/video/encodingclient.py

@@ -403 +403 @@
 
     elif function == "runtest":
-        #(status, idnr) = initEncodeJob('/storage/video/dvd/BRUCE_ALMIGHTY/', 'bam.avi', 'lala', 17)
-        (status, idnr) = initEncodeJob('/dev/cdrom', '/home/rdc/fogu.avi', 'lala', 1)
+        #(status, idnr) = initEncodingJob('/storage/video/dvd/BRUCE_ALMIGHTY/', 'bam.avi', 'lala', 17)
+        (status, idnr) = initEncodingJob('/dev/cdrom', '/home/rdc/fogu.avi', 'lala', 1)
         print "Job has idnr num: %s" % idnr
         print idnr

freevo/src/video/plugins/dvdbackup.py

@@ -130 +130 @@
         box.show()
         try:
-            (status, resp) = self.server.initEncodeJob(self.dvdsource, fname, self.item.parent.name, self.title)
+            (status, resp) = self.server.initEncodingJob(self.dvdsource, fname, self.item.parent.name, self.title)
             if not status:
                 self.error(resp)

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

@@ -101 +101 @@
         box.show()
 
-        (status, resp) = self.server.initEncodeJob(self.source, self.filename, self.title)
-        print 'initEncodeJob:status:', status, ' resp:', resp
+        (status, resp) = self.server.initEncodingJob(self.source, self.filename, self.title)
+        print 'initEncodingJob:status:', status, ' resp:', resp
 
         box.destroy()

freevo/src/video/plugins/reencode.py

@@ -420 +420 @@
         box = PopupBox(text=_('Please wait, analyzing video...'))
         box.show()
-        (status, resp) = self.server.initEncodeJob(self.source, self.output, self.title)
-        _debug_('initEncodeJob:status:%s resp:%s' % (status, resp))
+        (status, resp) = self.server.initEncodingJob(self.source, self.output, self.title)
+        _debug_('initEncodingJob:status:%s resp:%s' % (status, resp))
         box.destroy()
         if not status:

freevo/src/www/htdocs/encoding_web.rpy

@@ -260 +260 @@
 
         #we are going to create a job and send it to the encoding server, this can take some time while analyzing
-        (status, resp) = self.server.initEncodeJob(self.source, self.output, self.title)
-        _debug_('initEncodeJob:status:%s resp:%s' % (status, resp))
-
-        if not status:
-            return 'initEncodeJob:status:%s resp:%s' % (status, resp)
+        (status, resp) = self.server.initEncodingJob(self.source, self.output, self.title)
+        _debug_('initEncodingJob:status:%s resp:%s' % (status, resp))
+
+        if not status:
+            return 'initEncodingJob:status:%s resp:%s' % (status, resp)
 
         idnr = resp