TT#45632 Change return type from transcode_data to reference

Change-Id: I5e947272de97b4a831c2736b2c73f29dd4b9300b
changes/45/24245/4
Irina Peshinskaya 7 years ago
parent 0182e3600d
commit bf8ce93cb5

@ -51,7 +51,7 @@ sub GET :Allow {
my $filename = $sr->{get_voicemail_filename}($c,$item,$format);
$c->response->header ('Content-Disposition' => 'attachment; filename="'.$filename.'"');
$c->response->content_type($sr->{get_voicemail_content_type}($c,$format));
$c->response->body($ss->{transcode_data}($item->recording,'WAV',uc($format)));
$c->response->body(${$ss->{transcode_data}(\$item->recording, 'WAV', uc($format))});
return;
}
return;

@ -683,12 +683,12 @@ sub handles_download :Chained('handles_base') :PathPart('download') :Args(0) {
my $file = $c->stash->{file_result};
my $filename = $file->filename;
$filename =~ s/\.\w+$/.wav/;
my $data;
my $data_ref;
if($file->codec ne 'WAV') {
try {
$data = NGCP::Panel::Utils::Sounds::transcode_data(
$file->data, $file->codec, 'WAV');
$data_ref = NGCP::Panel::Utils::Sounds::transcode_data(
\$file->data, $file->codec, 'WAV');
} catch($e) {
NGCP::Panel::Utils::Message::error(
c => $c,
@ -698,12 +698,12 @@ sub handles_download :Chained('handles_base') :PathPart('download') :Args(0) {
NGCP::Panel::Utils::Navigation::back_or($c, $c->stash->{handles_base_uri});
}
} else {
$data = $file->data;
$data_ref = \$file->data;
}
$c->response->header ('Content-Disposition' => 'attachment; filename="' . $filename . '"');
$c->response->content_type('audio/x-wav');
$c->response->body($data);
$c->response->body($$data_ref);
return;
}

@ -3998,12 +3998,11 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) {
my ($self, $c) = @_;
my $file = $c->stash->{voicemail};
my $recording = $file->recording;
my $data;
my $data_ref;
try {
$data= NGCP::Panel::Utils::Sounds::transcode_data(
$recording, 'WAV', 'WAV');
$data_ref = NGCP::Panel::Utils::Sounds::transcode_data(
\$file->recording, 'WAV', 'WAV');
} catch ($e) {
NGCP::Panel::Utils::Message::error(
c => $c,
@ -4019,7 +4018,7 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) {
my $filename = NGCP::Panel::Utils::Subscriber::get_voicemail_filename($c,$file);
$c->response->header('Content-Disposition' => 'attachment; filename="'.$filename.'"');
$c->response->content_type('audio/x-wav');
$c->response->body($data);
$c->response->body($$data_ref);
}
sub delete_voicemail :Chained('voicemail') :PathPart('delete') :Args(0) {

@ -49,12 +49,12 @@ sub transcode_file {
sub transcode_data {
my ($data, $source_codec, $target_codec) = @_;
my ($fh, $filename) = tempfile;
print $fh $data;
print $fh (ref $data ? $$data : $data);
close $fh;
my $out = transcode_file($filename, $source_codec, $target_codec);
unlink $filename;
return $out;
return \$out;
}
sub stash_soundset_list {

Loading…
Cancel
Save