summaryrefslogtreecommitdiff
path: root/voctogui
diff options
context:
space:
mode:
authorMaZderMind <git@mazdermind.de>2015-11-17 00:46:13 +0100
committerMaZderMind <git@mazdermind.de>2015-11-17 00:46:13 +0100
commit538de1735f2964dfe3f082675e20a45230a24ddf (patch)
tree11e90f561270bef5536755a8c84cd70e47c51f24 /voctogui
parent07f2ab39dc7acd278fa78ab841030207abe2e127 (diff)
add an option to use ximagesink instead of xvimagesink for systems, that do not support Xv-extensions (like some VMs)
Diffstat (limited to 'voctogui')
-rw-r--r--voctogui/default-config.ini5
-rw-r--r--voctogui/lib/videodisplay.py14
2 files changed, 16 insertions, 3 deletions
diff --git a/voctogui/default-config.ini b/voctogui/default-config.ini
index 6258e7c..ee14da0 100644
--- a/voctogui/default-config.ini
+++ b/voctogui/default-config.ini
@@ -1,6 +1,11 @@
[server]
host=localhost
+[x11]
+; set to false when running inside a VM which
+; usually does not support Xv extensions
+xv=true
+
[previews]
width=320
;height=180
diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py
index 4133d5a..4195d70 100644
--- a/voctogui/lib/videodisplay.py
+++ b/voctogui/lib/videodisplay.py
@@ -58,9 +58,17 @@ class VideoDisplay(object):
"""
# Video Display
- pipeline += """
- xvimagesink name=v
- """
+ if Config.getboolean('x11', 'xv'):
+ pipeline += """
+ xvimagesink name=v
+ """
+ else:
+ pipeline += """
+ videoconvert !
+ videoscale !
+ ximagesink name=v
+ """
+
# If an Audio-Path is required, add an Audio-Path through a level-Element