1 files changed, 16 insertions, 54 deletions
diff --git a/src/components/sound.py b/src/components/sound.py
index bd7d002..26ecf93 100644
--- a/src/components/sound.py
+++ b/src/components/sound.py
@@ -2,42 +2,24 @@ from PyQt5 import QtGui, QtCore, QtWidgets
 import os
 
 from component import Component
-from frame import BlankFrame
+from toolkit.frame import BlankFrame
 
 
 class Component(Component):
-    '''Sound'''
-
-    modified = QtCore.pyqtSignal(int, dict)
-
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.settings
-        page = self.loadUi('sound.ui')
-
-        page.lineEdit_sound.textChanged.connect(self.update)
-        page.pushButton_sound.clicked.connect(self.pickSound)
-        page.checkBox_chorus.stateChanged.connect(self.update)
-        page.spinBox_delay.valueChanged.connect(self.update)
-        page.spinBox_volume.valueChanged.connect(self.update)
-
-        self.page = page
-        return page
-
-    def update(self):
-        self.sound = self.page.lineEdit_sound.text()
-        self.delay = self.page.spinBox_delay.value()
-        self.volume = self.page.spinBox_volume.value()
-        self.chorus = self.page.checkBox_chorus.isChecked()
-        super().update()
-
-    def previewRender(self, previewWorker):
-        width = int(previewWorker.core.settings.value('outputWidth'))
-        height = int(previewWorker.core.settings.value('outputHeight'))
-        return BlankFrame(width, height)
-
-    def preFrameRender(self, **kwargs):
-        pass
+    name = 'Sound'
+    version = '1.0.0'
+
+    def widget(self, *args):
+        super().widget(*args)
+        self.page.pushButton_sound.clicked.connect(self.pickSound)
+        self.trackWidgets({
+            'sound': self.page.lineEdit_sound,
+            'chorus': self.page.checkBox_chorus,
+            'delay': self.page.spinBox_delay,
+            'volume': self.page.spinBox_volume,
+        }, commandArgs={
+            'sound': None,
+        })
 
     def properties(self):
         props = ['static', 'audio']
@@ -73,31 +55,11 @@ class Component(Component):
             self.page.lineEdit_sound.setText(filename)
             self.update()
 
-    def frameRender(self, layerNo, frameNo):
-        width = int(self.settings.value('outputWidth'))
-        height = int(self.settings.value('outputHeight'))
-        return BlankFrame(width, height)
-
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
-        self.page.lineEdit_sound.setText(pr['sound'])
-        self.page.checkBox_chorus.setChecked(pr['chorus'])
-        self.page.spinBox_delay.setValue(pr['delay'])
-        self.page.spinBox_volume.setValue(pr['volume'])
-
-    def savePreset(self):
-        return {
-            'sound': self.sound,
-            'chorus': self.chorus,
-            'delay': self.delay,
-            'volume': self.volume,
-        }
-
     def commandHelp(self):
         print('Path to audio file:\n    path=/filepath/to/sound.ogg')
 
     def command(self, arg):
-        if not arg.startswith('preset=') and '=' in arg:
+        if '=' in arg:
             key, arg = arg.split('=', 1)
             if key == 'path':
                 if '*%s' % os.path.splitext(arg)[1] \