From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Sun, 8 Jun 2025 23:07:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dev' into dev
X-Git-Tag: 4.1.0~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5c6953de783cdf6141752bcf1e5e6ebea5d44e7f;p=telecaster-server.git

Merge remote-tracking branch 'origin/dev' into dev
---

5c6953de783cdf6141752bcf1e5e6ebea5d44e7f
diff --cc bin/streaming/telecaster.py
index ba96b0f,cdab59e..877d645
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@@ -46,16 -45,7 +46,15 @@@ BOOT_TIME_DELAY = 
  
  DEFAULT_CONFIG_FILE = "/etc/telecaster/telecaster.yml"
  
 +JACK_CONFIG = {"engine": "jackd",
 +               "options": "-R -P50 -dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3",
 +               "tools": ["catia", "konsole"]}
 +
 +PIPEWIRE_CONFIG = {"engine": "pipewire",
 +               "options": "",
 +               "tools": ["qpwgraph", "konsole"]}
 +
  
- 
  class TeleCasterGStream(Thread):
  
      def __init__(self, pipeline):
diff --cc bin/streaming/telecaster.sh
index 433a826,b245e70..15dff03
--- a/bin/streaming/telecaster.sh
+++ b/bin/streaming/telecaster.sh
@@@ -25,6 -11,8 +25,8 @@@ set -
  
  #sleep 2
  
+ #pipewire &
 -qpwgraph &
++# qpwgraph &
  
  #sleep 2
  
@@@ -32,8 -20,11 +34,6 @@@
  
  /srv/telecaster/telecaster-server/bin/streaming/telecaster.py &
  
 -#sleep 3
 -
 -konsole &
--
--
  # Audio ports setup
  #
  # 1: L