From 4a3a09f8a68761f654ed1403c50393b13b7b04d4 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 8 Feb 2013 02:40:37 +0100
Subject: [PATCH] rename, add kwargs

---
 telemeta/models/media.py          | 10 +++++-----
 telemeta/util/kdenlive/session.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 76346110..62580594 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -76,7 +76,7 @@ app_name = 'telemeta'
 def get_random_hash():
     hash = random.getrandbits(64)
     return "%016x" % hash
-    
+
 
 class MediaResource(ModelCore):
     "Base class of all media objects"
@@ -153,7 +153,7 @@ class MediaRelated(MediaResource):
         return 'image' in self.mime_type or is_url_image
 
     def save(self, force_insert=False, force_update=False, author=None):
-        super(MediaRelated, self).save(force_insert, force_update)        
+        super(MediaRelated, self).save(force_insert, force_update)
 
     def set_mime_type(self):
         if self.file:
@@ -491,11 +491,11 @@ class MediaItemRelated(MediaRelated):
     def save(self, force_insert=False, force_update=False, using=False):
         super(MediaItemRelated, self).save(force_insert, force_update)
 
-    def parse_markers(self):
+    def parse_markers(self, **kwargs):
         # Parse KDEnLive session
         if self.is_kdenlive_session():
             session = KDEnLiveSession(self.file.path)
-            markers = session.markers_relative()
+            markers = session.markers(**kwargs)
             for marker in markers:
                 m = MediaItemMarker(item=self.item)
                 m.public_id = get_random_hash()
@@ -612,7 +612,7 @@ class MediaItemMarker(MediaResource):
     title           = CharField(_('title'))
     date            = DateTimeField(_('date'), auto_now=True)
     description     = TextField(_('description'))
-    author          = ForeignKey(User, related_name="markers", verbose_name=_('author'), 
+    author          = ForeignKey(User, related_name="markers", verbose_name=_('author'),
                                  blank=True, null=True)
 
     class Meta(MetaCore):
diff --git a/telemeta/util/kdenlive/session.py b/telemeta/util/kdenlive/session.py
index 32fca7d4..6c6b1380 100644
--- a/telemeta/util/kdenlive/session.py
+++ b/telemeta/util/kdenlive/session.py
@@ -109,7 +109,7 @@ class KDEnLiveSession(object):
 		except:
 			return text
 
-	def markers_relative(self, offset=0, from_first_marker=False):
+	def markers(self, offset=0, from_first_marker=False):
 		""" by default return a dict of markers with timecodes relative to an origin
 
 		    if from_first_marker=False: the origin is the first entry timecode
-- 
2.39.5