]> git.parisson.com Git - telecaster-cgi.git/commitdiff
fix vncserver for RT priorities, fix deefuzzer PB conf, start edcast
authoryomguy <yomguy@parisson.com>
Thu, 8 Jul 2010 17:42:42 +0000 (17:42 +0000)
committeryomguy <yomguy@parisson.com>
Thu, 8 Jul 2010 17:42:42 +0000 (17:42 +0000)
with fluxbox in vncserver

conf/etc/init.d/vncserver
conf/etc/telecaster/deefuzzer.xml
conf/etc/telecaster/telecaster.xml
conf/home/fluxbox/autostart.sh

index 24bdff1d7abfabf0c845b1d7ccd078f26e34dcc1..60113f01e9151771ca017cbe6dd42be804a1de37 100755 (executable)
@@ -1,38 +1,24 @@
 #!/bin/sh
-#
-# VNCserver init script
-#
 ### BEGIN INIT INFO
 # Provides:          vncserver
-# Required-Start:    $network $local_fs $remote_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: init-Script for system wide fetchmail daemon
+# Short-Description: init script for vncserver with RT capabilities
 ### END INIT INFO
-#
-# A fetchmailrc file containg hosts and passwords for all local users should be
-# placed in /etc/fetchmailrc.  Remember to make the /etc/fetchmailrc mode 600
-# to avoid disclosing the users' passwords.
-#
-# This script will NOT start or stop fetchmail if the /etc/fetchmailrc file
-# does not exist or /etc/default/fetchmail is set to no.
 
-# Defaults
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
+
 DAEMON=/usr/bin/vncserver
 USER=
-PORT=
 OPTIONS=""
-
-. /lib/lsb/init-functions
+LOG=/var/log/vncserver.log
+PIDFILE=/var/run/vncserver.pid
+PORT=1
 
 test -f /etc/default/vncserver || exit 0
 . /etc/default/vncserver
 
-OPTIONS="$OPTIONS"
-
-PIDFILE="/var/run/vncserver.pid"
+VNCHOME=/home/$USER
 
 if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
        echo "Edit /etc/default/vncserver to start vncserver"
@@ -41,59 +27,34 @@ fi
 
 test -f $DAEMON || exit 0
 
-set -e
+. /lib/lsb/init-functions
 
 case "$1" in
-       start)
-               if test -e $PIDFILE ; then
-                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
-                       PIDDIR=/proc/$pid
-                   if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
-                               log_failure_msg "vncserver already started; not starting."
-                               exit 0
-                       else
-                               log_warning_msg "Removing stale PID file $PIDFILE."
-                               rm -f $PIDFILE
-                       fi
-               fi
+       start)  
                log_begin_msg "Starting vncserver audio server:" "vncserver"
-               if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS :$PORT; then
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
+            echo $DAEMON $OPTIONS :$PORT' &' > $VNCHOME/.vncserverinit
+            chmod +x $VNCHOME/.vncserverinit
+            su -c $VNCHOME/.vncserverinit $USER > ${LOG}
+               sleep 2
+            pid=`pgrep -u ${USER} vncserver` 
+               if [ pid = '' ]; then
+                       log_failure_msg "Vncserver daemon can't be started! Check logfile: ${LOG}"
+            else
+                echo $pid > $PIDFILE
+               fi
+               
                ;;
        stop)
-               if ! test -e $PIDFILE ; then
-                       log_failure_msg "Pidfile not found! Is vncserver running?"
-                       exit 0
-               fi
-               log_begin_msg "Stopping vncserver:" "vncserver"
-               if start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then
-                       $DAEMON -kill :$PORT 
-                        rm -f $PIDFILE
-                       log_end_msg 0
-               else
-                       rm -f $PIDFILE
-                       log_end_msg 1
-                       exit 1
-               fi
-               ;;
-       force-reload|restart)
-               log_begin_msg "Restarting vncserver:" "vncserver"
-               if ! start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then
-                       log_end_msg 1
-                       exit 1
-               fi
-               sleep 1
-                rm -f $PIDFILE || true
-               if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS; then
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
+               log_begin_msg "Stopping vncserver audio server:" "vncserver"
+                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
+               if [ ! pid = '' ]; then
+                        vncserver -kill :$PORT
+                       log_end_msg 0
+               else
+                       log_end_msg 1
+                       exit 1
+               fi
+                rm $PIDFILE
                ;;
        try-restart)
                if test -e $PIDFILE ; then
@@ -106,17 +67,7 @@ case "$1" in
                fi
                test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
                ;;
-       awaken)
-               log_begin_msg "Awakening vncserver:" "vncserver"
-               if [ -s $PIDFILE ]; then
-                       start-stop-daemon -K -s 10 -q -p $PIDFILE -x $DAEMON
-                       log_end_msg 0
-                       exit 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-               ;;
+
        *)
                log_warning_msg "Usage: /etc/init.d/vncserver {start|stop|restart|force-reload|awaken|debug-run}"
                log_warning_msg "  start - starts system-wide vncserver service"
