gain > volume

diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py
index 183222c9c4ccc743c5123c7bde498135f121edb2..9f02611779cdbeb85b58d643ecaa85663467d29d 100755 (executable)
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@ -19,9 +19,9 @@ VIDEO_PIPELINE_BASE="""{video_source} {video_options} \
     ! muxout. \
     {audio_source} {audio_options} client-name="webm_streaming_{id}_audio" ! audio/x-raw, format=F32LE, channels={channels} \
     ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
-    ! queue ! volume volume={gain_pre} \
+    ! queue ! volume volume={volume_pre} \
     ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \
-    ! queue ! volume volume={gain_post} \
+    ! queue ! volume volume={volume_post} \
     ! queue ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \
     ! queue ! audioconvert \
     ! queue ! opusenc bitrate={opus_bitrate} \
@@ -33,9 +33,9 @@ VIDEO_PIPELINE_BASE="""{video_source} {video_options} \
 AUDIO_PIPELINE_BASE="""{audio_source} {audio_options} client-name="mp3_streaming_audio" \
     ! audio/x-raw, format=F32LE, channels={channels} \
     ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
-    ! queue ! volume volume={gain_pre} \
+    ! queue ! volume volume={volume_pre} \
     ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \
-    ! queue ! volume volume={gain_post} \
+    ! queue ! volume volume={volume_post} \
     ! queue ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \
     ! queue ! audioconvert \
     ! queue ! lamemp3enc quality={mp3_quality} \

diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml
index 338112f869c99ea0c875c1f1f4266d0c57f9b276..5088954cb6dc28b64266f814fa1412a3cf298f23 100644 (file)
--- a/etc/telecaster/telecaster.yml
+++ b/etc/telecaster/telecaster.yml
@@ -92,8 +92,8 @@ telecaster:
       channels: 2
       opus_bitrate: 96000
       mp3_quality: 4.0
-      gain_pre: 2.5
-      gain_post: 1.5
+      volume_pre: 2.5
+      volume_post: 1.5
     deefuzzer:
       log: /var/log/telecaster/telecaster_mp3_monitor.log
       m3u: /tmp/telecaster_mp3_monitor.m3u