]> git.parisson.com Git - telemeta.git/commitdiff
Update kdenlive session parsing against kdenlive 0.9.10
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 21 Feb 2019 15:28:09 +0000 (16:28 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 13 Mar 2019 14:54:37 +0000 (15:54 +0100)
37 files changed:
debian/rules [changed mode: 0755->0644]
example/sandbox/diag.sh [changed mode: 0755->0644]
example/sandbox/manage.py [changed mode: 0755->0644]
example/sandbox/update_schema.sh [changed mode: 0755->0644]
telemeta/static/telemeta/images/feed-icon-14x14.png [changed mode: 0755->0644]
telemeta/static/telemeta/images/feed-icon-28x28.png [changed mode: 0755->0644]
telemeta/static/telemeta/images/player_controlbg.png [changed mode: 0755->0644]
telemeta/util/kdenlive/auto_fade.py [changed mode: 0755->0644]
telemeta/util/kdenlive/auto_fade_batch.py [changed mode: 0755->0644]
telemeta/util/kdenlive/mlt_fix_threads.sh [changed mode: 0755->0644]
telemeta/util/kdenlive/mlt_process_batch.py [changed mode: 0755->0644]
telemeta/util/kdenlive/session.py
tools/dev/fix_svn_authors.sh [changed mode: 0755->0644]
tools/dev/make_doc.sh [changed mode: 0755->0644]
tools/dev/merge_master_all.sh [changed mode: 0755->0644]
tools/dev/merge_master_to.sh [changed mode: 0755->0644]
tools/dev/push.sh [changed mode: 0755->0644]
tools/dev/pypi.sh [changed mode: 0755->0644]
tools/dev/translate.sh [changed mode: 0755->0644]
tools/eztelemeta/datatypes/eztelemetaitem/eztelemetaitemtype.php [changed mode: 0755->0644]
tools/eztelemeta/design/standard/override/templates/embed/eztelemetaitem.tpl [changed mode: 0755->0644]
tools/eztelemeta/design/standard/override/templates/full/eztelemetaitem.tpl [changed mode: 0755->0644]
tools/eztelemeta/design/standard/templates/content/datatype/edit/eztelemetaitem.tpl [changed mode: 0755->0644]
tools/eztelemeta/design/standard/templates/content/datatype/view/eztelemetaitem.tpl [changed mode: 0755->0644]
tools/eztelemeta/doc/README.fr.in [changed mode: 0755->0644]
tools/eztelemeta/settings/override.ini.append [changed mode: 0755->0644]
tools/eztelemeta/translations/fre-FR/translation.ts [changed mode: 0755->0644]
tools/scripts/crem_checker.py [changed mode: 0755->0644]
tools/scripts/process-waveform-cgi.py [changed mode: 0755->0644]
tools/scripts/telemeta-backup.py [changed mode: 0755->0644]
tools/scripts/telemeta-crem-import-alt_ids.py [changed mode: 0755->0644]
tools/scripts/telemeta-crem-import-test.py [changed mode: 0755->0644]
tools/scripts/telemeta-crem-import.py [changed mode: 0755->0644]
tools/scripts/telemeta-media-link.py [changed mode: 0755->0644]
tools/scripts/transcode/create_thumbs.py [changed mode: 0755->0644]
tools/scripts/transcode/remux_fix_media.py [changed mode: 0755->0644]
tools/scripts/transcode/transcode.py [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 74eb425888c944c28da0b03a2ea93a006fde7759..d4ed3c63a4623a8206a0c77689e95f8cdb01cb0d 100644 (file)
@@ -65,7 +65,8 @@ class KDEnLiveSession(object):
         return sorted(self.entries(), key=lambda k: int(k['in']), reverse=False)
 
     def entries_video_seconds(self):
-        fps = float(self.profile()['frame_rate_num'])
+        fps = float(self.profile()['frame_rate_num'])/1000
+        #fps= 25
         list = []
         entries = self.video_entries()
         for i in range(0,len(entries)):
@@ -123,30 +124,28 @@ class KDEnLiveSession(object):
         entries = self.entries_video_seconds()
 
         for attr in self.session['children']:
-            if 'kdenlivedoc' in attr['name']:
-
+            if 'playlist' in attr['name']:
                 for att in attr['children']:
-                    if 'markers' in att['name'] and 'children' in att.keys():
-
-                        for at in att['children']:
-                            if 'marker' in at['name']:
-
-                                marker_time = float(at['attributes']['time'].replace(',','.'))
-                                id = at['attributes']['id']
-                                rel_time = 0
-
-                                for entry in entries:
-                                    if marker_time >= entry['in'] and marker_time <= entry['out'] and id == entry['id']:
-                                        if i == 0 and from_first_marker:
-                                            abs_time = entry['t']
-                                        rel_time = entry['t'] + (marker_time - entry['in']) - abs_time + offset
-                                        break
-
-                                at['attributes']['time'] = rel_time
-                                at['attributes']['session_timecode'] = time.strftime('%H:%M:%S', time.gmtime(rel_time))
-                                at['attributes']['comment'] = self.fix_text(at['attributes']['comment'])
-                                markers.append(at['attributes'])
-
-                            i += 1
+                    marker = {}
+                    if 'name' in att['attributes']:
+                        name = att['attributes']['name']
+                        if 'marker' in name:
+                            marker_time = float(name.split(':')[-1].replace(',','.').replace(' ', ''))
+                            id = name.split(':')[-2].split('.')[-1]
+                            rel_time = 0
+
+                            for entry in entries:
+                                if marker_time >= entry['in'] and marker_time <= entry['out'] and id == entry['id']:
+                                    if i == 0 and from_first_marker:
+                                        abs_time = entry['t']
+                                    rel_time = entry['t'] + (marker_time - entry['in']) - abs_time + offset
+                                    break
+
+                            marker['time'] = rel_time
+                            marker['session_timecode'] = time.strftime('%H:%M:%S', time.gmtime(rel_time))
+                            marker['comment'] = self.fix_text(att['cdata'])
+                            markers.append(marker)
+
+                        i += 1
         return markers
 
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)