From fdcfc4d06c92b2ab98dc39eac11639df864c6138 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Sat, 4 May 2013 10:57:22 -0400
Subject: [PATCH] CC-5094 Liquidsoap crash if unsupported encoder in the liq
 script

---
 .../pypo/liquidsoap_scripts/ls_lib.liq        | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
index 4c078914c..82f04b189 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
@@ -124,15 +124,28 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
                     on_connect = on_connect)
         if type == "mp3" then
             %include "mp3.liq"
-        elsif type == "ogg" then
-            %include "ogg.liq"
-        #elsif type == "opus" then
-        #    %include "opus.liq"
-        #elsif type == "aac" then
-        #    %include "aac.liq"
-        #else
-        #    %include "aacplus.liq"
         end
+        if type == "ogg" then
+            %include "ogg.liq"
+        end
+
+        %ifdef_encoder %opus
+        if type == "opus" then
+            %include "opus.liq"
+        end
+        %endif
+
+        %ifdef_encoder %aac
+        if type == "aac" then
+            %include "aac.liq"
+        end
+        %endif
+
+        %ifdef_encoder %aacplus
+        if type == "aacplus" then
+            %include "aacplus.liq"
+        end
+        %endif
     else
         user_ref = ref user
         if user == "" then
@@ -165,11 +178,19 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
 
         if type == "mp3" then
             %include "mp3.liq"
-        #elsif type == "aac" then
-        #    %include "aac.liq"
-        #else
-        #    %include "aacplus.liq"
         end
+
+        %ifdef_encoder %aac
+        if type == "aac" then
+            %include "aac.liq"
+        end
+        %endif
+        
+        %ifdef_encoder %aacplus
+        if type == "aacplus" then
+            %include "aacplus.liq"
+        end
+        %endif
     end
 end