index eb607c183f090b7452a1c7c73019086d135a79b6..db1b3ba728728378f08a5bf3d7b1014285565100 100644 (file)
@@ -1,32 +1,33 @@
 <deefuzzer>
-    <log>/var/log/deefuzzer/deefuzzer.log</log>
-    <m3u>/var/www/m3u/deefuzzer.m3u</m3u>
+    <log>/var/log/deefuzzer/preb.log</log>
+    <m3u>/var/www/m3u/preb.m3u</m3u>
+
     <station>
         <infos>
-            <short_name>TeleCaster</short_name>
-            <name>TeleCaster Live Session</name>
-            <description>LIVE Talk and Music</description>
-            <url>http://parisson.com</url>
-            <genre>Various Funk Groove</genre>
+            <short_name>telecaster_04</short_name>
+            <name>TeleCaster #4</name>
+            <description>TeleCaster testing</description>
+            <url>http://crfpa.pre-barreau.com</url>
+            <genre>School</genre>
         </infos>
         <server>
-            <host>parisson.com</host>
+            <host>stream.parisson.com</host>
             <port>8000</port>
             <sourcepassword>source2parisson</sourcepassword>
             <public>0</public>
         </server>
         <media>
-            <dir>/path/to/mp3/</dir>
+            <dir>/home/prebarreau/media/CRFPA/2009/</dir>
             <format>mp3</format>
-            <bitrate>192</bitrate>
+            <bitrate>96</bitrate>
             <ogg_quality>7</ogg_quality>
             <samplerate>44100</samplerate>
-            <voices>1</voices>
+            <voices>2</voices>
             <shuffle>1</shuffle>
         </media>
         <rss>
-            <dir>/var/www/rss/</dir>
-            <enclosure>1</enclosure>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
         </rss>
         <twitter>
             <mode>0</mode>
@@ -44,7 +45,7 @@
             <port>1234</port>
         </control>
         <relay>
-            <mode>0</mode>
+            <mode>1</mode>
             <url>http://localhost:8000/telecaster_live.mp3</url>
         </relay>
         <record>
@@ -52,6 +53,7 @@
             <dir>/path/to/archives</dir>
         </record>
     </station>
+
 </deefuzzer>
 
 
index d6846feb12e2a1191453d1522c7722a0e09a1d7d..253fba8363027f6216a3c59d90abc2f8b95fe0ef 100644 (file)
@@ -1,38 +1,34 @@
 <telecaster>
     <infos>
-        <short_name>yomix</short_name>
-        <name>Yomix Streams</name>
-        <description>My streams</description>
-        <url>http://wm16.parisson.org</url>
-        <genre>Other</genre>
+        <short_name>Pre-Barreau</short_name>
+        <name>Pre-Barreau</name>
+        <description>La preparation au Barreau de Paris</description>
+        <url>http:///telecaster-04.parisson.com</url>
+        <genre>Vocal</genre>
     </infos>
     <server>
-        <host>parisson.com</host>
+        <host>stream.parisson.com</host>
         <port>8000</port>
         <sourcepassword>source2parisson</sourcepassword>
         <public>0</public>
         <deefuzzer_default_conf>/etc/telecaster/deefuzzer.xml</deefuzzer_default_conf>
-        <lock_file>lock/telecaster.lock</lock_file>
         <rss>
             <dir>/var/www/rss/</dir>
         </rss>
     </server>
     <media>
         <record>true</record>
-        <play_dir>/home/momo/mymusic/telecaster/media</play_dir>
-        <rec_dir>/home/momo/mymusic/telecaster/backup</rec_dir>
+        <play_dir>/home/pre-barreau/media/CRFPA</play_dir>
+        <rec_dir>/home/pre-barreau/backup</rec_dir>
         <format>mp3</format>
-        <bitrate>256</bitrate>
-        <channels>2</channels>
-        <ogg_quality>8</ogg_quality>
+        <bitrate>96</bitrate>
+        <channels>1</channels>
+        <ogg_quality>3</ogg_quality>
         <samplerate>44100</samplerate>
     </media>
     <jack>
         <input>
-        <name>system:capture_1</name>
-        </input>
-        <input>
-        <name>system:capture_2</name>
+        <name>jack_rack:out_1</name>
         </input>
     </jack>
 </telecaster>
index 0f0f3673e61a0d95579ffa7d86eca311377aa8bf..7025b334f44c16dd4b230dc21050b80862dca0a3 100755 (executable)
@@ -14,3 +14,17 @@ fi
 
 qjackctl &
 
+edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack &
+sleep 3
+
+# MONO setup
+jack_disconnect jack_rack:out_2 LIVE:in_2
+jack_connect jack_rack:out_1  LIVE:in_1
+jack_connect jack_rack:out_1  LIVE:in_2
+
+# STEREO setup
+#jack_connect jack_rack:out_1  LIVE:in_1
+#jack_connect jack_rack:out_2  LIVE:in_2
+
+
+