cleanup setup

diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py
index 0a1a852330348e1fbf2de3dc4b4b0ef724888cd5..d1247b4b18a98de039a81d3f7461b4a5e2af1ad1 100755 (executable)
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import shlex

diff --git a/bin/streaming/telecaster_start.sh b/bin/streaming/telecaster_start.sh
old mode 100644 (file)
new mode 100755 (executable)
index 37259a7..1400c2e
--- a/bin/streaming/telecaster_start.sh
+++ b/bin/streaming/telecaster_start.sh
@@ -20,13 +20,7 @@ qjackctl &
 
 sleep 1
 
-$TELECASTER_PATH/bin/streaming/tc_audio_mp3_icecast-gst1.sh &
-
-sleep 1
-
-$TELECASTER_PATH/bin/streaming/tc_video_simple_webm_stream-gst1-double.sh &
-
-sleep 3
+/srv/telecaster/telecaster-server/bin/streaming/telecaster.py /etc/telecaster/telecaster.yml &
 
 # JACK ports setup
 
@@ -52,9 +46,3 @@ sleep 3
 # jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_1
 # jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2
 
-#Audio monitor
-deefuzzer $TELECASTER_PATH/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml &
-
-#Video monitor
-deefuzzer $TELECASTER_PATH/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yaml &
-

diff --git a/env/.fluxbox/startup b/env/.fluxbox/startup
index 25eded78df52d03936825bc7e7aebe5aa04ce7f1..78569b5a9733fc534608538c8bf5bd027af76a56 100644 (file)
--- a/env/.fluxbox/startup
+++ b/env/.fluxbox/startup
@@ -23,7 +23,7 @@ if [ $? -eq 0 ]; then
     fbautostart
 fi
 
-/srv/telecaster/telecaster-server/bin/streaming/tc_start.sh &
+/srv/telecaster/telecaster-server/bin/streaming/telecaster_start.sh &
 
 # And last but not least we start fluxbox.
 # Because it is the last app you have to run it with ''exec'' before it.

diff --git a/etc/telecaster/telecaster.conf b/etc/telecaster/telecaster.conf
index 6f7769787bfd0d9a8e9619f1af0988bde148bdba..644ce5c448a9a219149ab8a787bd98b1fe033f78 100755 (executable)
--- a/etc/telecaster/telecaster.conf
+++ b/etc/telecaster/telecaster.conf
@@ -10,47 +10,6 @@ PORT="1"
 # Options to pass to vncserver
 #OPTIONS="-geometry 1024x768 -depth 8"
 
-# v4l2
-V4L2_ID=0
-V4L2_ZOOM=140
-V4L2_SHARPNESS=144
-V4L2_FORMAT=image/jpeg
-V4L2_DEC=jpegdec
-
-VIDEO_WIDTH=864
-VIDEO_HEIGHT=480
-VIDEO_FRAMERATE=24
-VIDEO_FLIP=rotate-180
-
-VIDEO_ID_1=0
-VIDEO_WIDTH_1=864
-VIDEO_HEIGHT_1=480
-VIDEO_FRAMERATE_1=24
-VIDEO_FLIP_1=rotate-180
-VIDEO_ZOOM_1=140
-VIDEO_SHARPNESS_1=144
-VIDEO_FORMAT_1=image/jpeg
-VIDEO_DEC_1=jpegdec
-
-
-VIDEO_ID_2=2
-VIDEO_WIDTH_2=864
-VIDEO_HEIGHT_2=480
-VIDEO_FRAMERATE_2=24
-VIDEO_FLIP_2=rotate-180
-VIDEO_ZOOM_2=140
-VIDEO_SHARPNESS_2=144
-VIDEO_FORMAT_2=image/jpeg
-VIDEO_DEC_2=jpegdec
-
-
-# Audio
-AUDIO_CHANNELS=2
-AUDIO_OPUS_BITRATE=96000
-AUDIO_MP3_QUALITY=4.0
-AUDIO_GAIN_PRE=2.5
-AUDIO_GAIN_POST=1.5
-
 # Jackd
 JACK_OPTIONS="-dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"