add audio engine autostart and name, fix boot time delay check

diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py
index 681438a35e2ed06ed0e6533b17f30f713d7dce87..14996df7e4d4d2bb5964768f37cf1fd83fa63915 100755 (executable)
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@ -140,11 +140,15 @@ class TeleCaster(Thread):
         self.deefuzzer_video_conf_file = "/tmp/telecaster_deefuzzer_webm_monitor.yml"
         self.deefuzzer_audio_conf_file = "/tmp/telecaster_deefuzzer_mp3_monitor.yml"
         # print(self.conf)
         self.deefuzzer_video_conf_file = "/tmp/telecaster_deefuzzer_webm_monitor.yml"
         self.deefuzzer_audio_conf_file = "/tmp/telecaster_deefuzzer_mp3_monitor.yml"
         # print(self.conf)

-        engine = self.conf["audio"]["engine"]
+        engine = self.conf["audio"]["engine"]["name"]
+        if "autostart" in self.conf["audio"]["engine"]:
+            if self.conf["audio"]["engine"]["autostart"]:
+                self.engine = True
+                print("OK")

         self.params = PARAMS[engine]
         self.params["options"] = self.params["options"].format(**self.conf["audio"][engine])
         self.params["gst_audio_options"] = self.params["gst_audio_options"].format(**self.conf["audio"][engine])
         self.params = PARAMS[engine]
         self.params["options"] = self.params["options"].format(**self.conf["audio"][engine])
         self.params["gst_audio_options"] = self.params["gst_audio_options"].format(**self.conf["audio"][engine])

-        if self.conf["boot_time_delay"]:
+        if "boot_time_delay" in self.conf:

             self.time_delay = self.conf["boot_time_delay"]
         else:
             self.time_delay = 1
             self.time_delay = self.conf["boot_time_delay"]
         else:
             self.time_delay = 1

diff --git a/etc/telecaster/telecaster-multi.yml b/etc/telecaster/telecaster-multi.yml
index cd195c880ffe4371550aa0d2fefb7a6600d4a5b8..62218f6b161cf6ee126bc2ce5b2a427051f1793f 100644 (file)
--- a/etc/telecaster/telecaster-multi.yml
+++ b/etc/telecaster/telecaster-multi.yml
@@ -9,7 +9,8 @@ telecaster:
   video:
     gstreamer:
       - id: 0
   video:
     gstreamer:
       - id: 0

-        name: logitech
+        name: JVC
+        device: /dev/v4l/by-id/usb-2166_KY-PZ200_3241004D-video-index0

         width: 1280
         height: 720
         framerate: 30
         width: 1280
         height: 720
         framerate: 30


@@ -21,13 +22,14 @@ telecaster:
         vp8_bitrate: 4000000
         v4l2-ctl:
           power_line_frequency: 1
         vp8_bitrate: 4000000
         v4l2-ctl:
           power_line_frequency: 1

-          zoom_absolute: 100
-          focus_absolute: 0
+          zoom_absolute: 800
+          focus_absolute: 3080

           focus_automatic_continuous: 0
           focus_automatic_continuous: 0

-          sharpness: 128
+          sharpness: 6

           saturation: 100
       - id: 2
           saturation: 100
       - id: 2

-        name: logitech
+        name: USB-HDMI
+        device: /dev/v4l/by-id/usb-MACROSILICON_USB_Video-video-index0

         width: 1280
         height: 720
         framerate: 30
         width: 1280
         height: 720
         framerate: 30


@@ -37,13 +39,6 @@ telecaster:
         audio_delay: 0
         video_delay: 0
         vp8_bitrate: 4000000
         audio_delay: 0
         video_delay: 0
         vp8_bitrate: 4000000

-        v4l2-ctl:
-          power_line_frequency: 1
-          zoom_absolute: 100
-          focus_absolute: 0
-          focus_automatic_continuous: 0
-          sharpness: 128
-          saturation: 100

     deefuzzer:
         log: /var/log/telecaster/telecaster_webm_monitor.log
         m3u: /tmp/telecaster_webm_monitor.m3u
     deefuzzer:
         log: /var/log/telecaster/telecaster_webm_monitor.log
         m3u: /tmp/telecaster_webm_monitor.m3u


@@ -54,8 +49,8 @@ telecaster:
           infos:
             description: TeleCaster WebM monitor stream
             genre: Vocal
           infos:
             description: TeleCaster WebM monitor stream
             genre: Vocal

-            name: monitor_0.webm
-            short_name: monitor_0.webm
+            name: monitor_1.webm
+            short_name: monitor_1.webm

             url: https://www.parisson.com
           jingles:
             dir: /path/to/jingles
             url: https://www.parisson.com
           jingles:
             dir: /path/to/jingles


@@ -70,7 +65,7 @@ telecaster:
             shuffle: '0'
             voices: '1'
           record:
             shuffle: '0'
             voices: '1'
           record:

-            dir: /home/telecaster/monitor/webm
+            dir: /home/telecaster/trash/webm/1

             mode: 1
           relay:
             author: TeleCaster
             mode: 1
           relay:
             author: TeleCaster


@@ -92,19 +87,22 @@ telecaster:
             mode: '0'
             secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
             tags: bla bla
             mode: '0'
             secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
             tags: bla bla

+

   audio:
   audio:

-    engine: jack
-    # engine: pipewire
+    engine: 
+      name: jack
+      autostart: true

     jack:
     jack:

-      card: U192k
+      card: ArturiaMsd

       priority: 50
       buffer: 1024
       samplerate: 48000
     pipewire:
       priority: 50
       buffer: 1024
       samplerate: 48000
     pipewire:

-      target_object: telecaster_source
-      #target_object: alsa:acp:ArturiaMsd:0:capture
+      #target_object: telecaster_source
+      target_object: alsa:acp:ArturiaMsd:0:capture

     gstreamer:
       channels: 2
     gstreamer:
       channels: 2

+      samplerate: 48000

       opus_bitrate: 96000
       mp3_quality: 4.0
       volume_pre: 2.5
       opus_bitrate: 96000
       mp3_quality: 4.0
       volume_pre: 2.5


@@ -141,7 +139,7 @@ telecaster:
           shuffle: 0
           voices: '2'
         record:
           shuffle: 0
           voices: '2'
         record:

-          dir: /home/telecaster/monitor/mp3
+          dir: /home/telecaster/trash/mp3

           mode: 1
         relay:
           author: Inconnu
           mode: 1
         relay:
           author: Inconnu