add jack config

diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py
index ac574bf0b0df584eaa8a64339bdd9ba221a47c10..b44b9c8a363e92b4b39860df8df63848fa309e0d 100755 (executable)
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@ -47,7 +47,7 @@ BOOT_TIME_DELAY = 1
 DEFAULT_CONFIG_FILE = "/etc/telecaster/telecaster.yml"
 
 JACK_CONFIG = {"engine": "jackd",
-               "options": "-R -P50 -dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3",
+               "options": "-R -P50 -dalsa -r48000 -p{buffer} -n3 -Chw:{card} -Phw:{card}",
                "tools": ["qjackctl", "catia", "konsole"],
                "post_commands":
                     ["jack_connect system:capture_1 webm_streaming_0_audio:in_jackaudiosrc0_1",
@@ -136,7 +136,7 @@ class TeleCaster(Thread):
             subprocess.call(command, shell=True)
 
     def audio_engine_start(self):
-        command = self.audio_config["engine"] + " " + self.audio_config["options"]
+        command = self.audio_config["engine"] + " " + self.audio_config["options"].format(**self.conf["audio"]["jack"])
         thread = TeleCasterThreadedCommand(command)
         thread.start()
         time.sleep(BOOT_TIME_DELAY)

diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml
index 68f2a3fc3efbcd4740fcfc6deeaedd317719f151..08d2e55869e662d62109ad1b7e467bc0ef99e443 100644 (file)
--- a/etc/telecaster/telecaster.yml
+++ b/etc/telecaster/telecaster.yml
@@ -78,6 +78,9 @@ telecaster:
             secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
             tags: bla bla
   audio:
+    jack:
+      card: U192k
+      buffer: 1024
     gstreamer:
       audio_source: jackaudiosrc
       audio_options: connect=2