* morituri/common/encode.py:

* morituri/common/program.py:
	* morituri/image/image.py:
	* morituri/program/cdparanoia.py:
	* morituri/rip/cd.py:
	* morituri/rip/image.py:
	* morituri/rip/offset.py:
	  Move all gst-using imports inside functions and classes
	  to avoid 'import gst' eating our options.
	  Fixes #12.
This commit is contained in:
Thomas Vander Stichele
2010-04-04 19:29:49 +00:00
parent cadc896c93
commit 22a3554381
8 changed files with 71 additions and 15 deletions

View File

@@ -26,13 +26,11 @@ Common functionality and class for all programs using morituri.
import os
from morituri.common import common, log, checksum
from morituri.common import common, log
from morituri.result import result
from morituri.program import cdrdao, cdparanoia
from morituri.image import image
import gst
class MusicBrainzException(Exception):
def __init__(self, exc):
self.args = (exc, )
@@ -299,6 +297,9 @@ class Program(log.Loggable):
# htoa defaults to disc's artist
title = 'Hidden Track One Audio'
# here to avoid import gst eating our options
import gst
ret = gst.TagList()
# gst-python 0.10.15.1 does not handle unicode -> utf8 string conversion
@@ -356,6 +357,9 @@ class Program(log.Loggable):
return (start, stop)
def verifyTrack(self, runner, trackResult):
# here to avoid import gst eating our options
from morituri.common import checksum
t = checksum.CRC32Task(trackResult.filename)
runner.run(t)