diff options
author | Julien Valroff <julien@kirya.net> | 2011-01-02 07:56:35 +0100 |
---|---|---|
committer | Julien Valroff <julien@kirya.net> | 2011-01-02 07:56:35 +0100 |
commit | ac4d6762d811cfe1aa855280323fb46d7d061e45 (patch) | |
tree | dc0a496845cb5a47d0390df33b6b3269e5dc9fa4 /rapid/media.py | |
parent | 827935bc83a6bf6b6604f94a87253acca3f42574 (diff) | |
parent | d058c9c1092987228355cc748205bb4ad0b49a1a (diff) |
Merge commit 'upstream/0.3.4'
Diffstat (limited to 'rapid/media.py')
-rwxr-xr-x | rapid/media.py | 8 |
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) |