]> git.parisson.com Git - timeside.git/commitdiff
timeside/decoder/file.py: use self.mime_type(), not self.mimetype
authorPaul Brossier <piem@piem.org>
Mon, 3 Feb 2014 15:40:12 +0000 (12:40 -0300)
committerPaul Brossier <piem@piem.org>
Mon, 3 Feb 2014 15:40:12 +0000 (12:40 -0300)
timeside/decoder/file.py

index ab05b81b0c35c7916268d61e174d39d7d6dc6e63..7af59dfede4c388b661d2429629a2f71aaefb325 100644 (file)
@@ -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):