Merge branch 'feature/multiple-cam' into develop

diff --cc bin/monitoring/check_telecaster.py
index b2dfe50c26b66058a705e1b5a4d3499137b26242,a9d60c70fe4c7924904b658cb0305b2281376287..3c127c73d5f2cea3368eb36d3469c3dd2ec8a750
--- 1/bin/monitoring/check_telecaster.py
--- 2/bin/monitoring/check_telecaster.py
+++ b/bin/monitoring/check_telecaster.py
@@@ -35,7 -35,8 +35,7 @@@ class TelecasterCheck
              if proc.cmdline():
                  if name == proc.name():
                      if args:
-                         if args in proc.cmdline()[1:]:
 -                        #print(proc.cmdline())
+                         if args in proc.cmdline()[1:] or args in ' '.join(proc.cmdline()[1:]) :
                              return proc.pid
                      else:
                          return proc.pid

diff --cc bin/streaming/old/tc_video_simple_webm_stream-gst1-h264.sh
index 0000000000000000000000000000000000000000,44043a4e8f91e6a552369f6ac1febb40e11c6086..681d343ea13c6e92278deb8e2812d80494e97221
mode 000000,100755..100755
--- /dev/null
--- 2/bin/streaming/old/tc_video_simple_webm_stream-gst1-h264.sh
+++ b/bin/streaming/old/tc_video_simple_webm_stream-gst1-h264.sh
@@@ -1,0 -1,56 +1,58 @@@
 -VIDEO_WIDTH=864
 -VIDEO_HEIGHT=480
 -VIDEO_FRAMERATE=24
+ #!/usr/bin/env bash
+ 
+ set -e
+ 
+ # Default TeleCaster video parameters
+ 
+ # v4l2
+ V4L2_ID=0
+ V4L2_ZOOM=140
+ V4L2_SHARPNESS=128
+ 
+ # C920
+ #VIDEO_WIDTH=864
+ #VIDEO_HEIGHT=480
+ #VIDEO_FRAMERATE=24
+ 
+ # C922
 -v4l2-ctl -d $V4L2_ID -c focus_auto=0
 -v4l2-ctl -d $V4L2_ID -c focus_absolute=1
++VIDEO_WIDTH=1280
++VIDEO_HEIGHT=720
++VIDEO_FRAMERATE=30
+ VIDEO_FLIP=none
++VIDEO_FORMAT="video/x-raw, format=YUY2"
++VIDEO_DECODER="identity"
+ 
+ # Audio
+ AUDIO_CHANNELS=2
+ AUDIO_OPUS_BITRATE=96000
+ AUDIO_GAIN_PRE=2.5
+ AUDIO_GAIN_POST=1.5
+ 
+ source /etc/telecaster/telecaster.conf
+ 
+ # V4L2 setup
+ v4l2-ctl -d $V4L2_ID -c power_line_frequency=1
+ v4l2-ctl -d $V4L2_ID -c zoom_absolute=$V4L2_ZOOM
++# v4l2-ctl -d $V4L2_ID -c focus_absolute=1
++v4l2-ctl -d $V4L2_ID -c focus_automatic_continuous=0
+ v4l2-ctl -d $V4L2_ID -c sharpness=$V4L2_SHARPNESS
+ 
+ # GST launch
+ gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID ! video/x-h264, width=$VIDEO_WIDTH, height=$VIDEO_HEIGHT, framerate=$VIDEO_FRAMERATE/1  \
+       ! queue ! avdec_h264 \
+       ! queue ! videoflip method=$VIDEO_FLIP \
+       ! queue ! videoconvert \
+       ! queue ! vp8enc threads=4 deadline=2 \
+       ! queue ! muxout. \
+       jackaudiosrc connect=2 ! audio/x-raw, format=F32LE, channels=$AUDIO_CHANNELS \
+       ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
+       ! queue ! volume volume=$AUDIO_GAIN_PRE \
+       ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \
+     ! queue ! volume volume=$AUDIO_GAIN_POST \
+       ! queue ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \
+       ! queue ! audioconvert \
+       ! queue ! opusenc bitrate=$AUDIO_OPUS_BITRATE \
+       ! queue ! muxout. \
+       webmmux streamable=true name=muxout \
+       ! queue ! shout2send ip=127.0.0.1 port=8000 password=source2parisson mount=telecaster_live.webm
+       > /dev/null

diff --cc etc/init.d/telecaster
index 1cfb946bbeda76a5772292b49b5c056ff28a93ac,583dfe489ee66bf017779a518674d69575347892..63de45bd8e2ca574344eb7f37fe2adb7c5a726f0
--- 1/etc/init.d/telecaster
--- 2/etc/init.d/telecaster
+++ b/etc/init.d/telecaster
@@@ -48,12 -48,9 +48,11 @@@ case "$1" i
                  pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
          if [ ! pid = '' ]; then
              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 -f deefuzzer"
              su -c "pkill -9 gst-launch-1.0" $USER
              su -c "pkill -9 -f jackd" $USER
 +            su -c "rm /tmp/.X1-lock" $USER
 +            su -c "rm -rf /tmp/.X11-unix/X1" $USER
              sleep 1
              su -c "vncserver -kill :$PORT" $USER
            su -c "pkill -9 -f vnc" 

diff --cc etc/telecaster/telecaster.conf
index 7d131a78b2a846c239c62a3069a1c2c4c62a13fe,5857338416e084dc6a0f4e148a5c4db9b1193bd3..a9f4489f9f0eecb67a57b3bdfd4a70578a804add
--- 1/etc/telecaster/telecaster.conf
--- 2/etc/telecaster/telecaster.conf
+++ b/etc/telecaster/telecaster.conf
@@@ -10,36 -10,7 +10,5 @@@ 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=1280
- VIDEO_HEIGHT=720
- VIDEO_FRAMERATE=30
- VIDEO_FLIP=rotate-180
- VIDEO_FORMAT=image/jpeg
- VIDEO_DECODER=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="-R -dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"
- 
- # DeeFuzzer
- DEEFUZZER_AUDIO_CONF="/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml"
- DEEFUZZER_VIDEO_CONF="/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml"
- 
- TELECASTER_SERVER="/srv/telecaster/telecaster-server"
+ JACK_OPTIONS="-R -P50 -dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"
 -
 -