Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

This commit is contained in:
Martin Konecny 2012-06-12 18:51:31 -04:00
commit d1c224321b
4 changed files with 6 additions and 4 deletions

View file

@ -886,9 +886,9 @@ Logging::log("getting media! - 2");
}
// Check if file is playable
$command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1", $audio_file);
$command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' 2>&1", $audio_file);
exec($command, $output, $rv);
if ($rv != 0) {
if ($rv != 0 || count($output) != 0) {
$result = array("code" => 110, "message" => "This file appears to be corrupted and will not be added to media library.");
}
else {