use global /etc/telecaster/telecaster.conf for init, script env, etc

diff --git a/src/etc/init.d/telecaster b/src/etc/init.d/telecaster
index 14ac27b7d1acbebca7dbd69f81168ba7f10e7abc..ef508b7fd7d6901d79816fc04e140468b96e629f 100755 (executable)
--- a/src/etc/init.d/telecaster
+++ b/src/etc/init.d/telecaster
@@ -16,8 +16,8 @@ LOG=/var/log/telecaster/vncserver.log
 PIDFILE=/var/run/telecaster.pid
 PORT=1
 
-test -f /etc/default/telecaster || exit 0
-. /etc/default/telecaster
+test -f /etc/telecaster/telecaster.conf || exit 0
+. /etc/telecaster/telecaster.conf
 
 VNCHOME=/home/$USER
 
@@ -51,6 +51,7 @@ case "$1" in
             su -c "pkill -9 -f telecaster_mp3_monitor.yaml"
             su -c "pkill -9 -f telecaster_webm_monitor.yaml"
             su -c "pkill -9 gst-launch-1.0" $USER
+            su -c "pkill -9 -f jackd" $USER
             sleep 1
             su -c "vncserver -kill :$PORT" $USER
             log_end_msg 0

diff --git a/src/etc/telecaster/telecaster.conf b/src/etc/telecaster/telecaster.conf
new file mode 100755 (executable)
index 0000000..911a572
--- /dev/null
+++ b/src/etc/telecaster/telecaster.conf
@@ -0,0 +1,35 @@
+# Set to "yes" to start vncserver at boot
+START_DAEMON=yes
+
+# The vncserver process will run under this user
+USER=telecaster
+
+# The vncserver port (i.e. 2 for 5902)
+PORT="1"
+
+# Options to pass to vncserver
+#OPTIONS="-geometry 1024x768 -depth 8"
+
+# v4l2
+V4L2_ID=0
+V4L2_ZOOM=140
+V4L2_SHARPNESS=144
+
+# C920
+#VIDEO_WIDTH=864
+#VIDEO_HEIGHT=480
+#VIDEO_FRAMERATE=24
+
+# C922
+VIDEO_WIDTH=864
+VIDEO_HEIGHT=480
+VIDEO_FRAMERATE=24
+VIDEO_FLIP=rotate-180
+
+# Audio
+AUDIO_CHANNELS=2
+AUDIO_OPUS_BITRATE=96000
+AUDIO_MP3_QUALITY=4.0
+AUDIO_GAIN=12.0
+
+JACK_OPTIONS="-dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"

diff --git a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh
index 418eceba4f436163e1eb2f0748be80ee790d6fcc..6ca87d6a7bc10bcc2fc547c2978ce43fa6e7747a 100755 (executable)
--- a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh
@@ -9,10 +9,7 @@ AUDIO_MP3_QUALITY=4.0
 AUDIO_GAIN_PRE=2.5
 AUDIO_GAIN_POST=1.5
 
-LOCAL_DIR=$(dirname "$0")
-if [ -f $LOCAL_DIR/.env ]; then
-    source $LOCAL_DIR/.env
-fi
+source /etc/telecaster/telecaster.conf
 
 # GST launch
 gst-launch-1.0 jackaudiosrc connect=2 ! audio/x-raw, format=F32LE, channels=$AUDIO_CHANNELS \

diff --git a/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh b/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh
index 6cefe8e72273de196fe723ae9772b122ad52bd5e..571823630a6b271d5b39217c0fc4949efbefaaad 100755 (executable)
--- a/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh
@@ -2,15 +2,7 @@
 
 set -e
 
-# Audio
-JACK_OPTIONS="-dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"
-
-LOCAL_DIR=$(dirname "$0")
-if [ -f $LOCAL_DIR/.env ]; then
-    source $LOCAL_DIR/.env
-fi
-
-# jackd launch
+source /etc/telecaster/telecaster.conf
 
 jackd $JACK_OPTIONS
 

diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
index b46a0dea86fda84d661031226922fc78052d345b..85c1a8dbde0cc8704e972f8703c7af7bc136e7f8 100755 (executable)
--- a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
@@ -26,10 +26,7 @@ AUDIO_OPUS_BITRATE=96000
 AUDIO_GAIN_PRE=2.5
 AUDIO_GAIN_POST=1.5
 
-LOCAL_DIR=$(dirname "$0")
-if [ -f $LOCAL_DIR/.env ]; then
-    source $LOCAL_DIR/.env
-fi
+source /etc/telecaster/telecaster.conf
 
 # V4L2 setup
 v4l2-ctl -d $V4L2_ID -c power_line_frequency=1