From: Paul Brossier <piem@piem.org>
Date: Mon, 3 Feb 2014 15:40:12 +0000 (-0300)
Subject: timeside/decoder/file.py: use self.mime_type(), not self.mimetype
X-Git-Tag: 0.5.4~15^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dd616263b5f392ab099fc7fada514f75bb9fdedd;p=timeside.git

timeside/decoder/file.py: use self.mime_type(), not self.mimetype
---

diff --git a/timeside/decoder/file.py b/timeside/decoder/file.py
index ab05b81..7af59df 100644
--- a/timeside/decoder/file.py
+++ b/timeside/decoder/file.py
@@ -315,19 +315,18 @@ class FileDecoder(Decoder):
 
     @interfacedoc
     def format(self):
-        # TODO check
-        if self.mimetype == 'application/x-id3':
-            self.mimetype = 'audio/mpeg'
-        return self.mimetype
+        return self.mime_type()
 
     @interfacedoc
     def mime_type(self):
+        if self.mimetype == 'application/x-id3':
+            self.mimetype = 'audio/mpeg'
         return self.mimetype
 
     @interfacedoc
     def encoding(self):
         # TODO check
-        return self.mimetype.split('/')[-1]
+        return self.mime_type().split('/')[-1]
 
     @interfacedoc
     def resolution(self):