From: yomguy <>
Date: Tue, 29 Jun 2010 17:51:55 +0000 (+0000)
Subject: fix css link, add jackd server init files
X-Git-Tag: 1.0~203
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fbf4c95785d17dea5dd420d87ba684c2f225f1d7;p=telecaster-server.git

fix css link, add jackd server init files
---

diff --git a/etc/jackd/jackd b/etc/jackd/jackd
new file mode 100755
index 0000000..31d9047
--- /dev/null
+++ b/etc/jackd/jackd
@@ -0,0 +1,82 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          jackd
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: init-Script for system wide fetchmail daemon
+### END INIT INFO
+
+
+DAEMON=/usr/bin/jackd
+USER=
+OPTIONS=""
+LOG=/var/log/jackd.log
+PIDFILE=/var/run/jackd.pid
+
+test -f /etc/default/jackd || exit 0
+. /etc/default/jackd
+
+JACKDHOME=/home/$USER
+
+if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
+	echo "Edit /etc/default/jackd to start jackd"
+	exit 0
+fi
+
+test -f $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+	start)	
+	        log_begin_msg "Starting jackd audio server:" "jackd"
+            echo $DAEMON $OPTIONS ' &' > $JACKDHOME/.jackdinit
+            chmod +x $JACKDHOME/.jackdinit
+            su -c $JACKDHOME/.jackdinit $USER > ${LOG}
+	        sleep 2
+            pid=`pgrep -u ${USER} jackd` 
+	        if [ pid = '' ]; then
+ 		        log_failure_msg "JACK daemon can't be started! Check logfile: ${LOG}"
+            else
+                echo $pid > $PIDFILE
+ 	        fi
+ 	        
+		;;
+	stop)
+	        log_begin_msg "Stopping jackd audio server:" "jackd"
+                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
+		if [ ! pid = '' ]; then
+                        kill -9 $pid
+        		log_end_msg 0
+    		else
+	    		log_end_msg 1
+	    		exit 1
+	    	fi
+                rm $PIDFILE
+		;;
+	try-restart)
+		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
+				$0 restart
+				exit 0
+			fi
+		fi
+		test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*jackd* && $0 start
+		;;
+
+	*)
+		log_warning_msg "Usage: /etc/init.d/jackd {start|stop|restart|force-reload|awaken|debug-run}"
+		log_warning_msg "  start - starts system-wide jackd service"
+		log_warning_msg "  stop  - stops system-wide jackd service"
+		log_warning_msg "  restart, force-reload - starts a new system-wide jackd service"
+		log_warning_msg "  awaken - tell system-wide jackd to start a poll cycle immediately"
+		log_warning_msg "  debug-run [strace [strace options...]] - start a debug run of the"
+		log_warning_msg "    system-wide jackd service, optionally running it under strace"
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/etc/jackd/jackd.conf b/etc/jackd/jackd.conf
new file mode 100644
index 0000000..54f0848
--- /dev/null
+++ b/etc/jackd/jackd.conf
@@ -0,0 +1,9 @@
+# Set to "yes" to start jackd at boot
+START_DAEMON=yes
+
+# The jackd process will run under this user
+USER=prebarreau
+
+# Options to pass to jackd
+OPTIONS="-R -P70 -dalsa -r48000 -p1024 -n3 -D -Chw:0,1 -Phw:0,1 "
+
diff --git a/webview.py b/webview.py
index 5891adb..9678bf4 100644
--- a/webview.py
+++ b/webview.py
@@ -102,7 +102,7 @@ class WebView(FieldStorage):
         print "<TITLE>TeleCaster - "+self.title+"</TITLE>"
         print "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\">"
 
-        print "<link href=\""+self.url+"/telecaster/css/telecaster.css\" rel=\"stylesheet\" type=\"text/css\">"
+        print "<link href=\"/telecaster/css/telecaster.css\" rel=\"stylesheet\" type=\"text/css\">"
 
         print '<script language="Javascript" type="text/javascript" >'
         print 'function choix(formulaire)'