CC-2082: OGG stream dies after every song when using MPlayer
-Problem fixed -Also replaced 40MB silence.mp3 file with new 172KB file
This commit is contained in:
parent
b922e42918
commit
9f7a223159
3 changed files with 7 additions and 9 deletions
|
@ -79,14 +79,8 @@ try:
|
||||||
create_path(BASE_PATH+"cache")
|
create_path(BASE_PATH+"cache")
|
||||||
create_path(BASE_PATH+"files")
|
create_path(BASE_PATH+"files")
|
||||||
create_path(BASE_PATH+"tmp")
|
create_path(BASE_PATH+"tmp")
|
||||||
create_path(BASE_PATH+"files/basic")
|
|
||||||
create_path(BASE_PATH+"files/fallback")
|
|
||||||
create_path(BASE_PATH+"files/jingles")
|
|
||||||
create_path(BASE_PATH+"archive")
|
create_path(BASE_PATH+"archive")
|
||||||
|
|
||||||
print "Copying pypo files"
|
|
||||||
shutil.copy("%s/../scripts/silence.mp3"%current_script_dir, BASE_PATH+"files/basic")
|
|
||||||
|
|
||||||
if platform.architecture()[0] == '64bit':
|
if platform.architecture()[0] == '64bit':
|
||||||
print "Installing 64-bit liquidsoap binary"
|
print "Installing 64-bit liquidsoap binary"
|
||||||
shutil.copy("%s/../liquidsoap/liquidsoap64"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir)
|
shutil.copy("%s/../liquidsoap/liquidsoap64"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir)
|
||||||
|
|
|
@ -24,7 +24,7 @@ server.register(namespace="vars", "show_name", fun (s) -> begin show_name := s s
|
||||||
server.register(namespace="vars", "station_name", fun (s) -> begin station_name := s s end)
|
server.register(namespace="vars", "station_name", fun (s) -> begin station_name := s s end)
|
||||||
|
|
||||||
|
|
||||||
default = single(conservative=true, "/opt/pypo/files/basic/silence.mp3")
|
default = single(audio_to_stereo("/opt/pypo/bin/files/sleeper_03.mp3"))
|
||||||
default = rewrite_metadata([("artist","Airtime"), ("title", "offline")],default)
|
default = rewrite_metadata([("artist","Airtime"), ("title", "offline")],default)
|
||||||
|
|
||||||
s = fallback(track_sensitive=false, [queue, default])
|
s = fallback(track_sensitive=false, [queue, default])
|
||||||
|
@ -69,6 +69,10 @@ if output_icecast_mp3 then
|
||||||
end
|
end
|
||||||
|
|
||||||
if output_icecast_vorbis then
|
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
|
||||||
|
#silence = add(normalize=false,[blank(), audio_to_stereo(single("/opt/pypo/bin/files/sleeper_03.mp3"))])
|
||||||
|
ogg_s = add(normalize=false,[blank(),s])
|
||||||
out_vorbis = output.icecast(%vorbis,
|
out_vorbis = output.icecast(%vorbis,
|
||||||
host = icecast_host, port = icecast_port,
|
host = icecast_host, port = icecast_port,
|
||||||
password = icecast_pass, mount = mount_point_vorbis,
|
password = icecast_pass, mount = mount_point_vorbis,
|
||||||
|
@ -78,5 +82,5 @@ if output_icecast_vorbis then
|
||||||
url = icecast_url,
|
url = icecast_url,
|
||||||
description = icecast_description,
|
description = icecast_description,
|
||||||
genre = icecast_genre,
|
genre = icecast_genre,
|
||||||
s)
|
ogg_s)
|
||||||
end
|
end
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue