]> git.parisson.com Git - telecaster-server.git/commitdiff
Merge remote-tracking branch 'origin/dev' into dev
authorGuillaume Pellerin <guillaume.pellerin@parisson.com>
Sun, 8 Jun 2025 23:07:04 +0000 (01:07 +0200)
committerGuillaume Pellerin <guillaume.pellerin@parisson.com>
Sun, 8 Jun 2025 23:07:04 +0000 (01:07 +0200)
1  2 
bin/streaming/telecaster.py
bin/streaming/telecaster.sh

index ba96b0f2286cf742ce3a36ea0d757700bea73bd2,cdab59e77a6ce5e296b0c46f1af1809c37b43d24..877d645befeaa5f492c2f7e047ef75d4b1d10349
@@@ -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):
index 433a826da4de2304580ab7c540153e6d7d7933e3,b245e70cf3be1211230c1624f82baf8449e6cfb1..15dff0307b7bbc996c974ef04389c6b9d98f6031
@@@ -25,6 -11,8 +25,8 @@@ set -
  
  #sleep 2
  
 -qpwgraph &
+ #pipewire &
++# qpwgraph &
  
  #sleep 2
  
  
  /srv/telecaster/telecaster-server/bin/streaming/telecaster.py &
  
 -#sleep 3
 -
 -konsole &
--
--
  # Audio ports setup
  #
  # 1: L