fix service restart, add full restart with jack

diff --git a/tcserver/conf/usr/local/bin/telecaster-restart b/tcserver/conf/usr/local/bin/telecaster-restart
index abb1693d7182bee54aca0b6a1d9ff45a4bf24c4b..00ac9bb46b2855e9e2fcc92479a42dde521e2467 100755 (executable)
--- a/tcserver/conf/usr/local/bin/telecaster-restart
+++ b/tcserver/conf/usr/local/bin/telecaster-restart
@@ -2,12 +2,15 @@
 
 sudo /etc/init.d/telecaster-audio stop
 sudo /etc/init.d/telecaster-video stop
-#sudo /etc/init.d/telecaster-vnc stop
+sudo /etc/init.d/telecaster-vnc stop
 sudo /etc/init.d/stream-m stop
 
 sleep 3
 
 sudo /etc/init.d/stream-m start
-#sudo /etc/init.d/telecaster-vnc start
+sudo /etc/init.d/telecaster-vnc start
+
+sleep 10
+
 sudo /etc/init.d/telecaster-audio start
 sudo /etc/init.d/telecaster-video start

diff --git a/tcserver/conf/usr/local/bin/telecaster-restart-full b/tcserver/conf/usr/local/bin/telecaster-restart-full
new file mode 100755 (executable)
index 0000000..ecc3dc7
--- /dev/null
+++ b/tcserver/conf/usr/local/bin/telecaster-restart-full
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+sudo /etc/init.d/telecaster-audio stop
+sudo /etc/init.d/telecaster-video stop
+sudo /etc/init.d/telecaster-vnc stop
+sudo /etc/init.d/stream-m stop
+sudo /etc/init.d/jackd stop
+
+sleep 3
+
+sudo /etc/init.d/jackd start
+sudo /etc/init.d/stream-m start
+sudo /etc/init.d/telecaster-vnc start
+
+sleep 10
+
+sudo /etc/init.d/telecaster-audio start
+sudo /etc/init.d/telecaster-video start

diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/py/control_mixer_osc_touch_2cam.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/py/control_mixer_osc_touch_2cam.py
index 56cbaffafaa0a042ffda1ac758bc00d6156037e9..536483008a98726f09166e7eb13fb16215051236 100644 (file)
--- a/tcserver/conf/usr/local/share/telecaster/scripts/tests/py/control_mixer_osc_touch_2cam.py
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/py/control_mixer_osc_touch_2cam.py
@@ -44,11 +44,12 @@ class GSTWebmHttpEncoder(object):
     def __init__(self, protocol='none', host='127.0.0.1', port=9000):
         self.protocol = protocol
         self.port = port
-        self.pipe = '! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=30 auto-alt-ref-frames=true  ! queue ! muxout. \
+        self.host = host
+        self.pipe = """! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=30 auto-alt-ref-frames=true  ! queue ! muxout. \
                     jackaudiosrc connect=2 ! audio/x-raw-float, channels=2 \
                     ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
                     webmmux streamable=true name=muxout \
-                    ! queue ! tcpserversink protocol=%s host=%s port=%s blocksize=65536 sync-method=1' \
+                    ! queue ! tcpserversink protocol=%s host=%s port=%s blocksize=65536 sync-method=1""" \
                     % (self.protocol, self.host, self.port)
 
 
@@ -56,7 +57,7 @@ class GSTMixer(object):
 
     def __init__(self, osc_port=8338, stream_port=9000):
         self.name = 'mixer'
-        self.pipe = ['videomixer name=mixer ! queue ! ffmpegcolorspace ! xvimagesink sync=false']
+        self.pipe = ['videomixer name=mixer ! queue ! ffmpegcolorspace ']
         self.srcs = []
         self.i= 0
 
@@ -96,17 +97,15 @@ class GSTMixer(object):
         self.i += 1
 
     def setup(self):
-        self.srcs.reverse()
+        self.pipe.append(self.encoder.pipe)
 
+        self.srcs.reverse()
         for src in self.srcs:
             queue = 'queue'
             if src['src'].queue_option:
                 # queue = 'timeoverlay ! queue'
                 queue += ' ' + src['src'].queue_option
             self.pipe.append(' '.join([src['src'].pipe, '! ' + queue +  ' ! ' + self.name + '.' + src['sink']]))
-
-        pipe += self.encoder.pipe
-
         print ' '.join(self.pipe)
         self.process = gst.parse_launch(' '.join(self.pipe))
         mixer = self.process.get_by_name("mixer")
@@ -137,8 +136,11 @@ class GSTMixer(object):
 if __name__ == '__main__':
     src1 = GSTSrcVideo(width=640, height=480, pipe='videotestsrc pattern="black"')
     src4 = GSTSrcVideo(width=640, height=480, pipe='videotestsrc ')
-    src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video0 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
-    src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video1 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
+    #src2 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video0 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
+    #src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video1 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
+    src2 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video0 do-timestamp=true')
+    src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video1 do-timestamp=true')
+#
 #    src2 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='souphttpsrc location=http://192.168.0.15:8080/videofeed do-timestamp=true ! jpegdec ! queue ! ffmpegcolorspace ! videorate')
     mixer = GSTMixer()
     mixer.add_src(src1)