From a4244595e547bce049507afe9db3b715c76a2c92 Mon Sep 17 00:00:00 2001 From: Robb Ebright Date: Sat, 8 Apr 2017 18:05:11 -0400 Subject: [PATCH] used liquidsoap in command vs. airtime-liquidsoap --- utils/airtime-test-stream.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py index 7121c8c0b..fa1d200c6 100644 --- a/utils/airtime-test-stream.py +++ b/utils/airtime-test-stream.py @@ -30,6 +30,8 @@ def printUsage(): 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 binary because it may have been installed through a debian package. Let's find 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) 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) + command = "liquidsoap 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount) else: - command = "%s 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \ - % (liquidsoap_exe, host, port, user, password) + command = "liquidsoap 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \ + % (host, port, user, password) if not verbose: command += " 2>/dev/null | grep \"failed\""