From 02d0b2f31ca49649c73e01438b85c29dda709fdb Mon Sep 17 00:00:00 2001
From: shdown <shdownnine@gmail.com>
Date: Tue, 16 Sep 2014 20:23:04 +0400
Subject: TOOLS/mpv_identify.sh: simplify line-by-line reading

Use here-document idiom to read mpv output line-by-line.
---
 TOOLS/mpv_identify.sh | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'TOOLS/mpv_identify.sh')

diff --git a/TOOLS/mpv_identify.sh b/TOOLS/mpv_identify.sh
index 7b0848bffe..4d72198e99 100755
--- a/TOOLS/mpv_identify.sh
+++ b/TOOLS/mpv_identify.sh
@@ -97,25 +97,10 @@ __midentify__main() {
         unset "$nextprefix$key"
     done
 
-    local output="$(${MPV:-mpv} --term-playing-msg="$propstr" --vo=null --ao=null \
-                                --frames=1 --quiet --no-cache --no-config -- "$@")"
     local fileindex=0
     local prefix=
-    while :; do
-        local line output
-        case "$output" in
-            '')
-                break
-                ;;
-            *"$LF"*)
-                line="${output%%$LF*}"
-                output="${output#*$LF}"
-                ;;
-            *)
-                line="$output"
-                output=
-                ;;
-        esac
+    local line
+    while IFS= read -r line; do
         case "$line" in
             X-MIDENTIFY-START:)
                 if [ -n "$nextprefix" ]; then
@@ -154,7 +139,10 @@ __midentify__main() {
                 fi
                 ;;
         esac
-    done
+    done <<EOF
+$(${MPV:-mpv} --term-playing-msg="$propstr" --vo=null --ao=null \
+              --frames=1 --quiet --no-cache --no-config -- "$@")
+EOF
 }
 
 __midentify__main "$@"
-- 
cgit v1.2.3