Changed record and change_videosrc function parameters

2 files changed, 8 insertions, 7 deletions

diff --git a/freeseer-gui-qt.py b/freeseer-gui-qt.py
index 57f487b..077ac76 100755
--- a/freeseer-gui-qt.py
+++ b/freeseer-gui-qt.py
@@ -59,13 +59,10 @@ class GSTPlayerWidget(QtGui.QWidget):
         self.freeseer = FreeSeeR(self.winId())
 
     def change_videosrc(self):
-        self.freeseer.viddrv = str(CONFIG['VODRIVER'])
-        self.freeseer.viddev = str(CONFIG['VODEVICE'])
-        self.freeseer.change_videosrc()
+        self.freeseer.change_videosrc(str(CONFIG['VODRIVER']), str(CONFIG['VODEVICE']))
 
     def record(self):
-        self.freeseer.filename = CONFIG['FILENAME']
-        self.freeseer.record()
+        self.freeseer.record(str(CONFIG['FILENAME']))
 
     def stop(self):
         self.freeseer.stop()
diff --git a/freeseer.py b/freeseer.py
index 919654d..0aa9433 100755
--- a/freeseer.py
+++ b/freeseer.py
@@ -28,6 +28,7 @@ import gst
 class FreeSeeR:
     def __init__(self, window_id):
         self.window_id = window_id
+        
         self.viddrv = 'v4lsrc'
         self.viddev = '/dev/video0'
         self.filename = 'default.mkv'
@@ -90,7 +91,9 @@ class FreeSeeR:
             imagesink.set_property("force-aspect-ratio", True)
             imagesink.set_xwindow_id(self.window_id)
 
-    def change_videosrc(self):
+    def change_videosrc(self, new_source, new_device):
+        self.viddrv = new_source
+        self.viddev = new_device
         self.player.remove(self.vidsrc)
         self.vidsrc = gst.element_factory_make(self.viddrv, "vidsrc")
         self.player.add(self.vidsrc)
@@ -100,7 +103,8 @@ class FreeSeeR:
             self.vidsrc.set_property("device", self.viddev)
         gst.element_link_many(self.vidsrc, self.cspace)
 
-    def record(self):
+    def record(self, filename):
+        self.filename = filename
         self.filesink.set_property("location", self.filename)
         self.player.set_state(gst.STATE_PLAYING)