From 1e02b8a32ae6dce46e7514890a3dfeccc7c695d1 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 19 Oct 2014 18:39:40 +0200
Subject: ctrlroom: xvimagesink vs. ximagesink

---
 scripts/ctrlroom/sydra-receiver.sh | 8 ++++----
 scripts/ctrlroom/sydra-sender.sh   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/ctrlroom/sydra-receiver.sh b/scripts/ctrlroom/sydra-receiver.sh
index 4759425..589fe7a 100755
--- a/scripts/ctrlroom/sydra-receiver.sh
+++ b/scripts/ctrlroom/sydra-receiver.sh
@@ -36,7 +36,7 @@ start_rtp_overview() {
 
   herbstclient rule once title="overview-$ID" tag="overview"
   exec $SYDRA_RTP -n "overview-$ID" -D --log stdout:3 --mode receiver -O $PORT_BASE --rtp-host-reflector localhost --rtp-port-base-reflector $REF_PORT_BASE \
-    --sink "videoconvert name=videosink ! textoverlay text=\"$TITLE\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! xvimagesink    fakesink name=audiosink" \
+    --sink "videoconvert name=videosink ! textoverlay text=\"$TITLE\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! ximagesink    fakesink name=audiosink" \
     --rec-mux matroskamux --rec-name-format "$RECORD_D/%Y-%m-%d_%H-%M-%S.mkv" --rec-video-encoder jpegenc \
                           --rec-audio-encoder "audioconvert ! vorbisenc"
 }
@@ -46,7 +46,7 @@ start_test_overview() {
   TITLE="$2"
 
   herbstclient rule once title="overview-$ID" tag="overview"
-  exec $SYDRA_LAUNCH -n "overview-$ID" -D --log stdout:3 -p "videotestsrc ! video/x-raw,width=864,height=480,framerate=25/1 ! textoverlay text=\"$TITLE\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! xvimagesink"
+  exec $SYDRA_LAUNCH -n "overview-$ID" -D --log stdout:3 -p "videotestsrc ! video/x-raw,width=864,height=480,framerate=25/1 ! textoverlay text=\"$TITLE\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! ximagesink"
 }
 
 start_rtp_main() {
@@ -56,7 +56,7 @@ start_rtp_main() {
 
   herbstclient rule once title="main-$ID" tag="main"
   exec $SYDRA_RTP -n "main-$ID" -D --log stdout:3 --mode receiver -A localhost -O $PORT_BASE \
-    --sink "videoconvert name=videosink ! videoscale add-borders=true ! xvimagesink   audioconvert name=audiosink ! audioresample ! autoaudiosink"
+    --sink "videoconvert name=videosink ! videoscale add-borders=true ! ximagesink   audioconvert name=audiosink ! audioresample ! autoaudiosink"
 }
 
 start_test_main() {
@@ -64,7 +64,7 @@ start_test_main() {
   TITLE="$2"
 
   herbstclient rule once title="main-$ID" tag="main"
-  exec $SYDRA_LAUNCH -n "main-$ID" -D --log stdout:3 -p "videotestsrc ! video/x-raw,width=864,height=480,framerate=25/1 ! textoverlay text=\"$TITLE\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! xvimagesink"
+  exec $SYDRA_LAUNCH -n "main-$ID" -D --log stdout:3 -p "videotestsrc ! video/x-raw,width=864,height=480,framerate=25/1 ! textoverlay text=\"$TITLE\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! ximagesink"
 }
 
 cd $ROOT_D
diff --git a/scripts/ctrlroom/sydra-sender.sh b/scripts/ctrlroom/sydra-sender.sh
index e626ddd..dc73eb4 100755
--- a/scripts/ctrlroom/sydra-sender.sh
+++ b/scripts/ctrlroom/sydra-sender.sh
@@ -30,14 +30,14 @@ start_rtp() {
 
   herbstclient rule once title="sender" tag="control"
   exec $SYDRA_RTP -n "sender" -D --log stdout:3 --mode sender -t 10 -O $PORT_BASE \
-    --previewsink "textoverlay text=\"local\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! xvimagesink" \
+    --previewsink "textoverlay text=\"local\" shaded-background=true font-desc=\"Sans 18\" ! videoconvert ! videoscale add-borders=true ! ximagesink" \
     --rec-mux matroskamux --rec-name-format "$RECORD_D/%Y-%m-%d_%H-%M-%S.mkv" --rec-video-encoder jpegenc \
                           --rec-audio-encoder "audioconvert ! vorbisenc"
 }
 
 start_test() {
   herbstclient rule once title="sender" tag="control"
-  exec $SYDRA_LAUNCH -n "sender" -D --log stdout:3 -p "videotestsrc ! video/x-raw,width=864,height=480,framerate=25/1 ! textoverlay text=\"local\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! xvimagesink"
+  exec $SYDRA_LAUNCH -n "sender" -D --log stdout:3 -p "videotestsrc ! video/x-raw,width=864,height=480,framerate=25/1 ! textoverlay text=\"local\" shaded-background=true font-desc=\"Sans 18\" ! videoscale add-borders=true ! ximagesink"
 }
 
 cd $ROOT_D
-- 
cgit v1.2.3