used liquidsoap in command vs. airtime-liquidsoap
This commit is contained in:
parent
225455af09
commit
a4244595e5
|
@ -30,6 +30,8 @@ def printUsage():
|
||||||
|
|
||||||
def find_liquidsoap_binary():
|
def find_liquidsoap_binary():
|
||||||
"""
|
"""
|
||||||
|
With libretime 3.0 we are no longer depending upon airtime-liquidsoap but using the built in liquidsoap
|
||||||
|
rather than a bundled version of it. So this function no longer needs to be used.
|
||||||
Starting with Airtime 2.0, we don't know the exact location of the Liquidsoap
|
Starting with Airtime 2.0, we don't know the exact location of the Liquidsoap
|
||||||
binary because it may have been installed through a debian package. Let's find
|
binary because it may have been installed through a debian package. Let's find
|
||||||
the location of this binary.
|
the location of this binary.
|
||||||
|
@ -91,15 +93,14 @@ try:
|
||||||
print "Outputting to %s streaming server. You should be able to hear a monotonous tone on '%s'. Press ctrl-c to quit." % (stream_type, url)
|
print "Outputting to %s streaming server. You should be able to hear a monotonous tone on '%s'. Press ctrl-c to quit." % (stream_type, url)
|
||||||
|
|
||||||
liquidsoap_exe = find_liquidsoap_binary()
|
liquidsoap_exe = find_liquidsoap_binary()
|
||||||
|
|
||||||
if liquidsoap_exe is None:
|
if liquidsoap_exe is None:
|
||||||
raise Exception("Liquidsoap not found!")
|
raise Exception("Liquidsoap not found!")
|
||||||
|
|
||||||
if stream_type == "icecast":
|
if stream_type == "icecast":
|
||||||
command = "%s 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (liquidsoap_exe, host, port, user, password, mount)
|
command = "liquidsoap 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount)
|
||||||
else:
|
else:
|
||||||
command = "%s 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \
|
command = "liquidsoap 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \
|
||||||
% (liquidsoap_exe, host, port, user, password)
|
% (host, port, user, password)
|
||||||
|
|
||||||
if not verbose:
|
if not verbose:
|
||||||
command += " 2>/dev/null | grep \"failed\""
|
command += " 2>/dev/null | grep \"failed\""
|
||||||
|
|
Loading…
Reference in New Issue