diff options
Diffstat (limited to 'rhimport/fetcher.go')
| -rw-r--r-- | rhimport/fetcher.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go index 3933105..4d942fa 100644 --- a/rhimport/fetcher.go +++ b/rhimport/fetcher.go @@ -238,7 +238,7 @@ func fetchFileCurl(ctx *Context, res *Result, uri *url.URL) (err error) { if cbdata.conv != nil { cbdata.conv.Close() rhl.Printf("waiting for converter to finish...") - convOut, convErr, ctx.LoudnessCorr = cbdata.conv.GetResult() + convOut, convErr = cbdata.conv.GetResult(ctx, res) } if err != nil || cbdata.writeError != nil || convErr != nil { if cbdata.conv != nil { @@ -369,7 +369,7 @@ func fetchFileArchiv(ctx *Context, res *Result, uri *url.URL) (err error) { if cbdata.conv != nil { cbdata.conv.Close() rhl.Printf("waiting for converter to finish...") - convOut, convErr, ctx.LoudnessCorr = cbdata.conv.GetResult() + convOut, convErr = cbdata.conv.GetResult(ctx, res) } if err != nil || cbdata.writeError != nil || convErr != nil { if cbdata.conv != nil { @@ -456,9 +456,7 @@ func fetchFileDirConvert(ctx *Context, res *Result, origSrc *os.File, sizeTotal conv.Close() rhl.Printf("waiting for converter to finish...") - var convOut string - var convErr error - if convOut, convErr, ctx.LoudnessCorr = conv.GetResult(); convErr != nil { + if convOut, convErr := conv.GetResult(ctx, res); convErr != nil { if convOut != "" { rhl.Printf("converter error: %v; converter output: %s", convErr, convOut) } @@ -674,7 +672,7 @@ func fetchFileAttachment(ctx *Context, res *Result, uri *url.URL) error { err = writeAttachmentFile(ctx, res, sizeTotal, conv) conv.Close() rhl.Printf("waiting for converter to finish...") - convOut, convErr, loudnessCorr := conv.GetResult() + convOut, convErr := conv.GetResult(ctx, res) if err != nil { return err } @@ -684,7 +682,6 @@ func fetchFileAttachment(ctx *Context, res *Result, uri *url.URL) error { } return fmt.Errorf("converter error: %v; converter output: %s", convErr, convOut) } - ctx.LoudnessCorr = loudnessCorr rhdl.Printf("converter: loudness correction = %.2f dB", ctx.LoudnessCorr) if ctx.SourceFilePolicy == Auto { |