cleanup

diff --git a/decode/flac.py b/decode/flac.py
index e7115c7a761520b43f25c1cf4520ca4125b7e1d4..7f22813887a1b0d113202a25b63c2e3512a45725 100644 (file)
--- a/decode/flac.py
+++ b/decode/flac.py
@@ -29,7 +29,7 @@ from mutagen.flac import FLAC
 from tempfile import NamedTemporaryFile
 
 class FlacDecoder(DecoderCore):
-    """Defines methods to decode to FLAC"""
+    """Defines methods to decode from FLAC"""
 
     implements(IDecoder)
 

diff --git a/decode/mp3.py b/decode/mp3.py
index d795f49e2f028fe5e12afebb2f9dc3d9fea1b4c5..85cc32b974d2d246088ceb10807ddc8bac779efe 100644 (file)
--- a/decode/mp3.py
+++ b/decode/mp3.py
@@ -29,7 +29,7 @@ from timeside.decode.api import IDecoder
 
 
 class Mp3Decoder(DecoderCore):
-    """Defines methods to decode to MP3"""
+    """Defines methods to decode from MP3"""
 
     implements(IDecoder)
 

diff --git a/decode/ogg.py b/decode/ogg.py
index b4758ce85fd5139028f2dcaed4ca4a6b181cbd68..75789a8b8ab1d47d00bd0b6a0c65a3d154b306e2 100644 (file)
--- a/decode/ogg.py
+++ b/decode/ogg.py
@@ -28,7 +28,7 @@ from timeside.decode.api import IDecoder
 from mutagen.oggvorbis import OggVorbis
 
 class OggDecoder(DecoderCore):
-    """Defines methods to decode to OGG Vorbis"""
+    """Defines methods to decode from OGG Vorbis"""
 
     implements(IDecoder)
 
@@ -36,8 +36,6 @@ class OggDecoder(DecoderCore):
         self.description = self.description()
         self.format = self.format()
         self.mime_type = self.mime_type()
-
-        self.bitrate_default = '192'
         self.dub2args_dict = {'creator': 'artist',
                              'relation': 'album'
                              }

diff --git a/decode/wav.py b/decode/wav.py
index d6e1dbd54018fe5c6b8be51878bd7abc91d7bf14..41d2731d0259fde56a7fa917e1df64c2f45b0b9d 100644 (file)
--- a/decode/wav.py
+++ b/decode/wav.py
@@ -26,7 +26,7 @@ from timeside.decode.core import *
 from timeside.decode.api import IDecoder
 
 class WavDecoder(DecoderCore):
-    """Defines methods to decode to WAV"""
+    """Defines methods to decode from WAV"""
 
     implements(IDecoder)
 

diff --git a/encode/flac.py b/encode/flac.py
index 32d960de557a50dcb48da4888fa0641abbbdc510..d2e5b99c2f751fd6a41ede34099aa72322a1978b 100644 (file)
--- a/encode/flac.py
+++ b/encode/flac.py
@@ -25,7 +25,6 @@ import subprocess
 
 from timeside.encode.core import *
 from timeside.encode.api import IEncoder
-from mutagen.flac import FLAC
 from tempfile import NamedTemporaryFile
 
 class FlacEncoder(EncoderCore):
@@ -67,6 +66,7 @@ class FlacEncoder(EncoderCore):
                            'file does not exist.')
 
     def write_tags(self, file):
+        from mutagen.flac import FLAC
         media = FLAC(file)
         for tag in self.metadata:
             name = tag[0]

diff --git a/encode/mp3.py b/encode/mp3.py
index 45eab6697d1ca6bda8b79542f88a23a120712a13..eb1e4160029becaf5b4b8b50775dffe87531d1d6 100644 (file)
--- a/encode/mp3.py
+++ b/encode/mp3.py
@@ -26,7 +26,7 @@ import subprocess
 
 from timeside.encode.core import *
 from timeside.encode.api import IEncoder
-#from mutagen.id3 import *
+
 
 class Mp3Encoder(EencoderCore):
     """Defines methods to encode to MP3"""