fix kill vnc, default port and deps, speedup

diff --git a/src/etc/init.d/telecaster b/src/etc/init.d/telecaster
index ffd7fe93824462a476e92717be9eea97e8901968..14ac27b7d1acbebca7dbd69f81168ba7f10e7abc 100755 (executable)
--- a/src/etc/init.d/telecaster
+++ b/src/etc/init.d/telecaster
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          vncserver
-# Required-Start:
+# Required-Start:    jackd icecast2
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
@@ -14,7 +14,7 @@ USER=
 OPTIONS=""
 LOG=/var/log/telecaster/vncserver.log
 PIDFILE=/var/run/telecaster.pid
-PORT=2
+PORT=1
 
 test -f /etc/default/telecaster || exit 0
 . /etc/default/telecaster
@@ -34,8 +34,8 @@ case "$1" in
     start)
         log_begin_msg "Starting telecaster streaming vncserver:" "telecaster"
             su -c "$DAEMON $OPTIONS :$PORT > $LOG &" $USER
-            sleep 10
-            pid=`pgrep -u ${USER} vncserver`
+            sleep 1
+            pid=`pgrep -u ${USER} Xtigervnc`
         if [ pid = '' ]; then
                 log_failure_msg "TeleCaster daemon can't be started! Check logfile: $LOG"
             else
@@ -50,7 +50,7 @@ case "$1" in
             su -c "pkill -9 -f monitor_check.py"
             su -c "pkill -9 -f telecaster_mp3_monitor.yaml"
             su -c "pkill -9 -f telecaster_webm_monitor.yaml"
-            su -c "pkill -9 gst-launch-0.10" $USER
+            su -c "pkill -9 gst-launch-1.0" $USER
             sleep 1
             su -c "vncserver -kill :$PORT" $USER
             log_end_msg 0

diff --git a/src/home/telecaster/.fluxbox/startup b/src/home/telecaster/.fluxbox/startup
index 0cdc77aacb821d4cff3be5be96050dc823f8055a..39d612180b6481ccdc61d05c9f6a33b89fcd1bbd 100644 (file)
--- a/src/home/telecaster/.fluxbox/startup
+++ b/src/home/telecaster/.fluxbox/startup
@@ -31,15 +31,15 @@ konsole &
 
 qjackctl &
 
-sleep 3
+sleep 1
 
 $FLUXBOX_DIR/scripts/tc_audio_mp3_icecast-gst1.sh &
 
-sleep 3
+sleep 1
 
 $FLUXBOX_DIR/scripts/tc_video_simple_webm_stream-gst1.sh &
 
-sleep 3
+sleep 1
 
 # STEREO setup
 # 1: L