don't put playback check in a function

1 files changed, 7 insertions, 9 deletions

diff --git a/clerk b/clerk
index aa66429..24c4a13 100755
--- a/clerk
+++ b/clerk
@@ -619,16 +619,14 @@ songs () {
         | column -o ' ' -s $'\t' -t
 }
 
-position () {
-    if [[ -n $(mpc current) ]]; then
-        current=$(mpc current -f '%position%')
-        highlight="-u $(echo $(( $current +5 )))"
-    else
-        :
-    fi
-}
+if [[ -n $(mpc current) ]]; then
+    current=$(mpc current -f '%position%')
+    highlight="-u $(echo $(( $current +5 )))"
+else
+    :
+fi
 
-TRACKDISPLAY=$(echo -e "< Return\n---\n> Load Playlist\n> Load RSS\n> Save Playlist\n---\n$(songs)" | dmenu_t -kb-custom-1 "${delete}" -kb-custom-2 "${rate}" -kb-custom-4 "${crop}" -kb-custom-5 "${clear}" -kb-custom-6 "${moveup}" -kb-custom-7 "${movedown}" -kb-custom-8 "${suspend}" -kb-custom-9 "${resume}" -dmenu $(echo "${select}") "$(position)" -mesg "${HELP}" -p "Current Queue > ")
+TRACKDISPLAY=$(echo -e "< Return\n---\n> Load Playlist\n> Load RSS\n> Save Playlist\n---\n$(songs)" | dmenu_t -kb-custom-1 "${delete}" -kb-custom-2 "${rate}" -kb-custom-4 "${crop}" -kb-custom-5 "${clear}" -kb-custom-6 "${moveup}" -kb-custom-7 "${movedown}" -kb-custom-8 "${suspend}" -kb-custom-9 "${resume}" -dmenu $(echo "${select}") $(echo "${highlight}") -mesg "${HELP}" -p "Current Queue > ")
 
         tempval=$?
         val=$tempval