Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
Martin Konecny 2013-05-02 17:31:42 -04:00
commit 1e25d786ee
4 changed files with 34 additions and 23 deletions

View file

@ -126,12 +126,12 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
%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"
#elsif type == "opus" then
# %include "opus.liq"
#elsif type == "aac" then
# %include "aac.liq"
#else
# %include "aacplus.liq"
end
else
user_ref = ref user
@ -165,10 +165,10 @@ 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"
#elsif type == "aac" then
# %include "aac.liq"
#else
# %include "aacplus.liq"
end
end
end