aboutsummaryrefslogtreecommitdiff
path: root/src/toolkit/common.py
diff options
context:
space:
mode:
authortassaron2017-07-20 20:31:38 -0400
committertassaron2017-07-20 20:31:38 -0400
commitf454814867443ceeeca2a3a2c2a676947184503c (patch)
treebe0ed824fd6218038041d5af48d273498cab87e1 /src/toolkit/common.py
parentb1713d38fa91e39f142b0c234b6405229aa149e1 (diff)
ffmpeg functions moved to toolkit, component format simplified
component methods are auto-decorated & settings are now class variables
Diffstat (limited to 'src/toolkit/common.py')
-rw-r--r--src/toolkit/common.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/toolkit/common.py b/src/toolkit/common.py
index e3a1649..763d582 100644
--- a/src/toolkit/common.py
+++ b/src/toolkit/common.py
@@ -8,6 +8,13 @@ import sys
import subprocess
from collections import OrderedDict
+from toolkit.core import *
+
+
+def getPresetDir(comp):
+ '''Get the preset subdirectory for a particular version of a component'''
+ return os.path.join(Core.presetDir, str(comp), str(comp.version))
+
def badName(name):
'''Returns whether a name contains non-alphanumeric chars'''
@@ -103,8 +110,9 @@ def rgbFromString(string):
return (255, 255, 255)
-def LoadDefaultSettings(self):
- ''' Runs once at each program start-up. Fills in default settings
+def loadDefaultSettings(self):
+ '''
+ Runs once at each program start-up. Fills in default settings
for any settings not found in settings.ini
'''
self.resolutions = [