summaryrefslogtreecommitdiff
path: root/rapid/media.py
diff options
context:
space:
mode:
authorJulien Valroff <julien@kirya.net>2011-01-02 07:56:33 +0100
committerJulien Valroff <julien@kirya.net>2011-01-02 07:56:33 +0100
commitd058c9c1092987228355cc748205bb4ad0b49a1a (patch)
tree9629db7442f8b446e3ba5d3da6c46fbfa8952c69 /rapid/media.py
parentdf7192b0010e7f454622f1b215dfa6aff64e679b (diff)
Imported Upstream version 0.3.4upstream/0.3.4
Diffstat (limited to 'rapid/media.py')
-rwxr-xr-xrapid/media.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rapid/media.py b/rapid/media.py
index 3ad09d2..9819ab7 100755
--- a/rapid/media.py
+++ b/rapid/media.py
@@ -24,7 +24,7 @@ import datetime
import subprocess
import config
-from config import MAX_THUMBNAIL_SIZE
+from config import max_thumbnail_size
from config import STATUS_NOT_DOWNLOADED, \
STATUS_DOWNLOAD_PENDING, \
STATUS_CANNOT_DOWNLOAD
@@ -197,7 +197,7 @@ class MediaFile:
else:
if self.isImage:
try:
- thumbnail = self.metadata.getThumbnailData(MAX_THUMBNAIL_SIZE)
+ thumbnail = self.metadata.getThumbnailData(max_thumbnail_size)
if not isinstance(thumbnail, types.StringType):
self.thumbnail = None
else:
@@ -220,10 +220,10 @@ class MediaFile:
else:
# get thumbnail of video
# it may need to be generated
- self.thumbnail = self.metadata.getThumbnailData(MAX_THUMBNAIL_SIZE, tempWorkingDir)
+ self.thumbnail = self.metadata.getThumbnailData(max_thumbnail_size, tempWorkingDir)
if self.thumbnail:
# scale to size
- self.thumbnail = common.scale2pixbuf(MAX_THUMBNAIL_SIZE, MAX_THUMBNAIL_SIZE, self.thumbnail)
+ self.thumbnail = common.scale2pixbuf(max_thumbnail_size, max_thumbnail_size, self.thumbnail)