Merge pull request #143 from radiorabe/fix/pervasives-in-test-script
Do not explicity load pervasives.liq
This commit is contained in:
commit
54ded86f6d
|
@ -30,14 +30,14 @@ def printUsage():
|
|||
|
||||
def find_liquidsoap_binary():
|
||||
"""
|
||||
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
|
||||
the location of this binary.
|
||||
With libretime 3.0 we are no longer depending upon the airtime-liquidsoap binary
|
||||
but use a generic install of liquidsoap. This takes care of checking if it is on the
|
||||
path and will lead to an error otherwise.
|
||||
"""
|
||||
|
||||
rv = subprocess.call("which airtime-liquidsoap > /dev/null", shell=True)
|
||||
rv = subprocess.call("which liquidsoap > /dev/null", shell=True)
|
||||
if rv == 0:
|
||||
return "airtime-liquidsoap"
|
||||
return "liquidsoap"
|
||||
|
||||
return None
|
||||
|
||||
|
@ -91,14 +91,13 @@ 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)
|
||||
|
||||
liquidsoap_exe = find_liquidsoap_binary()
|
||||
|
||||
if liquidsoap_exe is None:
|
||||
raise Exception("Liquidsoap not found!")
|
||||
|
||||
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)
|
||||
else:
|
||||
command = "%s /usr/lib/airtime/pypo/bin/liquidsoap_scripts/library/pervasives.liq 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \
|
||||
command = "%s 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \
|
||||
% (liquidsoap_exe, host, port, user, password)
|
||||
|
||||
if not verbose:
|
||||
|
|
Loading…
Reference in New Issue