[pitivi] effects: Get rid of some cache fields
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] effects: Get rid of some cache fields
- Date: Tue, 30 Sep 2014 07:31:52 +0000 (UTC)
commit aff838321bf98f2c0a59c1f1bab0d91c92b07cc4
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Tue Sep 30 01:17:51 2014 +0200
effects: Get rid of some cache fields
pitivi/effects.py | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index d13d7c8..a93d7d1 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -161,8 +161,6 @@ class EffectsManager(object):
def __init__(self):
object.__init__(self)
self._pixdir = os.path.join(get_pixmap_dir(), "effects")
- self._audio_categories = set([])
- self._video_categories = set([])
self.video_effects = []
self.audio_effects = []
self._effect_factories_dict = {}
@@ -266,15 +264,7 @@ class EffectsManager(object):
"""
Get all video effect categories names.
"""
- if not self._video_categories:
- for category in VIDEO_EFFECTS_CATEGORIES:
- self._video_categories.add(category[0])
- ret = list(self._video_categories)
- ret.sort()
- ret.insert(0, _("All effects"))
- if VIDEO_EFFECTS_CATEGORIES:
- ret.append(_("Uncategorized"))
- return ret
+ return EffectsManager._getCategoriesNames(VIDEO_EFFECTS_CATEGORIES)
video_categories = property(getVideoCategories)
@@ -282,18 +272,20 @@ class EffectsManager(object):
"""
Get all audio effect categories names.
"""
- if not self._audio_categories:
- for category in AUDIO_EFFECTS_CATEGORIES:
- self._audio_categories.add(category[0])
- ret = list(self._audio_categories)
+ return EffectsManager._getCategoriesNames(AUDIO_EFFECTS_CATEGORIES)
+
+ audio_categories = property(getAudioCategories)
+
+ @staticmethod
+ def _getCategoriesNames(categories):
+ ret = [category_name for category_name, unused_effects in categories]
ret.sort()
ret.insert(0, _("All effects"))
- if AUDIO_EFFECTS_CATEGORIES:
+ if categories:
+ # Add Uncategorized only if there are other categories defined.
ret.append(_("Uncategorized"))
return ret
- audio_categories = property(getAudioCategories)
-
def getEffectIcon(self, effect_name):
icon = None
try:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]