Skip to content
Snippets Groups Projects
Commit 1f77fea9 authored by Steffen Müller's avatar Steffen Müller
Browse files

- remove bufferize parameter from input.alsa and output.alsa

- minor changes on comments in *.ini
parent 4b607d1e
No related branches found
No related tags found
1 merge request!1adapt liquidsoap alsa configuration
Pipeline #971 passed
...@@ -38,7 +38,7 @@ fallback_threshold="-80." ...@@ -38,7 +38,7 @@ fallback_threshold="-80."
[soundcard] [soundcard]
# Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output) or "jack" (multi input/output) # Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output) or "jack" (multi input/output)
soundsystem="alsa" soundsystem="alsa"
# With 'alsa' you have to write the devicenames like 'hw:0' or 'default' to use the system default # With 'alsa' you have to write the devicenames like 'default' to use the system default or 'hw:0' to use the 1st audio device directly.
# With Pulse Audio and Jack => an non empty value means it is used # With Pulse Audio and Jack => an non empty value means it is used
# Devices with empty string are ignored and not used # Devices with empty string are ignored and not used
input_device_0="default" input_device_0="default"
...@@ -55,7 +55,7 @@ output_device_4="" ...@@ -55,7 +55,7 @@ output_device_4=""
# If you are using ALSA, you might need to tweak these values if you're hearing jitter, cracklings or other artifacts # If you are using ALSA, you might need to tweak these values if you're hearing jitter, cracklings or other artifacts
# Set to 0 to use the ALSA default. # Set to 0 to use the ALSA default. If using hardware directly (hw:0) start with 8192. Higher Valus gives heigher latency and lower CPU usage.
alsa_buffer="0" alsa_buffer="0"
# Only used for buffered ALSA I/O, and affects latency. Probably not wanted for live audio. Defaults to "1" # Only used for buffered ALSA I/O, and affects latency. Probably not wanted for live audio. Defaults to "1"
alsa_buffer_length="0" alsa_buffer_length="0"
......
...@@ -38,7 +38,7 @@ fallback_threshold="-80." ...@@ -38,7 +38,7 @@ fallback_threshold="-80."
[soundcard] [soundcard]
# Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output) or "jack" (multi input/output) # Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output) or "jack" (multi input/output)
soundsystem="alsa" soundsystem="alsa"
# With 'alsa' you have to write the devicenames like 'hw:0' or 'default' to use the system default # With 'alsa' you have to write the devicenames like 'default' to use the system default or 'hw:0' to use the 1st audio device directly.
# With Pulse Audio and Jack => an non empty value means it is used # With Pulse Audio and Jack => an non empty value means it is used
# Devices with empty string are ignored and not used # Devices with empty string are ignored and not used
input_device_0="default" input_device_0="default"
...@@ -55,7 +55,7 @@ output_device_4="" ...@@ -55,7 +55,7 @@ output_device_4=""
# If you are using ALSA, you might need to tweak these values if you're hearing jitter, cracklings or other artifacts # If you are using ALSA, you might need to tweak these values if you're hearing jitter, cracklings or other artifacts
# Set to 0 to use the ALSA default. # Set to 0 to use the ALSA default. If using hardware directly (hw:0) start with 8192. Higher Valus gives heigher latency and lower CPU usage.
alsa_buffer="0" alsa_buffer="0"
# Only used for buffered ALSA I/O, and affects latency. Probably not wanted for live audio. Defaults to "1" # Only used for buffered ALSA I/O, and affects latency. Probably not wanted for live audio. Defaults to "1"
alsa_buffer_length="0" alsa_buffer_length="0"
......
...@@ -38,7 +38,7 @@ fallback_threshold="-80." ...@@ -38,7 +38,7 @@ fallback_threshold="-80."
[soundcard] [soundcard]
# Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output) or "jack" (multi input/output) # Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output) or "jack" (multi input/output)
soundsystem="alsa" soundsystem="alsa"
# With 'alsa' you have to write the devicenames like 'hw:0' or 'default' to use the system default # With 'alsa' you have to write the devicenames like 'default' to use the system default or 'hw:0' to use the 1st audio device directly.
# With Pulse Audio and Jack => an non empty value means it is used # With Pulse Audio and Jack => an non empty value means it is used
# Devices with empty string are ignored and not used # Devices with empty string are ignored and not used
input_device_0="default" input_device_0="default"
...@@ -55,7 +55,7 @@ output_device_4="" ...@@ -55,7 +55,7 @@ output_device_4=""
# If you are using ALSA, you might need to tweak these values if you're hearing jitter, cracklings or other artifacts # If you are using ALSA, you might need to tweak these values if you're hearing jitter, cracklings or other artifacts
# Set to 0 to use the ALSA default. # Set to 0 to use the ALSA default. If using hardware directly (hw:0) start with 8192. Higher Valus gives heigher latency and lower CPU usage.
alsa_buffer="0" alsa_buffer="0"
# Only used for buffered ALSA I/O, and affects latency. Probably not wanted for live audio. Defaults to "1" # Only used for buffered ALSA I/O, and affects latency. Probably not wanted for live audio. Defaults to "1"
alsa_buffer_length="0" alsa_buffer_length="0"
......
...@@ -121,7 +121,7 @@ end ...@@ -121,7 +121,7 @@ end
def set_input(device, name) = def set_input(device, name) =
if use_alsa == true then if use_alsa == true then
alsa_in = input.alsa(id=name, device=a0_in, clock_safe=false, bufferize = false) alsa_in = input.alsa(id=name, device=a0_in, clock_safe=false)
inputs := list.append([alsa_in], !inputs) inputs := list.append([alsa_in], !inputs)
elsif use_jack == true then elsif use_jack == true then
...@@ -143,9 +143,9 @@ def get_output(source, device, name) = ...@@ -143,9 +143,9 @@ def get_output(source, device, name) =
if use_alsa == true then if use_alsa == true then
log("--- Set ALSA Output ---") log("--- Set ALSA Output ---")
if device == "default" then if device == "default" then
output.alsa(id="lineout", bufferize = false, source) output.alsa(id="lineout", source)
else else
output.alsa(id=name, device=device, bufferize = false, source) output.alsa(id=name, device=device, source)
end end
elsif use_jack == true then elsif use_jack == true then
log("--- Set JACK AUDIO Output ---") log("--- Set JACK AUDIO Output ---")
......
...@@ -38,11 +38,11 @@ set("alsa.alsa_buffer", 8192) # 7168) # 6144) # 8192) # 10240) #15876 ...@@ -38,11 +38,11 @@ set("alsa.alsa_buffer", 8192) # 7168) # 6144) # 8192) # 10240) #15876
set("alsa.buffer_length", 25) set("alsa.buffer_length", 25)
set("alsa.periods", 0) # assertion error when setting periods other than 0 => alsa default set("alsa.periods", 0) # assertion error when setting periods other than 0 => alsa default
input_linein = input.alsa(id="linein", bufferize = false) input_linein = input.alsa(id="linein")
#input_fs = single(id="fs", "/var/audio/fallback/output.flac") #input_fs = single(id="fs", "/var/audio/fallback/output.flac")
#input_http = input.http(id="http", "http://stream.fro.at/fro-128.ogg") #input_http = input.http(id="http", "http://stream.fro.at/fro-128.ogg")
#mixer = mix(id="mixer", [input_fs, input_http, input_linein]) #mixer = mix(id="mixer", [input_fs, input_http, input_linein])
#output.alsa(id="lineout", bufferize = false, mixer) #output.alsa(id="lineout", mixer)
...@@ -33,7 +33,7 @@ set("alsa.alsa_buffer", 8192) ...@@ -33,7 +33,7 @@ set("alsa.alsa_buffer", 8192)
set("alsa.buffer_length", 25) set("alsa.buffer_length", 25)
set("alsa.periods", 0) # assertion error when setting periods other than 0 => alsa default set("alsa.periods", 0) # assertion error when setting periods other than 0 => alsa default
#input_linein = input.alsa(id="linein", bufferize = false) #input_linein = input.alsa(id="linein")
audio1 = single(id="fs1", "./sources/1.flac") audio1 = single(id="fs1", "./sources/1.flac")
audio2 = single(id="fs2", "./sources/2.flac") audio2 = single(id="fs2", "./sources/2.flac")
...@@ -44,5 +44,5 @@ audio2 = single(id="fs2", "./sources/2.flac") ...@@ -44,5 +44,5 @@ audio2 = single(id="fs2", "./sources/2.flac")
#mixer = mix(id="mixer", [input_fs, input_http, input_linein]) #mixer = mix(id="mixer", [input_fs, input_http, input_linein])
mixed = add([audio1, audio2]) mixed = add([audio1, audio2])
output.alsa(id="lineout", bufferize = false, mixed) output.alsa(id="lineout", mixed)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment