Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.1.x' into devel

Browse source
This commit is contained in:
denise 2012-06-12 15:49:18 -04:00
commit 8b2353ede0
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/StoredFile.php
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 {