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

This commit is contained in:
Martin Konecny 2012-06-18 13:27:34 -04:00
commit 24cf9600e2
1 changed files with 1 additions and 1 deletions

View File

@ -888,7 +888,7 @@ Logging::log("getting media! - 2");
// Check if file is playable
$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 || count($output) != 0) {
if ($rv != 0 || $output[0] == 'TagLib: MPEG::Properties::read() -- Could not find a valid last MPEG frame in the stream.') {
$result = array("code" => 110, "message" => "This file appears to be corrupted and will not be added to media library.");
}
else {