summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxiiro <zxiiro@enkei.l.zxiiro.ca>2010-01-29 19:58:14 -0500
committerzxiiro <zxiiro@enkei.l.zxiiro.ca>2010-01-29 19:58:14 -0500
commit13ce79063600865088df51b199a45405dd1bd9e9 (patch)
tree06f33b0e29e45ff2959ba12a3a1271af8fdef7bd
parent7c3c931b8cfed751fcd8f88aa9cd3a61b789cd1f (diff)
downloadfreeseer-13ce79063600865088df51b199a45405dd1bd9e9.tar.gz
freeseer-13ce79063600865088df51b199a45405dd1bd9e9.tar.xz
freeseer-13ce79063600865088df51b199a45405dd1bd9e9.zip
Added function for enabling / disabling the video preview
-rwxr-xr-xfreeseer-gui-qt.py3
-rwxr-xr-xfreeseer.py14
2 files changed, 12 insertions, 5 deletions
diff --git a/freeseer-gui-qt.py b/freeseer-gui-qt.py
index 077ac76..7c674ac 100755
--- a/freeseer-gui-qt.py
+++ b/freeseer-gui-qt.py
@@ -56,7 +56,8 @@ class GSTPlayerWidget(QtGui.QWidget):
def __init__(self, parent):
QtGui.QWidget.__init__(self, parent)
- self.freeseer = FreeSeeR(self.winId())
+ self.freeseer = FreeSeeR()
+ self.freeseer.enable_preview(self.winId())
def change_videosrc(self):
self.freeseer.change_videosrc(str(CONFIG['VODRIVER']), str(CONFIG['VODEVICE']))
diff --git a/freeseer.py b/freeseer.py
index d32aec9..d8fdd58 100755
--- a/freeseer.py
+++ b/freeseer.py
@@ -26,8 +26,8 @@ pygst.require("0.10")
import gst
class FreeSeeR:
- def __init__(self, window_id):
- self.window_id = window_id
+ def __init__(self):
+ self.window_id = None
self.viddrv = 'v4lsrc'
self.viddev = '/dev/video0'
@@ -58,14 +58,13 @@ class FreeSeeR:
self.filesink.set_property("location", 'default.mkv')
# GST Add Components
- self.player.add(self.vidsrc, self.cspace, self.vidtee, self.vidqueue1, self.vidqueue2, self.vidcodec, self.vidsink)
+ self.player.add(self.vidsrc, self.cspace, self.vidtee, self.vidqueue1, self.vidcodec)
self.player.add(self.sndsrc, self.sndqueue, self.audioconvert, self.sndcodec)
self.player.add(self.mux, self.filesink)
# GST Link Components
gst.element_link_many(self.vidsrc, self.cspace, self.vidtee)
gst.element_link_many(self.vidtee, self.vidqueue1, self.vidcodec, self.mux)
- gst.element_link_many(self.vidtee, self.vidqueue2, self.vidsink)
gst.element_link_many(self.sndsrc, self.sndqueue, self.audioconvert, self.sndcodec, self.mux)
gst.element_link_many(self.mux, self.filesink)
@@ -127,3 +126,10 @@ class FreeSeeR:
self.player.add(self.sndcodec)
gst.element_link_many(self.audioconvert, self.sndcodec, self.mux)
+ def enable_preview(self, window_id):
+ self.window_id = window_id
+ self.player.add(self.vidqueue2, self.vidsink)
+ gst.element_link_many(self.vidtee, self.vidqueue2, self.vidsink)
+
+ def disable_preview(self):
+ self.player.remove(self.vidqueue2, self.vidsink) \ No newline at end of file