diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-07-13 14:40:50 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-07-13 14:40:50 (GMT) |
| commit | cb911c337f3570972f293dae0ec4a71f9935e79e (patch) | |
| tree | 004cfc00854b02c02251a4f34c9543551429833f /rhimport/fetcher.go | |
| parent | 092da9dfacbcb5afcd2d3f281f664543ee956f4e (diff) | |
very basic support for loudness correction
Diffstat (limited to 'rhimport/fetcher.go')
| -rw-r--r-- | rhimport/fetcher.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go index f40adca..74cd1fa 100644 --- a/rhimport/fetcher.go +++ b/rhimport/fetcher.go @@ -176,7 +176,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 = cbdata.conv.GetResult() + convOut, convErr, ctx.LoudnessCorr = cbdata.conv.GetResult() } if err != nil || cbdata.writeError != nil || convErr != nil { if cbdata.conv != nil { @@ -204,6 +204,7 @@ func fetchFileCurl(ctx *Context, res *Result, uri *url.URL) (err error) { rhl.Println(err) return } + rhdl.Printf("converter: loudness correction = %.2f dB", ctx.LoudnessCorr) ctx.SourceFile = cbdata.filename if ctx.SourceFilePolicy == Auto { @@ -306,7 +307,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 = cbdata.conv.GetResult() + convOut, convErr, ctx.LoudnessCorr = cbdata.conv.GetResult() } if err != nil || cbdata.writeError != nil || convErr != nil { if cbdata.conv != nil { @@ -329,6 +330,7 @@ func fetchFileArchiv(ctx *Context, res *Result, uri *url.URL) (err error) { rhl.Println(err) return } + rhdl.Printf("converter: loudness correction = %.2f dB", ctx.LoudnessCorr) ctx.SourceFile = cbdata.filename if ctx.SourceFilePolicy == Auto { @@ -392,12 +394,15 @@ func fetchFileDirConvert(ctx *Context, res *Result, origSrc *os.File, sizeTotal conv.Close() rhl.Printf("waiting for converter to finish...") - if convOut, convErr := conv.GetResult(); convErr != nil { + var convOut string + var convErr error + if convOut, convErr, ctx.LoudnessCorr = conv.GetResult(); convErr != nil { if convOut != "" { rhl.Printf("converter error: %v; converter output: %s", convErr, convOut) } return fmt.Errorf("converter error: %v; converter output: %s", convErr, convOut) } + rhdl.Printf("converter: loudness correction = %.2f dB", ctx.LoudnessCorr) if err != nil { return err } @@ -607,7 +612,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 := conv.GetResult() + convOut, convErr, loudnessCorr := conv.GetResult() if err != nil { return err } @@ -617,6 +622,8 @@ 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 { ctx.DeleteSourceFile = true |