CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file

This commit is contained in:
Naomi Aro 2011-07-26 18:39:26 +02:00
parent f0bf7c00c3
commit 8f5e2a6739
4 changed files with 10 additions and 10 deletions

View File

@ -10,9 +10,9 @@ output_icecast_vorbis = true
output_icecast_mp3 = false
output_shoutcast = false
output_bitrate = 128
output_samplerate = 44100
output_stereo = true
#output_bitrate = 128
#output_samplerate = 44100
#output_stereo = true
###########################################
# Logging settings #

View File

@ -58,8 +58,8 @@ end
if output_icecast_mp3 then
#%mp3(bitrate=32, samplerate=22050, stereo=false)
ignore(output.icecast(%mp3(bitrate=output_bitrate, samplerate=output_samplerate, stereo=output_stereo),
#format = %mp3(bitrate=192, samplerate=44100, stereo=false)
ignore(output.icecast(%mp3,
host = icecast_host,
port = icecast_port,
password = icecast_pass,
@ -76,7 +76,7 @@ end
if output_icecast_vorbis then
if output_icecast_vorbis_metadata then
ignore(output.icecast(%vorbis(bitrate=output_bitrate, samplerate=output_samplerate, stereo=output_stereo),
ignore(output.icecast(%vorbis,
host = icecast_host,
port = icecast_port,
password = icecast_pass,
@ -93,7 +93,7 @@ if output_icecast_vorbis then
#remove metadata from ogg source and merge tracks to fix bug
#with vlc and mplayer disconnecting at the end of every track
s = add(normalize=false, [amplify(0.00001, noise()),s])
ignore(output.icecast(%vorbis(bitrate=output_bitrate, samplerate=output_samplerate, stereo=output_stereo),
ignore(output.icecast(%vorbis,
host = icecast_host,
port = icecast_port,
password = icecast_pass,
@ -110,7 +110,7 @@ if output_icecast_vorbis then
end
if output_shoutcast then
ignore(output.shoutcast(%mp3(bitrate=output_bitrate, samplerate=output_samplerate, stereo=output_stereo),
ignore(output.shoutcast(%mp3,
host = shoutcast_host,
port = shoutcast_port,
password = shoutcast_pass,

View File

@ -19,7 +19,7 @@ rabbitmq_password = 'guest'
############################################
# Recorded Audio settings #
############################################
record_bitrate = 128
record_bitrate = 256
record_samplerate = 44100
record_channels = 2
record_sample_size = 16

View File

@ -75,7 +75,7 @@ class ShowRecorder(Thread):
#-f:16,2,44100
#-b:256
command = "ecasound -f:%s,%s,%s -b:%s -i alsa -o %s -t:%s" % (ss, c, sr, br, filepath, length)
command = "ecasound -f:%s,%s,%s -i alsa -o %s,%s000 -t:%s" % (ss, c, sr, filepath, br, length)
args = command.split(" ")
self.logger.info("starting record")