refactor opus naming

diff --git a/libs/opus.sh b/libs/opus.sh
index 3626cd3c5b09af7be9cc236eddca51035f927758..84d778d18c25c7161129e98114f7d937886103af 100644 (file)
--- a/libs/opus.sh
+++ b/libs/opus.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
 
+check_opus_programs()
+{
+       command -v opusenc > /dev/null \
+               || errlog "command opusenc not found" \
+               || return $?
+       command -v parallel > /dev/null \
+               || errlog "command parallel not found" \
+               || return $?
+}
+
 flac_to_opus()
 {
-       local inputfile="$1"
-       local outputfile="${inputfile/.flac/.opus}"
-       local coverfile="${inputfile%/*}/cover.jpg"
+       local input="$1"
+       local output="${input/.flac/.opus}"
+       local coverfile="${input%/*}/cover.jpg"
 
        nice --adjustment=10 opusenc --picture "3|image/jpeg|||$coverfile" \
-               --quiet --bitrate 192 "$inputfile" "$outputfile"
+               --quiet --bitrate 192 "$input" "$output"
 }
 
 convert_flac_to_opus()
@@ -23,20 +33,9 @@ convert_flac_to_opus()
                flac_to_opus {}
 }
 
-check_opus_programs()
-{
-       command -v opusenc > /dev/null \
-               || errlog "command opusenc not found" \
-               || return $?
-       command -v parallel > /dev/null \
-               || errlog "command parallel not found" \
-               || return $?
-}
-
 execute()
 {
        local workdir="$1"
-
        convert_flac_to_opus "$workdir" || return $?
 }