Ticket #11704: animatedmenu.patch

.py

@@ -499 +499 @@
 
     frames=int(seconds * framespersecond)
     return frames
+#############################################################
+# Convert HH:MM:SS to seconds
+# http://stackoverflow.com/questions/6402812/how-to-convert-an-hmmss-time-string-to-seconds-in-python
+
+def to_seconds(timestr):
+    seconds = 0
+    for part in timestr.split(':') :
+       seconds = seconds * 60 + int(part)
+    return seconds
 
 #############################################################
 # Creates a short mpeg file from a jpeg image and an ac3 sound track
@@ -3225 +3234 @@
                 frames = int(secondsToFrames(menulength))
 
                 command = "mytharchivehelper -q -q --createthumbnail --infile  %s --thumblist '%s' --outfile %s --framecount %d" % (quoteCmdArg(inputfile), starttime, quoteCmdArg(outputfile), frames)
+                write(command)
                 result = runCommand(command)
                 if (result != 0):
                     write( "mytharchivehelper failed with code %d. Command = %s" % (result, command) )
@@ -3743 +3753 @@
         #Extract the thumbnails
         chapterlist=createVideoChapters(page,itemsperpage,getLengthOfVideo(page),True)
         chapterlist=string.split(chapterlist,",")
+        write("chapterlist: %s " % chapterlist)
 
         #now need to preprocess the menu to see if any preview videos are required
         #This must be done on an individual basis since we do the resize as the
@@ -3753 +3764 @@
 
         haspreview = False
 
-        previewsegment=int(getLengthOfVideo(page) / itemsperpage)
-        previewtime = 0
+#        previewsegment=int(getLengthOfVideo(page) / itemsperpage)
         previewchapter = 0
         previewx = []
         previewy = []
@@ -3763 +3773 @@
         previewmask = []
 
         while previewchapter < itemsperpage:
-            menuitem=menuitems[ previewchapter ]
+            menuitem = menuitems[ previewchapter ]
 
             #generate the preview if required (px=9999 means not required)
+            previewtime = to_seconds(chapterlist[ previewchapter ])
             px, py, pw, ph, maskimage = generateVideoPreview(page, previewchapter, menuitem, previewtime, menulength, previewfolder)
             previewx.append(px)
             previewy.append(py)
@@ -3777 +3788 @@
                 haspreview = True
 
             previewchapter+=1
-            previewtime+=previewsegment
 
         #Loop through all the items on this menu page
         chapter=0